Commit Graph

187 Commits

Author SHA1 Message Date
wouter burgers
3561bdca77 SourceControl / UEFN: Change #22353231 added a check on FPaths::IsRelative to see if a string is a 'package name' or a 'config file'. However, that functions consider UEFN's "/MyProject/Path/To/Package.uasset" to be a rooted path instead of a relative path (even on Windows!). This fixes the intended behavior by separating project files out of the original function and handling them separately.
#preflight 6344218d7045f13c96b4b20b

[CL 22455673 by wouter burgers in ue5-main branch]
2022-10-11 07:54:27 -04:00
wouter burgers
63d0fbdf50 SourceControl / UEFN: Fixed non package files missing from check in dialog (uefnproject, uplugin, etc). Within UEFN projects, the FPaths::GetProjectFilePath() still returns the 'FortniteGame.uproject' file, instead of the '.uefnproject' file (unfortunately). To avoid adding a whole bunch of exceptions for UEFN specific files I check for any files under the GetSourceControlProjectDir that need to be submitted (the '.uefnproject' file, the '.uplugin' file or any other UEFN specific file).
#preflight 6336c34cd165c45137fc3327

[CL 22366132 by wouter burgers in ue5-main branch]
2022-10-05 19:08:41 -04:00
patrick enfedaque
377869bfc1 Uncontrolled Changelist: deleted files support
- Deleted files will show up in the Uncontrolled Changelists when a Source Control provider is selected
- Deleted files won't show up if SCC is disabled but will still be tracked in case SCC is renabled

#jira UE-164493
#rb luc.eygasier
#preflight 633af0bcba39998ce83121b4

[CL 22322389 by patrick enfedaque in ue5-main branch]
2022-10-03 20:43:35 -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
patrick enfedaque
b1ba9a9d10 Fix FOfflineFileTreeItem display name (Folders)
- Use same code to retrieve asset display information then FFileTreeItem

#rb patrick.laflamme
#preflight 6336cec7e72271755f0e7bea

[CL 22272707 by patrick enfedaque in ue5-main branch]
2022-09-30 12:21:26 -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
luc eygasier
96f1950f5a Adds new uncontrolled changelist option to "Move Files To..." dialog.
#preflight 63284d978131e92d659351bf
#rb Patrick.Laflamme

#changelist validated

[CL 22084693 by luc eygasier in ue5-main branch]
2022-09-19 19:50:22 -04:00
patrick laflamme
b74c0e6144 Fixed a crash when refreshing the shelved files in the Changelist Window.
#rb Patrick.Enfedaque
#preflight 6324dacdf258fccf98d91791

[CL 22064940 by patrick laflamme in ue5-main branch]
2022-09-16 21:25:44 -04:00
patrick laflamme
d9a04862a3 Added the 'Last Saved' and 'User' column to the changelist window.
- Implemented sorting and searching for the new columns.
  - Added a FUpdateStatus request to the source control provider when the user selects a changelist.  This gets the users that checked out the files along with extra file status.

Added support to enable/disable changelist window columns for 'Type', 'Last Saved' and 'User' columns and persisted the settings.
Added tooltips over the changelist row that display the content of a column. Useful when the value is clipped because the column is too small.
Added tooltips over the changelist row header.
Prevented creation of useless temporary strings in PerforceSourceControlOperations.cpp

#rb Patrick.Enfedaque
#preflight 6323613367163bf6600d4fc6

[CL 22040806 by patrick laflamme in ue5-main branch]
2022-09-15 18:45:09 -04:00
patrick laflamme
2edfdf21fd Fixed updating the description of the default changelist from the changelist window.
- The P4 default changelist cannot be saved, so a new changelist is created and all the files in the default changelist are moved in the new CL.

#rb Patrick.Enfedaque
#preflight 631f34f98c5f7af11bc3464b

[CL 21973981 by patrick laflamme in ue5-main branch]
2022-09-12 18:13:31 -04:00
patrick laflamme
aeddf4fe0c Implemented text search/filtering in the changelist window.
Changed the color of the uncontrolled changelist from gray to orange
Added an icon in the to the file status column header.

#jira UE-155216 - Make the selected changelist view (list of files in a CL) searchable.
#jira UE-155213 - Make the list of changelists searchable.
#rb Patrick.Enfedaque
#preflight 631b8c332b7fe03eb601ec03

[CL 21973932 by patrick laflamme in ue5-main branch]
2022-09-12 18:11:36 -04:00
luc eygasier
b8e3c2dc0e Fixes moving uncontrolled files to existing changelist.
#rb Patrick.Laflamme
#jira UE-162549
#preflight 631b50d4d135b61bc56332c4

[CL 21929890 by luc eygasier in ue5-main branch]
2022-09-09 18:18:54 -04:00
bryan sefcik
cb0456c6d4 Cleaned up build.cs files by removing any include paths that were already being added by UBT. This was done to help identify how include paths are being added and to help with future refactoring.
#jira
#preflight 631a5c04967ffc68fbf0dd8f

[CL 21911226 by bryan sefcik in ue5-main branch]
2022-09-08 21:44:02 -04:00
Robert Millar
cc414a65b3 FNames containing asset paths are deprecated. FSoftObjectPath or FTopLevelAssetPath should be used instead.
Fixups for misc editor files.

