Commit Graph

135 Commits

Author SHA1 Message Date
patrick laflamme
3d0ecd8bed Fixed possible out-of-memory issue with the FSourceControlFileStatusMonitor reserving -1 items in an array.
- Fixed an issue that didn't correctly account the number a pending files to check when source control provider changed.
  - Added check to be sure the monitor is called on the main thread.

#rb Patrick.Enfedaque
#preflight 6357df4e36767b3e1e62c9ee

[CL 22792937 by patrick laflamme in ue5-main branch]
2022-10-26 17:29:44 -04:00
patrick laflamme
e28ebcb558 Fixed crash in SourceControlFileStatusMonitor not checking of the Map iterator was valid before using it.
#rb trivial
#preflight trivial

[CL 22711581 by patrick laflamme in ue5-main branch]
2022-10-22 14:44:43 -04:00
marco anastasi
9d30e5f3ac Fixed bug with the way used to determine whether a source control provider uses a custom project base directory
#rb wouter.burgers, stuart.hill
[FYI] patrick.laflamme
#preflight 634e8c558c653695a7a8b2f0

[CL 22604838 by marco anastasi in ue5-main branch]
2022-10-18 13:16:32 -04:00
patrick laflamme
878d1ae127 Instrumented source control upcate callbacks with with cpu scopes for monitoring performances.
Optimized Collection code invoked at each source control update to avoid comparing large set to detect if the in-memory collection is different from the collection on disk.

#rb Julien.StJean
#preflight 6346e2cf663dafe4162e8c9e

[CL 22505265 by patrick laflamme in ue5-main branch]
2022-10-13 11:24:42 -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
patrick laflamme
068b6058ab Implemented the 'Unsaved' Editor status bar button that displays the number of unsaved assets (dirty packages) the user and potential warnings with respect to the source control those asset may have.
- Implemented the UnsavedAssetTrackers plugin and enabled it by default.
  - Added the 'Unsaved' button to the Editor taskbars to display the number of unsaved packages along with a warning icon if warning are associated with one of the unsaved files.
  - Updated the 'Save Content' package to display warnings if one of the packages has warnings.
  - Added a class to monitor and periodically update the source controlled status of a collection of files/packages.
  - Changed the default value of PromptForCheckoutOnAssetModification settings to False because the Unsaved button flow is complementary (and the popup was noisy for OFPA users).
  - Updated the changelist window to use the soure control file status monitor.

#jira UE-163734 - Implement the 'Unsaved' Editor Taskbar Button
#rb Patrick.Enfedaque
#preflight 633ae915b12b8af5fde80f7c

[CL 22322224 by patrick laflamme in ue5-main branch]
2022-10-03 20:38:09 -04:00
jonathan bard
4886c1a9f3 Fixed "SourceControl: Error: CommandMessage Command: UpdateStatus, Error: Usage: filelog" message being displayed when using GetFileHistory
#rb luc.eygasier

[CL 22271664 by jonathan bard in ue5-main branch]
2022-09-30 11:33:33 -04:00
patrick enfedaque
f5014308ba DefaultSourceControlProvider: Fix missing Make Writable option when disconnected from SCC (introduced in CL 22187137)
#rb none
[FYI] marco.anastasi
#preflight none

[CL 22209892 by patrick enfedaque in ue5-main branch]
2022-09-27 17:37:13 -04:00
marco anastasi
dd01cd42b5 Create shortcut buttons in Status Bar for Skein operations
#rb wouter.burgers, patrick.laflamme
#preflight 63301d3d665f6b8f7fab0066


RESOLUTION: Resolved conflict with IsAtLatestRevision() and GetNumLocalChanges()

[CL 22193646 by marco anastasi in ue5-main branch]
2022-09-26 16:32:49 -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
paul chipchase
623ba6cc9e The source control settings for the VA source control connection are no longer saved to a local ini file.
#rb Per.Larsson
#jira UE-163834
#rnx
#preflight 632d98e4b4515b7e221654ec

