40 Commits

Author SHA1 Message Date
Steve Robb
9c93757c28 Fixed mismatched copy constuctor/assignment operator in FPlasticSourceControlChangelist.
#rb none
#jira none
#preflight none

[CL 25580530 by Steve Robb in ue5-main branch]
2023-05-23 08:32:35 -04:00
jordan hoffmann
2b08e650c7 [CDPR] Added more information about changelist to source control changelists window context menu
+ Expand source control menu context with selected changelist,
+ Expose information about if changelist is default and its source control specific identifier,

#rb Patrick.Enfedaque, Patrick.Laflamme, zach.rammell
#preflight skip
#p4v-cherrypick 25526575
#preflight 64665919b91ab13b09c2089c

[CL 25528171 by jordan hoffmann in ue5-main branch]
2023-05-18 13:20:35 -04:00
jordan hoffmann
1625c5cc66 [BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest
#rb brooke.hubert, mattias.jansson, wouter.burgers
#preflight 64556c1ad77a82d6a78e3388

[CL 25365368 by jordan hoffmann in ue5-main branch]
2023-05-06 02:07:43 -04:00
jordan hoffmann
fbe917e059 [BugFix] Review tool failing to connect to swarm
- Failed if user had multiple p4 tickets
- Failed if default p4 username didn't match the provided username in UE

#jira UE-181982
#rb paul.chipchase
#preflight 643061621d61ecec3b63c465

[CL 24970980 by jordan hoffmann in ue5-main branch]
2023-04-07 17:50:46 -04:00
zach rammell
2a30d789bd [Plastic SCM] Fix implementation of ISourceControlProvider::UsesFileRevisions()
PR #10271
#rb zach.rammell
#lockdown jeanmichel.dignard
#jira UE-180938
#preflight 64223ac4051bec41cd4c6871

[CL 24821272 by zach rammell in ue5-main branch]
2023-03-28 12:38:33 -04:00
marco anastasi
f6978a065c Created new Source Control feature flag UsesSnapshots() to solve inconsistency in use of UsesChangelists() and UsesFileRevisions() causing issues for git Source Control Provider
* Option to check in an asset from the Content Browser Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to check in an asset from the Scene Outliner Source Control Context Menu is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Ability to uncheck files in the Submit Files Window is now enabled if the SCC does not use Snapshots instead of if it uses File Revisions
* Option to revert the writable flag on an asset in the Content Browser Source Control Context Menu is now enabled if the SCC uses checkout instead of if it uses File Revisions (like the 'Make Writable' option)

#jira UCS-6630
#rb brooke.hubert, wouter.burgers
#lockdown jeanmichel.dignard
#preflight 640e6b41482188d710ff8316

[CL 24724061 by marco anastasi in ue5-main branch]
2023-03-20 17:20:41 -04:00
paul chipchase
a41176c8a0 Fix a crash in the PlasticSCM module that can occur if the engine shutdown during PreInit.
#rb PJ.Kack
#jira UE-179343
#rnx
#preflight 6408511a6c1b9295b9804827

- The crash itself isn't that interesting but it does distract the user from the actual error/problem which caused the engine to shutdown during PreInit wasting time while they look into the crash instead of the original error.
- When attempting to unregister the menu extension we now call ::TryGet rather than ::Try as this will return nullptr if UToolsMenu is not loaded and will not attempt to load it.

[CL 24563201 by paul chipchase in ue5-main branch]
2023-03-08 13:26:42 -05:00
SRombauts
07e56bd041 PR #10129: [Source Control] Update the Plastic SCM plugin to version 1.8.0 (from 1.6.2) (Contributed by SRombauts)
#Jira UE-177799
#rb brooke.hubert
#preflight 63f400211d71bcd26257d30b
#lockdown jeanmichel.dignard

[CL 24343515 by SRombauts in ue5-main branch]
2023-02-21 13:08:07 -05:00
wouter burgers
1d6ef4b2e3 SourceControl: Added CanExecuteOperation to ISourceControlProvider interface.
#preflight 63de1752fe33a06594fc2e02

[CL 24018386 by wouter burgers in ue5-main branch]
2023-02-04 10:54:03 -05:00
stuart hill
d8b31f7ed0 Add a flag to the source control provider to tell us if 'uncontrolled' changelists are supported.
#rb Marco.Anastasi, zach.rammell
#prelight 6398633f8c5081ee9a275f20

[CL 23499875 by stuart hill in ue5-main branch]
2022-12-13 18:18:02 -05:00
aditya ravichandran
28eccf9aa0 Revision Control Iconography Update:
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]
2022-12-09 14:18:01 -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
stuart hill
1fc502d9b1 Give the option to disable being able to diff files in the Source Control Submit Widget. To allow this, AllowsDiffAgainstDepot function should return false.
#preflight 6360fd498768c5532f5425f0
#rb Marco.Anastasi, Patrick.Laflamme

