Commit Graph

55 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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 enfedaque
aa180f6f09 Fix not being able to revert Uncontrolled Changelist changes with files not at head revision. (files were forced synched to proper revision but would stay in the UC)
- Add flag to SourceControlOperation to test modified status against synched revision (p4 #have)
- Use this new flag when testing for modifications in UncontrolledChangelist

#jira UE-165558
#rb luc.eygasier
#preflight 633633b7936ff7e3dcda5f92

[CL 22271768 by patrick enfedaque in ue5-main branch]
2022-09-30 11:39:49 -04:00
paul chipchase
da282e1873 Add FSourceControlBackend support for storing virtualized payloads in a stream type depot.
#rb Per.Larsson
#rnx
#jira UE-160619
#preflight 62f37c86b66d5d93133d67e3

- Based on work from Jess.Kube

### Virtualization
- The source control backend now takes an optional config option "ClientStream" which takes the name of the client stream to use.
- If a client stream is set then workspaces created for payload submission will use that and not provide a client-view mapping.

#ushell-cherrypick of 21195584 by Jess.Kube
### PerforceSourceControl
- Allow FCreateWorkspace to create workspaces with streams as well as classic workspaces cia FCreateWorkspace::SetStream.
- Add a method FCreateWorkspace::ClearClientViewMappings which will clear any client view mappings already added to the operation.
- If we detect that a FCreateWorkspace operation has both a stream set and client view mappings set then FPerforceCreateWorkspaceWorker will return an error. Perforce will allow us to creat a client spec with both entries, but will default to using the stream. Technically we could allow this too but it might cause unexpected behaviour to the caller. It is better to give a clear error and fail the workspace creation.

[CL 21316756 by paul chipchase in ue5-main branch]
2022-08-10 08:51:05 -04:00
bryan sefcik
de1956f47b Ran IWYU on Public headers under Engine/Source/Developer/...
Headers are updated to contain any missing #includes needed to compile and #includes are sorted.  Nothing is removed.

#ushell-cherrypick of 21064294 by bryan.sefcik
#jira
#preflight 62d5c2111062f2e63015e598

#ROBOMERGE-OWNER: bryan.sefcik
#ROBOMERGE-AUTHOR: bryan.sefcik
#ROBOMERGE-SOURCE: CL 21155249 via CL 21158121 via CL 21161259
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21182053 by bryan sefcik in ue5-main branch]
2022-07-20 12:03:45 -04:00
marc audy
0edc19c939 Duplicating assets should keep a perforce relationship to the original file
#rb Brooke.Hubert
#jira

#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 21119014 via CL 21119416 via CL 21119491
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21142516 by marc audy in ue5-main branch]
2022-07-17 22:46:56 -04:00
marc audy
c4f29a0675 Fixup files that did not merge properly/got included in the merge unintentionally
#jira
#rnx

#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 20962704 via CL 20962785 via CL 20962797
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v971-20777995)

[CL 20964187 by marc audy in ue5-main branch]
2022-07-06 05:41:03 -04:00
marc audy
7c7733328f Update Main from //Fortnite/Dev-EngineMerge [at] 20952818
This represents UE5/Main [at] 20628573
#jira
#rnx

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 20960321 via CL 20962677 via CL 20962692
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v971-20777995)

[CL 20963796 by marc audy in ue5-main branch]
2022-07-06 05:11:09 -04:00
wouter burgers
cc6477999d SourceControl: Add FGetSubmittedChangelists operation.
#jira UCS-3549
#review-20287134
#preflight 628745339a4fcb31acdd42e6

[CL 20292011 by wouter burgers in ue5-main branch]
2022-05-20 03:46:02 -04:00
vlad golovan
9a0c0dad75 Source control operation to get file from depot. Users can now pull a shelfed changelist files.
#rb Patrick.Laflamme
[REVIEW] [at]marshall.beachy, [at]jay.Nakai

#ROBOMERGE-OWNER: vlad.golovan
#ROBOMERGE-AUTHOR: vlad.golovan
#ROBOMERGE-SOURCE: CL 19745483 via CL 19747037 via CL 19747055
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v939-19570697)

[CL 19801743 by vlad golovan in ue5-main branch]
2022-04-18 23:23:28 -04:00
vlad golovan
702da1818c GetChangelistDescription SourceControlOperation to get information about the changelist for blueprint review tool
#rb patrick.laflamme
[REVIEW] [at]marshall.beachy, [at]jay.Nakai

#ROBOMERGE-OWNER: vlad.golovan
#ROBOMERGE-AUTHOR: vlad.golovan
#ROBOMERGE-SOURCE: CL 19576986 via CL 19578465 via CL 19578760
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19580636 by vlad golovan in ue5-main branch]
2022-03-31 19:25:37 -04:00
paul chipchase
9f5ba891db Added an array view overload to FUpdatePendingChangelistsStatus::SetChangelistsToUpdate to make it easier for the caller to add a single changelist
#rb Luc.Eygasier
#rnx
#robomerge FNNC
#preflight 623490fab43f22036e0fe993

[CL 19435090 by paul chipchase in ue5-main branch]
2022-03-18 10:33:11 -04:00
paul chipchase
bcdf6ba3b9 Fix typo in method name
#rb trivial
#rnx
#preflight 622f580e344901ad192a0cdd

- Fix incorrect spelling in the method name.
- Oddly enough this was spelt correctly for both the member and in the comments.

[CL 19373079 by paul chipchase in ue5-main branch]
2022-03-14 11:14:19 -04:00
paul chipchase
14b6c6fc6a Allow the caller to decide if FUpdateStatus will check for directy paths based on the path itself (terminating in a seperator) or if the file system should be used instead.
#rb Patrick.Laflamme
#jira UE-145721
#rnx
#preflight 622f0358752729a2ad448e16

- The problem we have is if a p4 depot path is used when requesting filestates (to see if the file exists in p4 for example) it will be treated as a networkpath due to it starting with // so calling the filesystem to check if it is a directory or not can get very expensive.
- Other operations just check the end of the path for '/' or '\' which is what this operation used to do, but that was changed at some point to check the file system, presumably to fix another problem and as we don't really know how 3rd party code is using this system we cannot just change the behavior without risking breaking existing code bases.
- This fix allows the caller to opt in to the old behavior of just checking the end of the path to determine if it is a directory or not.
- This fix is not very good, future work for a better fix will be tracked in the attached jira.

[CL 19371141 by paul chipchase in ue5-main branch]
2022-03-14 05:25:55 -04:00
luc eygasier
17192faa91 Modifies UpdateStatus to enforce full validation only if bForceUpdate flag is used. Ignoring files not opened/edited by default.
#jira UE-142984
#rb Matt.Johnson
#preflight 621e9446f1206ae3ea672a99


#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 19209915 via CL 19210531 via CL 19211958 via CL 19212023 via CL 19212162
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19224112 by luc eygasier in ue5-main branch]
2022-03-02 13:11:09 -05:00
paul chipchase
bfbe90794a The source control operation FCreateWorkspace now supports setting a description.
#rb Sebastian.Nordgren
#rnx
#preflight 621896c2a77f4c4a4b9b7a86

[CL 19143635 by paul chipchase in ue5-main branch]
2022-02-25 04:17:39 -05:00
Mike Beach
d1f8e0da6e Adopting some editor source control modifications from a partner stream.
* Introduces a new 'GetFileList' operation
  * Adds "keep checked out" option to other operations

#rb Luc.Eygasier
#preflight 620598920c64e1822f4849a8

[CL 18946159 by Mike Beach in ue5-main branch]
2022-02-10 18:34:05 -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