#jira UE-161932
#rb matt.hoffman
#preflight 631a8b47967ffc68fbf81fbd

[CL 21909504 by Robert Millar in ue5-main branch]
2022-09-08 20:52:53 -04:00
patrick laflamme
613bcd7b4d Fixed the 'Submit Window' saving the description of the default changelist into a new changelist without moving the files.
- In the 'Submit' window, renamed the 'Apply' button to 'Save' button.
  - If the user saves with the 'default' changelist, a new changelist is created with the user description and files are moved into that changelist.
  - If the user saves with any other changelist, ony the description is edited.

#rb Luc.Eygasier
#preflight 631a13a2304480f8f85aba2c

[CL 21909342 by patrick laflamme in ue5-main branch]
2022-09-08 20:48:26 -04:00
luc eygasier
92a1bc7f30 Adds support for multiple uncontrolled changelists
* Add creation of new uncontrolled changelists
* Add modification of uncontrolled changelists description
* Add uncontrolled changelists deletion

#preflight 6318ebec980179553e9254aa
#jira UE-163065
#rb Patrick.Laflamme

[CL 21892780 by luc eygasier in ue5-main branch]
2022-09-08 09:19:01 -04:00
luc eygasier
1dcadd2e97 Moves FUncontrolledChangelist::Name to FUncontrolledChangelistState::Description.
#rb Patrick.Laflamme
#preflight 6318ac73f448dc6e585d5fbd
#jira UE-163065

[CL 21864892 by luc eygasier in ue5-main branch]
2022-09-07 18:11:16 -04:00
patrick laflamme
7d45b8ba59 Fixed CIS non-unity build in SSourceControlChangerlisRows.h
#rb trivial

[CL 21864584 by patrick laflamme in ue5-main branch]
2022-09-07 18:03:25 -04:00
patrick laflamme
6e10ae05f3 Fix CIS non-unity build error in SSoucrControlChangelistRows and SSourceControlCommon
#rb Trivial

[CL 21862856 by patrick laflamme in ue5-main branch]
2022-09-07 17:15:55 -04:00
patrick laflamme
b3737f5dd6 Updated the source control changelist code to be more reusable.
- Moved all source control table row widgets found in SSourceControlChangelists.cpp into a separated files SSourceControlChangelistRows.h/.cpp
 - Moved content SFileTableRow.h into SSourceControlChangelistRows.h/.cpp and deleted the file.
 - Created column Id constants for the changelist files "Icon", "Name", "Path", "Type" rather than using hardcoded string.
 - Moved functions shared by the SSourceCOntrolChangeslists.cpp and SSourceControlChangelistRows.cpp into SSourceControlCommon.h/.cpp.

#rb Luc.Eygasier
#preflight 6317ab57f448dc6e583f2132

[CL 21862849 by patrick laflamme in ue5-main branch]
2022-09-07 17:15:39 -04:00
patrick laflamme
e3370eeb19 Implemented 2-columns sort in the changelist window.
Added a tooltip over the 'icon' colum in the changelist window.

#jira UE-155217 - Make the selected changelist view (list of files in a CL) sortable (2-columns sort).
#rb Patrick.Enfedaque
#preflight 63176791980179553e3d5dae

[CL 21827312 by patrick laflamme in ue5-main branch]
2022-09-06 15:43:24 -04:00
luc eygasier
c4dec1008a Adds Source Control File Dialog.
Displays source control file dialog when checkouting files is impossible during conversion from Uncontrolled Changelist to Changelist.

#preflight 630f740ce352708d444276e0
#rb Patrick.Laflamme

[CL 21727336 by luc eygasier in ue5-main branch]
2022-08-31 16:14:08 -04:00
patrick laflamme
126984d8d7 Fixed the double popup issue that can happen in the changelist window for source control provider other than P4 that support changelist.
#rb Patrick.Enfedaque
#preflight 630e07e9e1124837754de0d7

[CL 21709903 by patrick laflamme in ue5-main branch]
2022-08-30 17:19:01 -04:00
SRombauts
8df7cabe69 Updated the changelist window to handle the Enter and Delete keys to Submit or Delete the currently selected changelist if conditions to do these operations are met. This mimics P4V behavior.
Updated the changelist window to handle double clicking on a changelist. This opens the submit dialog if the submit conditions are met. This mimics P4V behavior.

PR #9433: [Source Control] Changelists window: intercept Enter and Delete keys to Submit or Delete the current changelist (Contributed by SRombauts)
#jira UE-160314
#rb Patrick.Enfedaque
#preflight 630d1e68f92416fb92702657

[CL 21709874 by SRombauts in ue5-main branch]
2022-08-30 17:17:25 -04:00
patrick enfedaque
3efc94dd9d SceneOutliner:
- SCC Show in changelist
- Fix Unloaded actors not having SCC Menu

#jira UE-155244
#rb patrick.laflamme
#preflight 630ca346f92416fb925faead

[CL 21685112 by patrick enfedaque in ue5-main branch]
2022-08-29 14:51:36 -04:00