Commit Graph

53 Commits

Author SHA1 Message Date
richard malo
27956d595f Avoid getting spam warnings coming from world outliner usaved column trying to resolve actor memory package path when running PIE.
#rb jeanfrancois.dube
#preflight 6386298df213a116eb293e15

[CL 23312521 by richard malo in ue5-main branch]
2022-11-29 12:35:57 -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
henrik karlsson
fa90b399a4 Added includes for future change. This changelist only contains added #include and a couple of empty placeholder files
Tested compiling fortnite, unrealeditor, lyra, qagame with non-unity/pch

#preflight 63635997876630122adeab9f
#rb none

[CL 22958990 by henrik karlsson in ue5-main branch]
2022-11-03 14:18:47 -04:00
patrick enfedaque
5b51457a6c - Remove UUnrealEdEngine::OnSourceControlFilesDeleted delegate (Unloading/Reloading of packages should be handled by USourceControlHelpers::ApplyOperationAndReloadPackages)
- Change ApplyOperationAndReloadPackages so that it calls DeleteObjectsUnchecked instead of UnloadPackage (which is what OnSourceControlFilesDeleted did)

#rb luc.eygasier
#preflight 634040d8437603cb0e2b7d03
#rnx

[CL 22456126 by patrick enfedaque in ue5-main branch]
2022-10-11 08:37:16 -04:00
bryan sefcik
0beee50b45 Updated ../Engine/Source/Developer/... to inline gen.cpp files
Before:
Total CPU Time: 53783.640625 s
Total time in Parallel executor: 558.66 seconds
After:
Total CPU Time: 47886.140625 s
Total time in Parallel executor: 498.81 seconds

#jira

[CL 22173145 by bryan sefcik in ue5-main branch]
2022-09-24 13:31:25 -04:00
patrick laflamme
baaeea90d5 Fixed a crash that happening when a an asset that was just added to source control was reverted and the package was unloaded.
#rb Luc.Eygasier
#preflight 6328cdd90a4ad044de4367f0

[CL 22088593 by patrick laflamme in ue5-main branch]
2022-09-20 00:46:40 -04:00
luc eygasier
48a54c4e48 Fixes packages from different project paths unable to be reverted.
#rb Patrick.Enfedaque
#preflight 62fe8dcaaa546d5e9d05d0a4
#changelist validated

[CL 21499945 by luc eygasier in ue5-main branch]
2022-08-22 21:22:48 -04:00
luc eygasier
0cda7fc8ed Modifies revert operations in source control window to also reload packages.
Adds Source Control Helper method to perform a modular source control operation and reload the concerned packages

#rb Patrick.Enfedaque
#preflight 62fd4e63e64b1a510937890b
#changelist validated

[CL 21444877 by luc eygasier in ue5-main branch]
2022-08-18 13:03:11 -04:00
patrick enfedaque
578bc094cd SCC: Dependency validation only on hard refs
#rb jeanfrancois.dube
#preflight 62fa5395153b17e746322f0c

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 21387351 via CL 21390995 via CL 21391795
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v975-21357124)

[CL 21394315 by patrick enfedaque in ue5-main branch]
2022-08-15 17:13:39 -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
cd4b7d3c78 Game user settings fix and rollback of 20905839, which was itself a rollback of 20029182
#rb [at]Josh.Adams
#preflight

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: mic.rooney
#ROBOMERGE-SOURCE: CL 20973575 via CL 20978259
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)
#ROBOMERGE-CONFLICT from-shelf

[CL 20980862 by marc audy in ue5-main branch]
2022-07-07 01:55:35 -04:00
mic rooney
f5a58f4e71 Temp backout while Josh is out so that we don't break workflows and he can re-backout/unrevert this when he's back in.
* Contains some selected back outs from other cls that included config context dependent changes, though it's limited to only backing out broken parts as much as possible to minimize surface area.

[Backout] - CL20029182
[FYI] josh.adams
Original CL Desc
-----------------------------------------------------------------
- Adding FConfigContext which is used to repalce LoadExternalIniFile, LoadLocalIniFile, etc, as well as have localized data for all configs read on a thread (like the other platform configs loaded in the editor)
- The Load*IniFile functions will create a Context, but eventually those APIs will go away and the Context will be the only way to load ini files
- Simplified some of the ini loading code, like removing the HierarchyCache (it wasn't helping editor load times, and added much complexity, and was not thread-safe, and it shouldn't actually be helpful because all the calls to Load*IniFile should eventually be replaced with either GConfig or FCOnfigCacheIni::ForPlatform(), which won't need to re-read in files
- Ini reading time actually went down due to the simplification, including Cache removal
- Left in old code for now behing a #define (USE_CONTEXT) in case something goes wrong
- Added in VERIFY_CONTEXT mode which I used to run original and Context modes and compare (including preflighting builds) (I also added a Compare function that we may want to keep around to use for future debugging)
- Added a separate set of config layers for plugins which speeds up plugin parsing, but also will fix the issue with BaseEngine.ini vs DefaultEngine.ini in Engine vs Project plugins (this shows how Contexts can bring useful information down into the guts - however a later change will enable it)
- Once this is all seen to be working, I will clean up the non-Context functions, and some globals vs static members, etc
#rb paul.chipchase
#preflight 62716c1c5e6ce673f452005a


#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 20029165 via CL 20029180 via CL 20905839 via CL 20905880
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v971-20777995)

