Commit Graph

42 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
leon huang
0193ffe8d3 Fix for CIS warnings for localization duplicate keys. Fixes simply involve changing one of the colliding localization keys.
#rnx
	#rb: Vincent.Gauthier
	#jira: UE-143620
	#preflight: 6222489d2f7d78332e121416
	#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: leon.huang
#ROBOMERGE-SOURCE: CL 19272838 in //UE5/Release-5.0/... via CL 19273134
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19275063 by leon huang in ue5-main branch]
2022-03-04 16:10:23 -05:00
luc eygasier
5c80611276 Adds FSourceControlFilesDeletedDelegate. Should be broadcasted when revert/markfordelete operation could require cleanups (eg package/assets/ref deleted).
Fixes Reverting mark for add asset preventing to recreate an asset with the same name in the same editor session (Asset was still present in AssetRegistry).

#jira UE-140995, UEENGQA-62727
#rb Sebastien.Lussier
#tb Tim.Gautier
#preflight 62056230b84973a2bb61b450

#ROBOMERGE-OWNER: luc.eygasier
#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 18943038 in //UE5/Release-5.0/... via CL 18943294 via CL 18943483
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)
#ROBOMERGE-CONFLICT from-shelf

[CL 18943896 by luc eygasier in ue5-main branch]
2022-02-10 17:08:14 -05:00
luc eygasier
d6b8aa4536 Adds "Delete new files on revert" option for Source Control
Prevents Uncontrolled Changelist's UpdateStatus usage to pollute the error logs.

#jira UE-140095
#rb JeanFrancois.Dube
#preflight 61f44e47801201ab3894f020

#changelist validated

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 18796586 in //UE5/Release-5.0/... via CL 18797752 via CL 18798475
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18798602 by luc eygasier in ue5-main branch]
2022-01-31 17:03:09 -05:00
luc eygasier
09dd117298 Fixes empty assets crashing Changelist view.
Fixes Perforce' "DontCare" state preventing UncontrolledChangelist from freeing "not controlled + deleted" files.

#jira UE-133128
#rb Sebastien.Lussier
#robomerge Release-5.0

#changelist validated

[CL 18169021 by luc eygasier in ue5-main branch]
2021-11-12 10:23:14 -05:00
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
luc eygasier
6b7aa9e719 Rework Source Control Changelist Window?s Asset beautification:
* Adds Source Control Asset Data cache. Preventing Source Control Changelist Window to rebuild AssetData from scratch when UI refresh takes place
* Modifies Source Control beautification to async process, preventing crowded changelists to block the workflow. The filenames are now beautified when available.
* Parallelize AssetData information retrieval from SourceControl
* Updates message displayed when refreshing window's items

#rb Sebastien.Lussier, JeanFrancois.Dube
#jira UETOOL-3522
#robomerge Private-Frosty

#changelist validated

[CL 17375288 by luc eygasier in ue5-main branch]
2021-08-31 15:12:47 -04:00
luc eygasier
8708277124 * Adds "Validate Changelist" contextual action in Source Control Changelists window.
* Moves validation logs to message logs so they can be both accessible in OutputLogs and Hyperlink to SourceControl MessageLog

#rb JeanFrancois.Dube

#changelist validated

[CL 17141186 by luc eygasier in ue5-main branch]
2021-08-11 15:40:41 -04:00
luc eygasier
6d857d815a Adds "LastSynced" flag to Perforce Sync operation, allowing to force sync (ie revert) to the last synced version of an asset.
Modifies Revert operation on Uncontrolled assets to force sync to last synced version instead of head revision.

#rb Sebastien.Lussier

#changelist validated

[CL 16943684 by luc eygasier in ue5-main branch]
2021-07-23 20:21:53 -04:00
luc eygasier
d184e6608a Use AssetRegistry to add writable files to Reconcile cache.
Adds UncontrolledChangelistValidator, reconciling writable assets, warning the user if new uncontrolled changes are found during changelist validation

#rb Sebastien.Lussier
#preflight 60d0965a367e6700013a0083

#changelist validated

[CL 16728469 by luc eygasier in ue5-main branch]
2021-06-21 11:04:24 -04:00
luc eygasier
5bf071d1a9 Updates Uncontrolled Changelists module so unload operations removes files from reconcile cache.
* Removes "clear cache" contextuals actions from reconcile menu.
* Refresh action in Changelist Window now cleans loaded files cache to reconcile

#rb Sebastien.Lussier

