#rb brooke.hubert
#jira UE-172649
#rnx
#preflight 63986274c16855964d9cfc76
- If we queried the state of a file using the depot path it would parse correctly but internally record the state as 'DontCare' meaning that it has no special state but the change in 23468037 causes files with that state to be classed as not under source control.
- The root problem that 23468037 was fixing was that when querying a file that does not exist (using client paths) we expect the file state to be set to 'NotInDepot' but for a file in a unit test this state was coming back as 'DontCare'. This was due to the imaginary file was being queried as a depot location (Engine root) where most users do not have permission to add things, so instead of an error message indicating that the file does not exist, the server was returning an error relating to permissions.
- We can fix this by checking for the permission error and adding that to the list of errors that result in us setting the 'NotInDepot' state. Which in turn allows us to remove the change from 23468037 that was blocking the depot path queries.
- There is an argument to be made that we should not allow file states to be queried via depot paths and doing so should raise an error. To allow that we would need to extend the source control api with a way to query files server state which would be out of scope for a release hot fix.
[CL 23531470 by paul chipchase in ue5-main branch]
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]
Change consist of only forward declaration and additional includes
#preflight 63789c1de30d438849c48188
#rb none
[CL 23218412 by henrik karlsson in ue5-main branch]
#rb PJ.Kack
#jira UE-167578
#rnx
#preflight 635bdddd5b54febd38b7efd0
- Clean up the source control backend by removing the older code path that was ifdefed out and clean up the new path.
- FPerforceConnection no longer takes a TOptional<FSharedBuffer> but takes an optional pointer to a TArray of FSharedBuffer. When gathering files this should return one FSharedBuffer per file requested.
-- It might make more sense to attach the FSharedBuffer to the FP4Record but that would require some bigger changes and would be better suited to being some follow on work. All the code is private in the module and not exposed so it is fairly safe and easy to do these refactors later.
- Replaced the TArray buffer for gathering files with a purpose built class FP4DepotFile.
- When issuing a p4 print command with multiple files we will get one call to ClientUser::OutputStat followed by calls to either ClientUser::OutputText or ClientUser::OutputBinary until all of the file has been delivered, then we will get another call to ClientUser::OutputStat for the next file and so on.
-- Note with binary files we seem to get one final call to ClientUser::OutputBinary with zero size, which I assume is supposed to signal the end of the transfer, text files do not get this, they seem to just stop.
[CL 22888671 by paul chipchase in ue5-main branch]
Change perforce Revert option to be based on if an item is checked out or marked for add, rather than if it can be checked in.
#tests Used to implement source control menu refactor https://p4-swarm.epicgames.net/reviews/22528870
[CL 22863683 by christian savoie in ue5-main branch]
#rb Sebastian.Nordgren
#rnx
#preflight 63581307d669d2aa7ec95866
- Added FTSMessageLog which is a thread safe version of FMessageLog with limited functionality. It can be used as a thread safe drop in replacement for code that only wants to send messages to the FMessageLog system.
- Somewhat experimental at the moment so it is being kept private in the perforce plugin where it is immediately needed.
- Thread safety is currently achieved by using the normal logging system if we detect that the messages are being added from background threads.
-- In future work this will be improved and we will marshal the messages to the GameThread.
[CL 22795873 by paul chipchase in ue5-main branch]
Add Revision and Force options to Plastic and Subversion.
#tests Used when implementing source control menu refactor https://p4-swarm.epicgames.net/reviews/22528870, only tested perforce sync command.
[CL 22683432 by christian savoie in ue5-main branch]
- 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]
#rb wouter.burgers, patrick.laflamme
#preflight 63301d3d665f6b8f7fab0066
RESOLUTION: Resolved conflict with IsAtLatestRevision() and GetNumLocalChanges()
[CL 22193646 by marco anastasi in ue5-main branch]
#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]
#rb
#jira UE-164284
#rnx
#preflight 632b058efc7f1efbdf92c1b0
- Changed check so that we only check if 'NewServerName' is set in order to apply it as the P4PORT.
-- Originally P4PORT, P4USER and P4CLIENT were all set inside of this if statement and it seems to have been assumed that either all three of the input parameters will be set, or none of them.
-- Host masquerading was added later and was specifically done so that it would only be applied if the P4PORT is overridden as well. I am not sure on the use case for this so I opted to leave it alone.
- Some of the earlier connection attempts don't use the user name or the workspace name so reporting them as part of the failure can be confusing. I have removed them.
[CL 22122719 by paul chipchase in ue5-main branch]
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]
- 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]
- 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]
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]
- Supported editing the changelist and saving it in P4. If the submit fails, the code will also try to save any edited changelist description.
- Enabled the 'keep checked out' button when submitting from the changelist window.
- Fixed the P4 cache not properly updating the file 'kept in checkout'.
- If the submit window is opened from the Source Control menu at the bottom right of the Eitor, the new 'Update' button to save the changelist description is not visible, this is not supported for all source control provider.
Added a delay of 1.5 seconds before showing the slow stack in the changelist window when refreshing the UI.
#jira UE-155238 - Add the option to "keep file in checkout"
#jira UE-155235 - Allow the user to save the description from the submit window.
#rb Patrick.Enfedaque
#preflight 6303e4e75a5d4e4624f5ab6d
[CL 21512088 by patrick laflamme in ue5-main branch]
This submit should not regress any existing functionalites of the previous widget.
Along with the user interface changes, notable bug fixes were included
- If a changelist is not specified for P4 operations 'Mark for Add', 'Mark for Delete and 'Checkout', defaulted to the 'default' P4 changlist. Without a valid changelist, the cache wasn't properly updated.
- Fixed updating the cache for P4 'Mark for delete' operation not correctly updating the file changelist cached in the file state.
Other changes:
- P4 changelists are now always returned sorted by changelist number, ascending.
- Some of the safe operations were running synchronous are not running asynchrnous (create new changelist, delete empty changelist, delete shelved files).
This submit addresses the following Jiras:
#jira UE-155207 - Refactor the changelist window layout to have the left/right panel.
#jira UE-155209 - Add the context menu on right click on a file or a changelist.
#jira UE-155218 - Support creating new empty changelist from the changelist view.
#jira UE-155220 - Support moving files from the selected changelist (right view) to another changelist (left view)
#jira UE-155211 - Add visual feedback for any operation taking more than 0.5s.
#jira UE-155212 - Display a list of uncontrolled files in the left panel of the changelist window
#jira UE-155499 - Changelist windows buttons should be disabled if SCC is disabled
#jira UE-155229 - Add an option to automatically refresh the changelist window when new assets are imported|created (as uncontrolled), marked for add, checked out, marked for delete
#jira UE-107577 - Source Control's Changelists dialog does not refresh to reflect changes made while open
#rb Patrick.Enfedaque
#preflight 62ff946ef7404b55a326297b
[CL 21499885 by patrick laflamme in ue5-main branch]
#rb Per.Larsson
#jira UE-160083
#rnx
#preflight 62f507c7b66d5d93139804a6
- If we are switching workspaces then we already know that the existing perforce settings are correct.
- The only reason we have to validate them is if we are switching to a different workspace and need to make sure that it exists.
- If we are just removing the workspace name entirely (which is valid for a number of operations) then we have nothing to check and we can just remove the workspace name from our p4 settings structure.
- This saves issuing a few pointless p4 commands.
[CL 21353145 by paul chipchase in ue5-main branch]
