Commit Graph

12 Commits

Author SHA1 Message Date
wouter burgers
479acf7cdf SourceControl: Fixed hitch caused by conflict remaining/upcoming scanning in large repositories.
Instead of scanning the cache in its entirity (twice!) on every source control status cache, the Skein provider now keeps track of remaining/upcoming conflicts incrementally as new source control statuses come in.

#jira UE-213176
#rb Manuel.Lang

[CL 33300055 by wouter burgers in ue5-main branch]
2024-04-29 10:22:55 -04:00
wouter burgers
becd423b59 SourceControl: Fixed 'Sync' option not displaying in the status bar.
I wasn't actually able to reproduce the issue, but I did find some oddities regarding the visibility of the checkin/sync/restore buttons. For example: if Skein is 'unavailable', the checkin/sync buttons would be hidden but the restore button could be available. I also made the buttons more explicitly tied to Skein to avoid them showing up using Git/Perforce.

#rb Marco.Anastasi

[CL 33265056 by wouter burgers in ue5-main branch]
2024-04-26 11:10:13 -04:00
wouter burgers
758113aa94 Skein / ConflictUE: Update primary URC buttons with conflict icons when a user saves changes to a file that we know is out of date.
#rb Manuel.Lang

[CL 32615215 by wouter burgers in ue5-main branch]
2024-03-29 11:45:26 -04:00
wouter burgers
b96d8d30b2 SkeinUE: Refactored SSourceControlControls.
The SSourceControlControls is currently instantiated in two places in the editor: bottom right and as part of the snapshot history panel. Regardless, we would like the behavior of these buttons to be the same. This was accomplished by providing 'defaults' in SourceControlMenuHelpers and then setting temporary 'overrides' in SnapshotHistoryPanel. This wasn't very pretty and somewhat confusing with SSourceControlControls providing a mix of instance and static interfaces and behaviors. I've refactored this with the idea in mind that these buttons should behave similar, wherever they are placed in the editor and providing static methods to control that behavior. The default behavior is now no-op and SnapshotHistory provides the UEFN/Skein behavior.

This also allowed the 'CanAutoSave' code to live in one location (in the SnapshotHistoryController) instead of being duplicated in two spots. This was also not possible because engine code cannot be accessed from SkeinSourceControlSlate, where the SSourceControlControls was being instantiated, resulting in the behavior as described in the JIRA bug.

#rb manuel.lang, marco.anastasi

[CL 31796796 by wouter burgers in ue5-main branch]
2024-02-26 03:57:11 -05:00
marco anastasi
4f2e25abee * Added Restore as Latest functionality
* Created 'Restore as latest' dialog

#rb wouter.burgers

[CL 31095574 by marco anastasi in ue5-main branch]
2024-02-01 13:58:40 -05:00
marco anastasi
9be55ae1ae Populate Assets List in expanded Snapshot view
Created Asset Class 'filter pill' widget
Extended Assets List to display a colour pill representing the asset class

#rb wouter.burgers

[CL 30443162 by marco anastasi in ue5-main branch]
2023-12-22 14:15:22 -05:00
wouter burgers
389ae421f8 Skein / Snapshot History: Assorted snapshot history UI updates. See JIRA for checkmarked list.
#rb Marco.Anastasi
#rnx

[CL 30438221 by wouter burgers in ue5-main branch]
2023-12-22 03:31:43 -05:00
wouter burgers
5204069750 Skein / ConflictUE: Fixed 'check in changes' no longer redirecting to the 'conflict resolution' window when there are conflicts remaining. This was introduced in #29863963 when SSourceControlControls was created.
#rb Marco.Anastasi
#rnx

[CL 30260472 by wouter burgers in ue5-main branch]
2023-12-12 07:03:52 -05:00
wouter burgers
9dce208c39 UEFN / Skein: Fixed 'Sync To Latest' functionality moving the user out of their selected 'EditorMode' and losing a part of their progress, by disabling the SourceControl 'Check In Changes' and 'Sync Latest' buttons while an interactive tool is active.
#rb Jamie.Dale, Manuel.Lang, Marco.Anastasi
#rnx

[CL 30010665 by wouter burgers in ue5-main branch]
2023-11-30 03:37:36 -05:00
wouter burgers
b1096cb5d0 Skein / ConflictUE: Enable conflict resolution workflow and remove the obsolete retrieval of asset list pre-pass.
If a conflict situation ever ends up blocking an internal developer (due to some unforeseen issue), the CLI command 'asset resolve conclude' can always get them out of it.

#rb Marco.Anastasi
#rnx

[CL 29884264 by wouter burgers in ue5-main branch]
2023-11-22 03:36:56 -05:00
marco anastasi
768aebf28f Added #if SOURCE_CONTROL_WITH_SLATE to SSourceControlControls Slate class in SourceControl module
#rb paul.chipchase

[CL 29864891 by marco anastasi in ue5-main branch]
2023-11-21 10:29:56 -05:00
marco anastasi
0eb858d5d9 * Created Snapshot History Tab structure
* Created Date Picker Widget
* Created Source Control Controls Widget
* Refactored Status Bar menu to use Source Control Controls Widget

#rb wouter.burgers, stuart.hill

[CL 29864023 by marco anastasi in ue5-main branch]
2023-11-21 09:56:04 -05:00