Commit Graph

123 Commits

Author SHA1 Message Date
luc eygasier
0ab85e473c Removes FStatus operation in SourceControl.
Adds Modified State check by Hash for PerforceSourceControlProvider.
#rb Sebastien.Lussier

#changelist validated

[CL 16332246 by luc eygasier in ue5-main branch]
2021-05-14 14:01:14 -04:00
luc eygasier
9787a46325 Adds Base for Uncontrolled Changelist module.
#rb Sebastien.Lussier

#changelist validated

[CL 16224279 by luc eygasier in ue5-main branch]
2021-05-06 14:40:16 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Sebastien Lussier
f4be498ef2 FScopedSourceControl - Fix wrong condition preventing source control initialisation
#jira none
#rb patrick.enfedaque
#lockdown simon.tourangeau

[CL 15940139 by Sebastien Lussier in ue5-main branch]
2021-04-07 10:24:08 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
patrick enfedaque
66aa1c1b1d FScopedSourceControl: Only Init/Close Provider if it isn't Enabled yet
#rb jeanfrancois.dube, sebastien.lussier

#ROBOMERGE-SOURCE: CL 15889359 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15890444 by patrick enfedaque in ue5-main branch]
2021-04-01 12:15:20 -04:00
matt kuhlenschmidt
30e485f0f8 Updated async task notifications to the new progress notification api and reskined a few misc notifications
#rb lauren.barnes

#ROBOMERGE-SOURCE: CL 15797475 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15807602 by matt kuhlenschmidt in ue5-main branch]
2021-03-24 16:26:43 -04:00
patrick enfedaque
e8ea35842e SourceControlHelper: Replace UE4 by UE in comment
#jira UE-111669

#rb none

#ROBOMERGE-SOURCE: CL 15776338 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15786021 by patrick enfedaque in ue5-main branch]
2021-03-23 17:59:47 -04:00
Sebastien Lussier
3901276790 WP HLODBuilder - Fix error when there's no files to mark for add
* P4 SCC would give an "invalid syntax" error as the p4 command was ill formed
* Added early exits in USourceControlHelpers operations that take an array of files
#robomerge Release-5.0-EarlyAccess
#rb patrick.enfedaque

[CL 15727461 by Sebastien Lussier in ue5-main branch]
2021-03-17 14:01:05 -04:00
Sebastien Lussier
adbade9535 Source control window speedup - USourceControlHelpers::GetAssetData() should only consider assets on disk
#fyi jeanfrancois.dube
#robomerge Release-5.0-EarlyAccess

[CL 15555247 by Sebastien Lussier in ue5-main branch]
2021-03-01 01:43:21 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
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
6b739a3205 Added data validation capabilities in the source control.
Exposed data validation in changelists

#rb sebastien.lussier, jeanfrancois.dube, jamie.dale

[CL 15316170 by julien lheureux in ue5-main branch]
2021-02-04 11:50:49 -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
63c0fe02ac Few extra missing polish items for source control dialog
[CL 15179336 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-25 13:09:45 -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
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
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00