TTP# 342872 - EDITOR: Regression: CRASH: FSourceControlModule::ShutdownModule
The SVN source control provider module was being shutdown before the main source control module, leading to a crash.
The source control module now watches for its active provider module being unloaded, and will gracefully reset itself to the default (dummy) provider if that happens.
I also added these same checks to the source code access module, as it uses the same provider modules mechanism.
#codereview Thomas.Sarkanen, Max.Preussner
[CL 2244286 by Jamie Dale in Main branch]
EditorAutomationTest.cpp -- Just changed the reference to the cube mesh in the engine folder.
SourceControlTests.cpp -- updated the SourceControlTest location to the new one.
[CL 2230126 by Justin Hair in Main branch]
API-breaking change (although I dont think that any other 3rd-party provider plugins are using it at the moment).
Kept old single-filename call & added new version that takes array of files. Re-implemented this for internal source control providers (just a patch on the old version).
Added automation tests for label syncing.
TTP# 340899 - SourceControl: Need Sync() overloads that accept multiple files
[CL 2190291 by Thomas Sarkanen in Main branch]
Branching of files needed to be removed (by Bob Tellez) as it was causing crashes and mutiple duplicate files to show up in the content browser. This fix re-instates working branches in the Editor.
The idea is that we now do the copy/duplicate/rename operations first, then perform the 'branch' once the files are finished with by the Editor. This keeps the asset registry & directory watcher systems happy & leaves the issue of branching to source control alone.
Because of the way SVN copy works, the SVN verison of this is slightly icky. SVN copy does not allow a branch-copy over an existing file in the workspace (even if not under source control), so we have to move the file into a temp directory, do the copy, then re-move the file back over the top of its old location.
TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)
reviewed by Max.Preussner,Bob.Tellez,Matt.Kuhlenschmidt
[CL 2180124 by Thomas Sarkanen in Main branch]
TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate)
New API: Added ISourceControlRevision::GetBranchSource.
Made sure the P4 and SVN providers perform integrates/copies so that history is maintained across file copies & moves.
Also fixed SCC icons not refreshing sometimes until source control operation has completed.
Added new branch icon.
Fixed date display in history.
This required some fairly nasty fixup to get it all working within the Editor copy code path, but the majority of the changes are in the source control providers.
reviewed by Andrew.Brown
[CL 2095604 by Thomas Sarkanen in Main branch]
Instead of using the (cached) state, we cache the brush to use to display the state and only hit the state cache when state changes.
Also updated Execute() calls to providers to only do relative-path conversions if the path is already relative.
Added SourceControlHelpers::AbsoluteFilenames to aid conversion.
TTP# 335201 - ContentBrowser: Improve idle performance
#codereview Andrew.Brown
[CL 2075346 by Thomas Sarkanen in Main branch]
To allow for further abstraction & extension using DVCS systems like Git & Mercurial, we expose a new CanCheckIn() function that is used when determing 'modifed' files to check in.
#github https://github.com/EpicGames/UnrealEngine/pull/151
TTP# 335099 - [GitHub] 151 : Add ISourceControlState::CanCheckIn()
reviewed by Max.Preussner
[CL 2073950 by Thomas Sarkanen in Main branch]
Necessary for using a distributed compiler on OS X. Updated for recent changes that caused more preprocess problems.
#codereview michael.trepka, jack.porter
[CL 2072853 by Mark Satterthwaite in Main branch]
Other Updates:
- The WidgetReflector is now in its own module as well. It will be converted to a plug-in later.
- The Public API of both Slate and SlateCore has largely been reorganized for better discoverabilty. More cleanup work is needed.
- Added a lot of missing API documentation and fixed existing ones. More and better documentation is needed.
- Removed dead code, fixed a couple things I stubled upon, and conformed to coding guidelines (NULL vs nullptr, line breaks, etc.)
Upgrade Notes:
- The Slate Remote Server is currently disabled - will be re-enabled shortly!
- If your module previously had a module dependency to 'Slate', it now also needs a PrivateModuleDependency to 'SlateCore' in its Build.cs file.
- If your module exposes in any of its Public header files types that are now declared in SlateCore, it needs a PublicModuleDependency to 'SlateCore'
- The ToolTip property type on SWidget has changed from SToolTip to IToolTip; change local variables to TSharedPtr<IToolTip> instead of TSharedPtr<SToolTip> where needed
- IToolTip is not a widget. If you need access to the actual widget that represents the tool tip, use IToolTip::AsWidget(); If you need access to the tool tip's content, use IToolTip::GetContentWidget()
Troubleshooting:
- After syncing to this changelist you may have to clean your /Engine/Intermediate/Build/ directory and rebuild your entire project
- If in your project you are getting linker errors for unresolved types that are now declared in SlateCore, you may be missing a dependency to 'SlateCore'
- If in the Engine code you are getting linker errors for unresolved types that are now declared in SlateCore, you may need to rebuild the entire Engine
[CL 2057118 by Max Preussner in Main branch]
#ttp 331898 EDITOR: Update Perforce SDK to Visual Studio 2013 compatible libraries
#note This a re-submission of the previous CL 2048699 minus the SSL lib changes that were causing problems for people with different SSL-enabled installed programs.
#add Added new Perforce API libraries & includes for version 2014.2.
#remove Deprecated the loading of the P4API.dll - we no longer use this in the Editor (however it must remain as it is used in the build system).
#fix Fixed source control tests to properly create temporary packages.
reviewed by Andrew.Brown
[CL 2049736 by Thomas Sarkanen in Main branch]
#ttp 331349 Editor: Source Control: Some issues with creating new source control provider
#change Fixed up conflation of enum with bool in if() blocks when calling Execute().
#fix Fixed QueueStatusUpdate not checking for NULL source control state.
reviewed by Andrew.Brown
[CL 2049714 by Thomas Sarkanen in Main branch]
#ttp 331898 EDITOR: Update Perforce SDK to Visual Studio 2013 compatible libraries
#ttp 331132 LIVE: Editor: Source Control: Request to support SSL connections to Perforce servers
#add Added new Perforce API libraries & includes for version 2014.2.
#add Added OpenSSL 1.0.1g alongside the new Perforce libs & updated build script to link against them, rather than the stub.
#remove Deprecated the loading of the P4API.dll - we no longer use this in the Editor (however it must remain as it is used in the build system).
#fix Fixed source control tests to properly create temporary packages.
reviewed by Andrew.Brown
[CL 2048699 by Thomas Sarkanen in Main branch]
#ttp 331118 LIVE: Editor: Source Control: Engine content is displayed in Check In dialog
#add Added a CanAdd() function to the source control state API & implemented this for both providers.
#change Changed asset context menu to restrict operations that can be performed based on the new information provided by CanAdd().
#fix Fixed a terrible bug in the SVN provider where only the first batch of 50 files would have their status returned correctly.
reviewed by Andrew.Brown
[CL 2043041 by Thomas Sarkanen in Main branch]
#proj UE4
#branch UE4
#summary The source control window is now sized 700px wide
#reviewedby Thomas.Sarkanen, Max.Preussner
[CL 2038534 by Jamie Dale in Main branch]
