Commit Graph

238 Commits

Author SHA1 Message Date
philippe deseve
7b518b8604 Make sure to use loadedpath only for in memory files
Otherwise renamed packages will not resolve

#rb richard.malo

[CL 25647111 by philippe deseve in ue5-main branch]
2023-05-26 12:49:06 -04:00
jordan hoffmann
0fc6b63d92 [BugFix] Merge stopped working because ISourceControlProvider.GetState doesn't use depot file paths and FResolveInfo::IsValid had a bug
#rb none
#preflight 6467d56b75696d2bd70382c9

[CL 25551458 by jordan hoffmann in ue5-main branch]
2023-05-19 16:20:13 -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
marco anastasi
da6bb8b5e8 Implemented the FGetFileList operation for URC
Discussed this with [at]dave.belanger - the `FGetFileList` operation is only used by `USourceControlHelpers::GetFilesInDepotAtPath()`, and that method is currently not called by anything.

Also changed the implementation of `GetFilesInDepotAtPath()` to pass the search pattern as a parameter to the Operation.

#rb stuart.hill, dave.belanger, manuel.lang
#preflight 645a57644c3ec54e6e65f5bd

[CL 25403441 by marco anastasi in ue5-main branch]
2023-05-10 09:30:30 -04:00
jordan hoffmann
1625c5cc66 [BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest
#rb brooke.hubert, mattias.jansson, wouter.burgers
#preflight 64556c1ad77a82d6a78e3388

[CL 25365368 by jordan hoffmann in ue5-main branch]
2023-05-06 02:07:43 -04:00
marco anastasi
fedd4f7a9a Fixed: Unable to revert level file deletion in Check-in Window
#rb wouter.burgers, stuart.hill, manuel.lang
#preflight none

[CL 25333901 by marco anastasi in ue5-main branch]
2023-05-04 09:31:05 -04:00
paul chipchase
88a5010391 Clean up of FDownloadFile
#rb none
#jira UE-183529
#rnx
#preflight 643e6671b91c130758304d30

- Added code documentation
- Renamed ::AddFileData to ::__Internal_AddFileData and documented that it is for internal use in the source control api. This is a standard problem with our operations being both input and output structures and needs a better solution.
- Moved ::GetFileData to the cpp to reduce the amount of code in the header file.

[CL 25083228 by paul chipchase in ue5-main branch]
2023-04-18 06:32:01 -04:00
andrew phillips
0af1080300 Alternate fix for log spam
* Added memory package filtering in SourceControlHelpers.
* Added empty string filtering when sorting unsaved assets in the outliner.

#jira UE-182072
#preflight 643d26428e01968448be7c9f

[CL 25082663 by andrew phillips in ue5-main branch]
2023-04-18 05:09:10 -04:00
jordan hoffmann
cf8eb1d3c9 [Feature] AssetDefinition Merging
#jira UE-181566
#jira UE-181560
#rb ben.hoffman, dave.jones
#preflight 6439c1fec947f6523a79534d

[CL 25057796 by jordan hoffmann in ue5-main branch]
2023-04-14 21:26:21 -04:00
jordan hoffmann
fbe917e059 [BugFix] Review tool failing to connect to swarm
- Failed if user had multiple p4 tickets
- Failed if default p4 username didn't match the provided username in UE

#jira UE-181982
#rb paul.chipchase
#preflight 643061621d61ecec3b63c465

[CL 24970980 by jordan hoffmann in ue5-main branch]
2023-04-07 17:50:46 -04:00
paul chipchase
8e5f3aa155 CIS - Fix conflicting localization macros
#rb trivial
#jira none
#rnx
#preflight 6430391d7536ac6b78b2be95

[CL 24965701 by paul chipchase in ue5-main branch]
2023-04-07 12:12:49 -04:00
paul chipchase
f5464ba58b Allow additional error info to be stored in FSourceControlResultInfo.
#rb wouter.burgers
#jira UE-181418
#preflight 642ece61df6c5c78fc9b99c9

- Added FSourceControlResultInfo::EAdditionalErrorContext that describes additional info about errors that the operation might have encountered that the caller can poll for rather than trying to parse error strings.
-- NOTE that we cannot enforce this info to be provided by source control provider implementations so this additional info should only be used to improve error messages.
-- Initially we support the connection to the provider failing and the connection to the provider dropping mid operation.
- Moved FSourceControlResultInfo to its own code files.
- I wanted to move the implementation of FSourceControlResultInfo::Append to the cpp, but this causes linker problems even with SOURCECONTROL_API as some modules are not including source control properly. For now I have left it in the header file and will look into this in another code pass.

[CL 24943799 by paul chipchase in ue5-main branch]
2023-04-06 10:04:00 -04:00
marco anastasi
7827deedca Removed redundant check for status of all files after a Revert operation
#preflight none
#rb wouter.burgers

[CL 24851925 by marco anastasi in ue5-main branch]
2023-03-30 05:10:12 -04:00
stanley hayes
d5af451d80 #JIRA: SOL-4250
Adding a modified icon for revision control, icon is a grey checkmark with a dot

#rb YiLiang.Siew
#rb Jared.Cotton
#rb Manuel.Lang
#rb Wouter.Burgers
[FYI] Erik.Dillinger


#rnx
#preflight 641215e35819afacaf249f90

[CL 24727408 by stanley hayes in ue5-main branch]
2023-03-20 21:00:06 -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
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
wouter burgers
ddaa200319 SourceControl: Added cvar to force the modal dialog to always show up as a modal dialog, ignoring the preference of the calling code.
#preflight 64102f84c41a0a2a77063d17

[CL 24633200 by wouter burgers in ue5-main branch]
2023-03-14 07:39:31 -04: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
wouter burgers
09ca92480b SourceControl: Fixed inconsistent results when reverting asset in 'Submit Files' dialog.
#preflight none

[CL 24541931 by wouter burgers in ue5-main branch]
2023-03-07 11:59:14 -05:00
marco anastasi
641c93f543 Updated icons for Check-in Changes and Sync Latest status bar buttons
#rb wouter.burgers
#preflight 63f3d7321d71bcd2624a4feb

[CL 24332254 by marco anastasi in ue5-main branch]
2023-02-20 21:07:58 -05:00
marco anastasi
ba94a69dbb Implemented auto-save on check-in.
Fixed issue that prevented deleted objects from being restored on Revert All
As a collateral, fixed issue that caused not saving deleted files during Delete workflow to result in errors after sync
As a collateral, fixed issue that caused added and saved files to disappear after Sync Latest

#rb wouter.burgers, stuart.hill
[FYI] brooke.hubert, manuel.lang
#preflight 63ed15e5c9692d7c04ea4188

[CL 24251962 by marco anastasi in ue5-main branch]
2023-02-16 02:09:33 -05:00
wouter burgers
acd14248c8 SkeinUE: Rename 'Skein' to 'Unreal Revision Control' in the revision control dropdown.
Tricky bit is to ensure that we're backwards compatible for projects with SourceControlSettings saved on disk/cloud that reference 'Skein' now use 'Unreal Revision Control' instead.

#preflight 63ea2830923476b686c42d22

[CL 24174383 by wouter burgers in ue5-main branch]
2023-02-13 10:02:20 -05:00
wouter burgers
b47523fd5f SourceControl: Changing capitalization of 'revision control' to 'Revision Control' per UX guidelines.
#preflight none

[CL 24046484 by wouter burgers in ue5-main branch]
2023-02-07 05:41:38 -05:00
wouter burgers
1d6ef4b2e3 SourceControl: Added CanExecuteOperation to ISourceControlProvider interface.
#preflight 63de1752fe33a06594fc2e02

[CL 24018386 by wouter burgers in ue5-main branch]
2023-02-04 10:54:03 -05:00
wouter burgers
192829d351 SourceControl: Refactored UsesCustomProjectDir / GetSourceControlLocations usage pattern.
[CL 23965223 by wouter burgers in ue5-main branch]
2023-02-02 03:44:18 -05:00