[CL 20908094 by mic rooney in ue5-main branch]
2022-06-30 20:54:32 -04:00
vlad golovan
e378ef3273 Adding Async version of QueryFileState.
#rb Patrick.Laflamme

#ROBOMERGE-OWNER: vlad.golovan
#ROBOMERGE-AUTHOR: vlad.golovan
#ROBOMERGE-SOURCE: CL 20599361 via CL 20599875 via CL 20599876
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v955-20579017)

[CL 20601769 by vlad golovan in ue5-main branch]
2022-06-10 16:29:12 -04:00
stanley hayes
5dbfb6b452 #JIRA: SOL-2791
Updates to source control helpers that:
- allow for reverting files marked for delete
- return success on a successful 'mark for delete'
#rb YiLiang.Siew
#rnx
#preflight 629fca23617cbe81d33de34d

#ROBOMERGE-AUTHOR: stanley.hayes
#ROBOMERGE-SOURCE: CL 20569168 via CL 20569170 via CL 20569172 via CL 20569174 via CL 20569176
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v954-20466795)

[CL 20570262 by stanley hayes in ue5-main branch]
2022-06-08 22:17:43 -04:00
josh adams
46a830d6b4 - Replacing many uses of LoadGlobalIniFile and LoadExternalIniFile with FCOnfigContext
#rb matt.peters
#p4v-preflight-copy 20293528
#preflight 629665d15238916c514359ad

[CL 20441581 by josh adams in ue5-main branch]
2022-05-31 16:25:06 -04: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
sebastien lussier
de32e0fb24 Failure to checkout files during the HLOD generation process gives no context at all
#rb jeanfrancois.dube
#lockdown jeanfrancois.dube
#preflight 6143656e3c7c670001d2a328

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 17540134 via CL 17944595 via CL 18363715 via CL 18363950
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18364043 by sebastien lussier in ue5-release-engine-test branch]
2021-12-02 23:08:24 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
Sebastien Lussier
f4be498ef2 FScopedSourceControl - Fix wrong condition preventing source control initialisation
#jira none
#rb patrick.enfedaque
#lockdown simon.tourangeau

[CL 15940139 by Sebastien Lussier in ue5-main branch]
2021-04-07 10:24:08 -04:00
patrick enfedaque
66aa1c1b1d FScopedSourceControl: Only Init/Close Provider if it isn't Enabled yet
#rb jeanfrancois.dube, sebastien.lussier

#ROBOMERGE-SOURCE: CL 15889359 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15890444 by patrick enfedaque in ue5-main branch]
2021-04-01 12:15:20 -04:00
patrick enfedaque
e8ea35842e SourceControlHelper: Replace UE4 by UE in comment
#jira UE-111669

#rb none

#ROBOMERGE-SOURCE: CL 15776338 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15786021 by patrick enfedaque in ue5-main branch]
2021-03-23 17:59:47 -04:00
Sebastien Lussier
3901276790 WP HLODBuilder - Fix error when there's no files to mark for add
* P4 SCC would give an "invalid syntax" error as the p4 command was ill formed
* Added early exits in USourceControlHelpers operations that take an array of files
#robomerge Release-5.0-EarlyAccess
#rb patrick.enfedaque

[CL 15727461 by Sebastien Lussier in ue5-main branch]
2021-03-17 14:01:05 -04:00
Sebastien Lussier
adbade9535 Source control window speedup - USourceControlHelpers::GetAssetData() should only consider assets on disk
#fyi jeanfrancois.dube
#robomerge Release-5.0-EarlyAccess

[CL 15555247 by Sebastien Lussier in ue5-main branch]
2021-03-01 01:43:21 -04:00
julien lheureux
a460459eed Added possibility to get asset data from history, with a max fetch size (until we have a better solution)
Changed the way we associate shelved files with their local filename to facilitate mapping (perforce operations)
Implemented what was needed on the SCC side to support diff against shelve
Improved way we display object names for deleted & shelved files

#rb sebastien.lussier

[CL 15356101 by julien lheureux in ue5-main branch]
2021-02-08 09:36:20 -04:00