Commit Graph

126 Commits

Author SHA1 Message Date
julien lheureux
aa5b17da40 Fix "shelved files" from default changelist, now has the same behavior as in P4V.
Fix an issue where editing a changelist containing shelved files would fail silently.

#rb sebastien.lussier
#jira UE-107676

[CL 15359009 by julien lheureux in ue5-main branch]
2021-02-08 15:32:48 -04:00
julien lheureux
a460459eed Added possibility to get asset data from history, with a max fetch size (until we have a better solution)
Changed the way we associate shelved files with their local filename to facilitate mapping (perforce operations)
Implemented what was needed on the SCC side to support diff against shelve
Improved way we display object names for deleted & shelved files

#rb sebastien.lussier

[CL 15356101 by julien lheureux in ue5-main branch]
2021-02-08 09:36:20 -04:00
julien lheureux
202e872b4c Improved behavior of changelist operations on default changelist - edit & submit now work as intended.
Fixed an issue when trying to delete the default changelist which triggered a disconnection from the source control provider.
Improved some UI in the changelist context menu to clarify what is available or not.

#rb sebastien.lussier

[CL 15222160 by julien lheureux in ue5-main branch]
2021-01-27 16:11:25 -04:00
julien lheureux
108dfb8d7e Added support for shelved files in changelist, including shelve, unshelve and delete shelve operations.
Added update state for reopen operation as well.

#rb sebastien.lussier

[CL 15207112 by julien lheureux in ue5-main branch]
2021-01-26 09:19:24 -04:00
Matt Kuhlenschmidt
22268eca5f Source control dialog cleanup and reskin
[CL 15178205 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-25 11:45:57 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
julien lheureux
f3a1f5e632 Added confirmation on submit/revert changelists
Fixed an issue in the get pending changelists when there is only the default changelist present

[CL 15144321 by julien lheureux in ue5-main branch]
2021-01-20 09:51:23 -04:00
julien lheureux
8d3734f953 Added contextual menu options for file actions (diff agains depot, show history, locate file)
Better cleanup in perforce revert operation
Made revert work on changelists
Fixed issue where no changelists would be displayed if the default changelist was empty.

#rb sebastien.lussier

[CL 15138037 by julien lheureux in ue5-main branch]
2021-01-19 14:50:23 -04:00
julien lheureux
bf53b31450 Small improvements in the changelists
- Update UI for revert unchanged
- Update UI for submit CL

[CL 15132299 by julien lheureux in ue5-main branch]
2021-01-18 15:59:00 -04:00
Sebastien Lussier
58bdbc57ae Changelist window - Drag & drop support
#rb julien.lheureux

[CL 15132088 by Sebastien Lussier in ue5-main branch]
2021-01-18 15:31:14 -04:00
julien lheureux
2bb7495a45 - Added new, delete, edit changelist commands
- Added revert unchanged on changelists & files
- Added changelist parameter to the Execute method of ISourceControlProvider (& updated all derived classes)
- Fixed style problem in the Perforce settings dialog

#rb sebastien.lussier

[CL 15128504 by julien lheureux in ue5-main branch]
2021-01-18 09:42:33 -04:00
Matt Kuhlenschmidt
c13ac505b2 Updated source control icons
Source control providers now require an FSlateIcon and implementation of GetIcon instead of overriding mutliple functions to do the same thing. Fixed up all known source control providers.

#jira UETOOL-2812

[CL 15045642 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-11 20:50:19 -04:00
Sebastien Lussier
6be153a555 Added initial support for changelists to the source control providers
#rb julien.lheureux

[CL 15039900 by Sebastien Lussier in ue5-main branch]
2021-01-11 14:32:27 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Zousar Shaker
77d13185b7 Copying //UE5/Dev-Cooker@14539516 to Main (//UE5/Main)
[CL 14539954 by Zousar Shaker in ue5-main branch]
2020-10-21 17:56:05 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Rex Hill
b499a388b7 Fix a thread safety issue in perforce integration
#jira UE-95729
#rb lauren.barnes

[CL 13924176 by Rex Hill in ue5-main branch]
2020-07-22 11:56:24 -04:00
Matt Kuhlenschmidt
33c1f3ae03 Fix perforce connection icon not appering correctly if a server and credentials are specified but the server cannot be contacted.
#rb none

[CL 13276118 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-12 09:33:58 -04:00
smallshake
86a6bb28c5 Copying from Dev-Editor
PR #6608: Perforce Plugin: Use -P4Passwd cmd argument value when connecting to Perforce. (Contributed by smallshake)

#rb jason.stasik,ben.marsh
#jira UE-87467

#ROBOMERGE-SOURCE: CL 11588961 in //UE4/Release-4.25/... via CL 11588966
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11589146 by robomerge in Main branch]
2020-02-24 13:31:04 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00
josh engebretson
58aa6c2f9f Content browser, owner record branch change if mod time is newer
#rnx


#ROBOMERGE-SOURCE: CL 10600894 via CL 10600897 via CL 10600899
#ROBOMERGE-BOT: (v607-10590470)

[CL 10600907 by josh engebretson in Main branch]
2019-12-06 17:24:18 -05:00
josh engebretson
fd338bb294 Content browser status, filter delete operations (mod time 0) when content has been readded via branch/etc
#rnx


#ROBOMERGE-SOURCE: CL 10595988 via CL 10595995 via CL 10596000
#ROBOMERGE-BOT: (v607-10590470)

[CL 10596004 by josh engebretson in Main branch]
2019-12-06 14:48:56 -05:00