Commit Graph

256 Commits

Author SHA1 Message Date
benoit chauvin
c36eb46eaf Fixing LOCTEXT conflicts introduced with previous CL 28533347.
#jira UE-197443
#rb none

[CL 28580200 by benoit chauvin in ue5-main branch]
2023-10-09 09:36:51 -04:00
richard malo
239ac90407 Refactor in preparation of supporting Data Layer Instances saved in their own external package.
- Adapted existing code to propertly support external package on object not directly outered to the level.
- Generalized handling of external objects when renaming a world, resetting package loaders in ULevelStreamingLevelInstance, handling dirty external packages
- Implemented FExternalPackageHelper::CopyObjectsExternalPackageFilePathToClipboard
- Added optional PrimaryAssetDisplayName asset registry tag to allow for systems to use a display name (generalized version of ActorLabel tag)
#rb jeanfrancois.dube, patrick.enfedaque
#jira UE-197314

[CL 28537555 by richard malo in ue5-main branch]
2023-10-06 09:14:09 -04:00
benoit chauvin
5f4e27ed26 New Delegate to override the submit functionality for the Source Control Changelist window and the Source Control Window.
This new delegate give users the capability to intercept and handle the submit instead of the regular flows.
Depending on the reply from the delegate the current flow will be:
- interrupted if the submit is handled by the delegate
- interrupted and set to fail state if the delegate returns an error
- continued if the delegate cannot handle the current source provider

#rb Stuart.Hill, brooke.hubert, Patrick.Enfedaque

[CL 28533359 by benoit chauvin in ue5-main branch]
2023-10-06 04:38:12 -04:00
wouter burgers
3500d71466 SourceControl: The ChoosePackagesToCheckIn operation should optionally perform a sync ('pull-before-push' model) for snapshot based source control systems.
Skein, the only provider that returns 'true' for 'UsesSnapshots()' requires the user to be at head when doing a check-in operation, or the check-in will fail.
This is enforced within the plugin, not the CLI, by performing an FSync prior to doing an FCheckIn. It's not easy to do the sync within the CLI as part of the check-in as the editor doesn't release its file locks when doing an FCheckIn, causing syncs to fail.
For this, a code path was introduced in SourceControlMenuHelpers that triggers a sync before triggering the check-in, when clicking the 'Check In Changes' button visible in the bottom right of the editor within UEFN.
However, this approach fails if other code paths in the editor call ChoosePackagesToCheckIn directly. This is known to happen for the MainFrame's "Submit Content" action, which was therefore disabled for Skein in #26272334, but the issue could be more widespread.

To provide a definitive fix for this issue, the sync is moved to within ChoosePackagesToCheckIn, triggered only when 'UsesSnapshots()' is true, which effectively means Skein only.

#rnx

[CL 27582511 by wouter burgers in ue5-main branch]
2023-09-04 04:10:36 -04:00
han chu
2c25f2c11e New feature:
Unsaved asset drag-and-drop handler: When unsaved assets are selected and then dropped onto a changelist entry, they are checked out, saved, and then moved to the target changelist.

#jira UE-181906
#rb @zach.rammell

[CL 26976967 by han chu in ue5-main branch]
2023-08-09 18:41:28 -04:00
marco anastasi
3d7c53d6f7 Made Submit Content button invisible when URC is the selected source control provider.
#rb manuel.lang, wouter.burgers

[CL 26273415 by marco anastasi in ue5-main branch]
2023-06-27 18:16:19 -04:00
dan oconnor
850690a092 Fix crash when diffing virtual revision
#jira UE-189730

[CL 26272033 by dan oconnor in ue5-main branch]
2023-06-27 17:33:18 -04:00
zach rammell
72380fa32e Add UE::ComparisonHelpers::CompareNaturalOrder, use it in scene outliner and changelist window
#jira UE-168849
#rb Steve.Robb ronald.koppers

[CL 26134967 by zach rammell in ue5-main branch]
2023-06-20 17:17:09 -04:00
jordan hoffmann
2b08e650c7 [CDPR] Added more information about changelist to source control changelists window context menu
+ Expand source control menu context with selected changelist,
+ Expose information about if changelist is default and its source control specific identifier,

#rb Patrick.Enfedaque, Patrick.Laflamme, zach.rammell
#preflight skip
#p4v-cherrypick 25526575
#preflight 64665919b91ab13b09c2089c

[CL 25528171 by jordan hoffmann in ue5-main branch]
2023-05-18 13:20:35 -04:00
zach rammell
ea9c2dae18 View Changes: Only reregister components once when saving
#jira UE-181899
#rb ronald.koppers
#preflight 645c03848e01daf0e5bcc383

[CL 25416984 by zach rammell in ue5-main branch]
2023-05-10 17:14:13 -04:00
marco anastasi
d21b6c2cd0 Added ability to revert conflicted files in the Submit Files window.
A side effect of showing conflicted items greyed out in the Submit Files window is that the Revert operation is also disabled as greyed-out items are not selectable. This is not desirable as the user may well want to get out of a conflict situation by reverting the conflicted file and the submit dialog is a convenient place to do that.