#changelist validated

[CL 16693262 by luc eygasier in ue5-main branch]
2021-06-16 14:37:03 -04:00
luc eygasier
074a92e487 Update contextual menu in Changelist window to support Uncontrolled Changelists
* Update MarkForAdd operation to operate on a specified changelist
* Adds Force option in sync operation to be able to revert uncontrolled files
* Adds the resulting new changelist to FNewChangelist operation
* Adds support for "mark for add" files when moving from UCL to C
* Adds support for reverting Uncontrolled Changelist, Uncontrolled Changelist files, or mixes of controlled/uncontrolled files
* Adds support of "Move files to..." contextual action for Uncontrolled files and to Uncontrolled Changelists

#rb Sebastien.Lussier

#changelist validated

[CL 16662633 by luc eygasier in ue5-main branch]
2021-06-14 15:25:20 -04:00
luc eygasier
4def091199 Adds Offline files to Uncontrolled Changelists
* Adds Offline files to Source Control Changelist Window
* Use TSet.Remove return value to update state.

#rb Sebastien.Lussier

#changelist validated

[CL 16593836 by luc eygasier in ue5-main branch]
2021-06-08 17:12:06 -04:00
luc eygasier
8a36dd39f0 Adds automatic discovery of potentially modified files out of SourceControl.
* Adds reconcile contextual actions to manually trigger the verification process
* Loads UncontrolledChangelists module along UnrealEd to be able to hook loaded/saved files sooner
* Adds CPU Trace for FPerforceUpdateStatusWorker::Execute and ParseUpdateStatusResults
* Changes FPerforceCheckOutWorker to update Changelist State if checked out directly to a CL
* Changes FPerforceRevertWorker to update Changelist State after revert

#rb Sebastien.Lussier

#changelist validated

[CL 16477108 by luc eygasier in ue5-main branch]
2021-05-26 18:15:46 -04:00
luc eygasier
a5608833a9 Adds moving files from Uncontrolled Changelist to Changelist.
#rb Sebastien.Lussier
#preflight 609c2b365b35c60001e51d6c

[CL 16306199 by luc eygasier in ue5-main branch]
2021-05-12 17:06:06 -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
Luc Eygasier
0719865734 Fixes temporary CL left being when submitting default changelist.
Changing CL description just before submitting if needed, only if it is not the default CL.
Restore previous changelist description (before tag), in case the submit failed.

#rb Sebastien.Lussier, Julien.LHeureux
#jira UE-114188, UETOOL-3408
#changelist validated

[CL 16113557 by Luc Eygasier in ue5-main branch]
2021-04-26 09:23:26 -04:00
luc eygasier
18edf5ba3d Adds validation tag in changelist description.
#rb Sebastien.Lussier

#changelist validated

[CL 16051226 by luc eygasier in ue5-main branch]
2021-04-19 11:21:23 -04:00
luc eygasier
c45b45fb0c Enables "Locate file" only if assets are accessible from ContentBrowser.
#rb Sebastien.Lussier

[CL 15934324 by luc eygasier in ue5-main branch]
2021-04-06 16:11:32 -04:00
luc eygasier
49e2ce208b Adds notifications on success/failure when submitting with SourceControlChangelistsWidget
#lockdown Simon.Tourangeau
#rb Sebastien.Lussier
#jira UE-112896
#robomerge Release-5.0-EarlyAccess

[CL 15933038 by luc eygasier in ue5-main branch]
2021-04-06 14:20:24 -04:00
julien lheureux
e1004780ae Added timer on changelist refresh operation
Added Move files operation on files in changelist dialog (incl. move to new)
Added new changelist button in toolbar
Added cancellable "path beautification" when we have deleted/shelved files with no matching file, until we make it lazy and/or batched

#rb sebastien.lussier

[CL 15797238 by julien lheureux in ue5-main branch]
2021-03-24 08:29:57 -04:00
Sebastien Lussier
fbd129105f Source control changelists - Disable submit button if the validation contains errors
#rb richard.malo
#robomerge Release-5.0-EarlyAccess

[CL 15668594 by Sebastien Lussier in ue5-main branch]
2021-03-10 15:03:45 -04:00
sebastien lussier
ef589f0b39 Minor UX improvements to the Source Control Changelists window
#rb none

#ROBOMERGE-SOURCE: CL 15554968 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15554971 by sebastien lussier in ue5-main branch]
2021-02-28 23:55:37 -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