### Virtualization
- At the moment there is no way in the editor UX to change the source control settings for the source control backend, so what ever settings are found in the global environment would be applied when the editor is first run and then saved to a config file under the <saved> directory. From this point onwards those settings would always be used when setting up the source control backend. If the settings were wrong, the first time that the editor was started, then we'd continue to use the incorrect settings even if the global enviroment was fixed. Making the backend work at that point would require that the user know about the local ini file and change the settings there.
- We cannot fix this by just ignoring the ini file as it has been requested that users can add their settings there in case they want to customize things, so we just need to avoid saving to it.
- Added documentation to the source control backends header file on how to set up the ini file if needed.

### Perforce
- FSourceControlInitSettings now accepts EConfigBehavior which describes how we want the source control provider to deal with its settings with regards to the ini file.
- Note that EConfigBehavior is not a bitfield as we do not wish to support only writing to the ini file, there is no point if it cannot be read from.
- When the source control provider is creatred we pass on the into from EConfigBehavior to the FPerforceSourceControlSettings to enable/disable saving and loading.

[CL 22163769 by paul chipchase in ue5-main branch]
2022-09-23 20:05:59 -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
abfd119ea2 Enabled Uncontrolled Changelists by default.
Adds setting to disable uncontrolled changelists.

#rb Patrick.Laflamme
#jira UE-163064
#preflight 6328649b8c3def91aa6d9576
#changelist validated

[CL 22086935 by luc eygasier in ue5-main branch]
2022-09-19 21:54:38 -04:00
wouter burgers
286e2234bf SourceControl / UEFN: Remove / disable 'sync' context menu item in Content Browser.
For SourceControl providers that do not support individual file revisions, the 'Sync' option in the context menu of the Content Browser is misleading as it suggests only the selected files/folders will be synced, while in reality the sync is project wide. I've left the current behavior as the default behavior for all but Skein/Git of which I know they do not support individual file revisions.

#preflight 631ec93359159ac1832b5538

[CL 22086921 by wouter burgers in ue5-main branch]
2022-09-19 21:54:19 -04:00
bryan sefcik
a3dddc6630 Pass 1 on Developer include fixes:
Removed redundant private include paths from build.cs files.
Fixed include paths to be relative to the private or public folders.
Hid or removed includes that reached into other private module folders.
Updated PublicInclude paths when necessary.

#jira
#preflight 631e281694758d0bf2ea1399

[CL 21960082 by bryan sefcik in ue5-main branch]
2022-09-11 18:32:18 -04:00
patrick laflamme
6819c99704 Removed the creation of hundreds of unneccesary temporary strings while parsing P4 results.
#rb Patrick.Enfedaque
#preflight 6310a693e352708d4462e191

[CL 21743001 by patrick laflamme in ue5-main branch]
2022-09-01 12:40:50 -04:00
Patrick Laflamme
67dacf2baa Fixed memory leak when a long source control operation blocks the main thread while the rendering thread renders to animate the source control feedback popup.
Note: This popup is currently disabled for P4.

#jira UE-161263 - GitHub 9492 : [UE-100291][UE-160299] Fix source control progress bar crashing out of video memory in case of long-running operation
#jira UE-160395 - GitHub 9464 : fix FScopedSourceControlProgress memory leak.
#jira UE-160299 - GPU memory leak during large source control operations

#rb Vincent.Gauthier
#preflight 63078403e674580995224875

[CL 21563977 by Patrick Laflamme in ue5-main branch]
2022-08-25 10:33:13 -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
Patrick Boutot
05001865a2 Update the size of SSourceControlLogin to let the user-defined source control plugin auto-adjust its size.
#rb lauren.barnes
#preflight 62cf8359a4645cf7b0e4eb58

[CL 21089449 by Patrick Boutot in ue5-main branch]
2022-07-14 07:37:58 -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