#rb stuart.hill, manuel.lang
#preflight none

[CL 25333894 by marco anastasi in ue5-main branch]
2023-05-04 09:30:48 -04:00
wouter burgers
2f30b42b92 SkeinUE: When using the CHECK-IN CHANGES button, perform a SYNC first, as the API expects pull-before-push.
#preflight none

[CL 25282069 by wouter burgers in ue5-main branch]
2023-05-01 02:05:33 -04:00
zach rammell
0154b40c13 View Changes: Saving to changelists can now be canceled
#jira UE-181898
#rb ronald.koppers
#preflight 64485db8b208f61af8c02a52

[CL 25191943 by zach rammell in ue5-main branch]
2023-04-25 19:16:30 -04:00
zach rammell
5dd8f64ecb View Changes: Refresh active view when sorting columns
Previously only refreshed the changelist view

#jira UE-181901
#rb ronald.koppers
#preflight 644832fc864f15ebf5dbe7aa

[CL 25188908 by zach rammell in ue5-main branch]
2023-04-25 16:24:25 -04:00
zach rammell
93e73ed3cb View Changes: Prevent possible crashes when reverting
#jira none
#rb ronald.koppers
#preflight 644701be434155a8f85258aa

[CL 25173059 by zach rammell in ue5-main branch]
2023-04-24 18:44:23 -04:00
jamie dale
933348f856 Use the FMessageDialog overloads that pass the optional title by-value
#jira
#rb none
#rnx

[CL 25062589 by jamie dale in ue5-main branch]
2023-04-15 19:49:32 -04:00
marco anastasi
f6978a065c Created new Source Control feature flag UsesSnapshots() to solve inconsistency in use of UsesChangelists() and UsesFileRevisions() causing issues for git Source Control Provider
* Option to check in an asset from the Content Browser Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to check in an asset from the Scene Outliner Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Ability to uncheck files in the Submit Files Window is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to revert the writable flag on an asset in the Content Browser Source Control Context Menu is now enabled if the SCC uses checkout instead of if it uses File Revisions (like the 'Make Writable' option)

#jira UCS-6630
#rb brooke.hubert, wouter.burgers
#lockdown jeanmichel.dignard
#preflight 640e6b41482188d710ff8316

[CL 24724061 by marco anastasi in ue5-main branch]
2023-03-20 17:20:41 -04:00
wouter burgers
1f3f797346 SourceControl: Revert individual added non-package filse in check-in window sometimes does not work.
#preflight none

[CL 24646650 by wouter burgers in ue5-main branch]
2023-03-14 18:59:26 -04:00
wouter burgers
d59c4daedc SourceControl: Refactored 'revert unsaved' behavior to be consistent in SceneOutliner and ContentBrowser, following #23845005.
- Can be enabled/disabled via cvar (default disabled, enabled in Skein).
- Can revert unsaved in ContentBrowser (=new)
- Can revert unsaved in SceneOutliner (=existing)

#preflight 641059120e1f02786b3dd9ee

[CL 24636117 by wouter burgers in ue5-main branch]
2023-03-14 11:07:11 -04:00
Patrick Laflamme
3ba42cf0e5 Fixed missing '#changelist validated' tag when submitting without editing the changelist text.
#jira UE-179855 - Validation system is Failing to Append '#changelist validated' Tag in CL Description
#rb Brooke.Hubert
#preflight 640f28c4af3fc35292b3b252

[CL 24634288 by Patrick Laflamme in ue5-main branch]
2023-03-14 09:27:26 -04:00
wouter burgers
7403ba2cf4 SourceControl: After reverting all files in the 'Submit Files' dialog, close it.
#preflight none

[CL 24557400 by wouter burgers in ue5-main branch]
2023-03-08 06:19:24 -05:00
marco anastasi
0f5a4e5481 Add support for cherry picking an asset from the asset history dialog, using Tool Menus
#rb wouter.burgers, brooke.hubert
#preflight 640795242559570cc7f6705b

[CL 24557170 by marco anastasi in ue5-main branch]
2023-03-08 05:40:18 -05:00
wouter burgers
ee0bc4b3f4 SourceControl / UEFN: Hide UEFN 'Revert' functionality behind cvars.
#preflight none
#preflight 640841a4827cf9251bf9f30d

[CL 24556839 by wouter burgers in ue5-main branch]
2023-03-08 05:01:20 -05:00
jordan hoffmann
f46746f35f [CrashFix] Fix Dereference Null
#rb trivial
#pf none

[CL 24456485 by jordan hoffmann in ue5-main branch]
2023-02-28 20:40:09 -05:00
jordan hoffmann
5abf21121d [BugFix] Modified actors are not diff'ing correctly with one file per actor
#rb dan.oconnor
#rb francis.hurteau

[CL 24451087 by jordan hoffmann in ue5-main branch]
2023-02-28 16:07:32 -05:00