Commit Graph

135 Commits

Author SHA1 Message Date
wouter burgers
5e51dffdf0 SourceControl: Widen the 'transfer size' information from 'int32' to 'int64'.
#rnx

[CL 26458693 by wouter burgers in 5.3 branch]
2023-07-19 09:14:16 -04:00
wouter burgers
d085845cc8 SourceControl: Fixed actor label change not being reflected in the 'Submit Files' dialog because the cached FAssetData still contained the old label.
#rnx

[CL 26456671 by wouter burgers in 5.3 branch]
2023-07-19 07:14:36 -04:00
wouter burgers
988af42f3e UEFN / SourceControl: Added progress reporting to the 'Sync' operation initiated from the Project Browser.
- Reintroduced the FSkeinProjectInit as a separate operation so the FSyncPreview can succeed (it needs an initialized project directory).
- Ensured source control operations are done asynchronous wherever possible (and then waiting on them to complete, so still blocking) as no source control dialog pops up when the operation is asynchronous.

[REVIEW]

[CL 25947555 by wouter burgers in ue5-main branch]
2023-06-13 06:05:47 -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
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
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
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
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
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
zach rammell
1edfb3ed31 Unsaved Assets in Changelist Window
#jira UE-169781
#preflight 63d4247a5354589b5c022e4c
#rb brooke.hubert
#lockdown jeanmichel.dignard

[CL 23923988 by zach rammell in ue5-main branch]
2023-01-31 01:26:50 -05:00
marco anastasi
b29f599449 * Refactored Sync Latest operation to improve performance
* Sync Latest no longer listing and reloading all packages when the source control provider provides a sync preview functionality. When a Sync Preview is available, Sync Latest unloads only the files that are going to be overwritten by the sync operation, and then reloads them and the world

* Refactored Revert All operation to improve performance
* Revert All no longer lists and reloads all packages when the source control provider provides a sync preview functionality. Instead it unloads only the files that may be overwritten by the revert operation (i.e. submittable files), and then reloads them and the world
* Replaced RevertAndReloadAllPackages with RevertAndReloadWorld, no longer listing and reloading all packages (see https://p4-swarm.epicgames.net/reviews/23244245/)

This review is a combination of the two archived reviews https://p4-swarm.epicgames.net/reviews/23736137 and https://p4-swarm.epicgames.net/reviews/23736282

#rb wouter.burgers, stuart.hill, brooke.hubert, francis.hurteau
#preflight 63c9c7786a00f3cc8ead6779

[CL 23796067 by marco anastasi in ue5-main branch]
2023-01-20 15:31:16 -05:00
stuart hill
d8b31f7ed0 Add a flag to the source control provider to tell us if 'uncontrolled' changelists are supported.
#rb Marco.Anastasi, zach.rammell
#prelight 6398633f8c5081ee9a275f20

[CL 23499875 by stuart hill in ue5-main branch]
2022-12-13 18:18:02 -05:00
marco anastasi
d28eb652fb Implemented Asset Revert functionality from Scene Outliner.
Fixed 'Cannot revert umaps with Skein' by reloading all assets when attempting to revert a map
Implemented 'Revert All' button

#rb patrick.enfedaque, wouter.burgers, stuart.hill, manuel.lang
[FYI] francis.hurteau, brooke.hubert
#preflight 6388f51d4c3ce8ae5dbfb18f

#preflight 639340545c5308d18c28b967

[CL 23475314 by marco anastasi in ue5-main branch]
2022-12-11 23:09:22 -05:00
JeanMichel Dignard
5fc36285ba Fixed typos reported by localization
#jira UE-170395
#rb none
#preflight 63939b065c5308d18c4adbab

[CL 23468692 by JeanMichel Dignard in ue5-main branch]
2022-12-09 15:54:23 -05:00
aditya ravichandran
28eccf9aa0 Revision Control Iconography Update:
Update the default set of revision control icons
Create FRevisionControlStyleManager to manage the currently active revision control style and add a default style that is used by all providers
#rb lauren.barnes, brooke.hubert
#preflight 639364ee67018b14b5fb9891

[CL 23466976 by aditya ravichandran in ue5-main branch]
2022-12-09 14:18:01 -05:00
marco anastasi
3ff24ee93a Added separate toast description for generic error on failed auto-checkout
#rb manuel.lang, zach.rammell, wouter.burgers
#preflight 6387aad2b21cdd3a26d45878

[CL 23345359 by marco anastasi in ue5-main branch]
2022-11-30 21:18:15 -05:00
aditya ravichandran
f8b7ee5555 Replace any instances of "Source Control" with "Revision Control" in text in the Editor
#rb JeanMichel.Dignard, Robb.Surridge
#preflight 637d180efa348e8480e8837e

[CL 23250808 by aditya ravichandran in ue5-main branch]
2022-11-23 11:57:50 -05:00
paul chipchase
85c3793e92 Allow FGetChangelistDetails to accept the changelist number as part of the constructor, allowing it to be passed in as an arg for ISourceControlOperation::Create
#rb Per.Larsson
#rnx
#preflight

- Added a FStringView and FString&& versions of the constructor so we should be covered for all use cases.

[CL 23232563 by paul chipchase in ue5-main branch]
2022-11-22 04:38:16 -05:00
patrick laflamme
c710b14d86 Optimized the source control changelist to more efficienty update the list of source controlled files to monitor.
- Added function to the source control file status monitor to easily set the exact list of file to monitor efficiently
Fixed the source control changelist not monitoring all the files in view.

#rb Aditya.Ravichandran
#preflight 6362b9bf1a32af63a8f5b719

[CL 22937889 by patrick laflamme in ue5-main branch]
2022-11-02 23:06:17 -04:00
stuart hill
1fc502d9b1 Give the option to disable being able to diff files in the Source Control Submit Widget. To allow this, AllowsDiffAgainstDepot function should return false.
#preflight 6360fd498768c5532f5425f0
#rb Marco.Anastasi, Patrick.Laflamme

[CL 22888653 by stuart hill in ue5-main branch]
2022-11-01 15:09:57 -04:00