[CL 22888653 by stuart hill in ue5-main branch]
2022-11-01 15:09:57 -04:00
christian savoie
fd89edb9be Add access to local revision number for all source control systems.
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]
2022-10-31 11:08:06 -04:00
christian savoie
48b260a74e Fix Perforce Sync command to correctly use Revision value.
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]
2022-10-21 01:05:23 -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
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
SRombauts
773a174eb0 PR #9553: [Source Control] Plastic SCM implements ISourceControlChangelist::CanDelete() (Contributed by SRombauts)
#rb Patrick.laflamme
#jira UE-163356 - GitHub 9553 : [Source Control] Plastic SCM implements ISourceControlChangelist::CanDelete()
#preflight 63285f2cea1c94f4c5cff9f5

[CL 22084760 by SRombauts in ue5-main branch]
2022-09-19 19:53:29 -04:00
SRombauts
cb5b5f4e83 Added changelists support to PlasticSCM plugin (v1.6.2)
PR #9414: [Source Control] Add Changelists support to PlasticSCM plugin (v1.6.2) (Contributed by SRombauts)
#jira UE-160265 - GitHub 9414 : [Source Control] Add Changelists support to PlasticSCM plugin (v1.6.1)
#rb Patrick.Laflamme
#preflight 630cc6e4660db81edb6ecb8a

[CL 21677217 by SRombauts in ue5-main branch]
2022-08-29 10:22:45 -04:00
SRombauts
96c5d2a356 PR #9353: [Source Control] Add a dedicated set of icons for Plastic SCM (Contributed by SRombauts)
#jira UE-158198
#rb lauren.barnes
#preflight 62cd8d9e1c657d4fbd8b7558

[CL 21056870 by SRombauts in ue5-main branch]
2022-07-12 11:17:23 -04:00
Robb Surridge
0a5a02c5b2 Coding standard fixes: gender-inclusive language
#jira UE-156429
#preflight 62b32e826a25ba6ae52f94bd
#rb jason.walter

[CL 20795375 by Robb Surridge in ue5-main branch]
2022-06-23 11:14:07 -04:00
Ben Marsh
727313243d Fix non-unity compile errors.
#preflight none

[CL 20469864 by Ben Marsh in ue5-main branch]
2022-06-02 11:03:50 -04:00
SRombauts
65550e8a34 Update PlasticSCM Plugin from 1.5.0 to 1.5.1
#jira UE-153257
#9195 (Contributed by SRombauts)
#rb Patrick.Laflamme
#preflight 62977d16a660a44a23be54ae

[CL 20453148 by SRombauts in ue5-main branch]
2022-06-01 11:26:54 -04:00
SRombauts
51711d7764 Updated PlasticSCM from 1.4.6 to 1.5.0
#9156: Update PlasticSCM Plugin from 1.4.6 to 1.5.0 for UE5 (Contributed by SRombauts)
#jira UE-151199 - GitHub 9156 : Update PlasticSCM Plugin from 1.4.6 to 1.5.0 for UE5
#rb patrick.laflamme
#preflight 6282956c162e4a77e535b24b

[CL 20228732 by SRombauts in ue5-main branch]
2022-05-16 14:38:52 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00