Commit Graph

56 Commits

Author SHA1 Message Date
Chris Gagnon
09c2623f70 Fix for SVN not accepting usernames or passwords with spaces in them. UE-11274.
[CL 2471399 by Chris Gagnon in Main branch]
2015-03-06 13:34:45 -05:00
Saul Abreu
79a26091bf Fixed behavior on FString::ParseIntoArray (muliple delimiters overload) functionality to support optionally culling empty strings. Greatly simplified implementation logic. Output parameter now properly named and taken by reference.
#codereview Steve.Robb, Robert.Manuszewski

[CL 2466824 by Saul Abreu in Main branch]
2015-03-02 15:51:37 -05:00
Richard TalbotWatkin
44e15875cd Added the ability to commit file deletions from the editor.
#jira UE-6304 - Source Control: Add the ability to commit file deletions from the editor
#reviewedby Thomas.Sarkanen

[CL 2446774 by Richard TalbotWatkin in Main branch]
2015-02-16 05:11:32 -05:00
Thomas Sarkanen
be75fe1eca Updated revision display to display strings rather than revision indices
API break: added new pure virtual ISourceControlProvider::UsesChangelists()
API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&)
API break: added new pure virtual ISourceControlRevision::GetRevision()

Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly.

[CL 2411986 by Thomas Sarkanen in Main branch]
2015-01-20 05:48:14 -05:00
Max Preussner
7795e44c00 Core: Renamed FQueuedWork to IQueuedWork
#CodeReview: robert.manuszewski

[CL 2404137 by Max Preussner in Main branch]
2015-01-12 19:53:59 -05:00
Steve Robb
0756ef15b9 Delegate comparisons deprecated, lots of other associated code deprecated, and lots of warning fixups:
* Multicast delegate Add* calls now return FDelegateHandles, and Remove* calls are now all deprecated, except for a new Remove function which takes a FDelegateHandle.
* New FConsoleManager::RegisterConsoleVariableSink_Handle and UnregisterConsoleVariableSink_Handle functions which work in terms of FConsoleVariableSinkHandle.
* Timer calls which don't take FTimerHandles are deprecated.
* FTicker::AddTicker now returns an FDelegateHandle and is removed by an overloaded Remove function.
* DEFINE_ONLINE_DELEGATE* macros now define _Handle variants of the Add/Remove functions which return/take handles.
* Various other handle-based registration changes.
* Some unity build fixes.
* Some simplification of delegate code.
* Fixes for lots of existing code to use handle-based registration and unregistration.

#codereview robert.manuszewski

[CL 2400883 by Steve Robb in Main branch]
2015-01-08 09:29:27 -05:00
Thomas Sarkanen
dbac13bf4e Speedup "Checking for assets to checkin" with SVN
Before this commit, FSubversionUpdateStatusWorker::Execute called svn status --show-updates <paths> giving it all assets. This resulted in two connections to svn server per each file. For example, on ShooterGame demo "Checking for assets to checkin" took 2 minutes even over 1Gbps LAN.
This commit replaces svn status --show-updates <paths> with svn status --show-updates <working_copy_root> whenever more than one path is requested.
Unfortunately, svn status doesn't recurse into unversioned directories, so preinit all states to NotControlled/NotAWorkingCopy.

GitHub PR# 519 - https://github.com/EpicGames/UnrealEngine/pull/519

[CL 2398687 by Thomas Sarkanen in Main branch]
2015-01-06 10:10:50 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Ben Marsh
d2e0e7d3e8 More fixes for Doxygen warnings.
[CL 2370077 by Ben Marsh in Main branch]
2014-11-25 17:53:58 -05:00
Wes Hunt
31e2bb00ac Removed a bunch of stuff from Slate standard include, created SlateBasics.h
* Moved Slate.h into SlateBasics.h and began shifting less commonly used headers into SlateExtras.h.
* Slate.h now simply includes SlateBasics.h and SlateExtras.h.
* Slate.h includes a deprecated warning now to indicate that SlateBasics.h + specific includes should be used instead.
* Moved dozens of inlined functions using Slate widgets into .cpp files to avoid header dependencies.
* All code samples now include SlateBasics.h and SlateExtras.h so future shifts will not break most those projects, but not trigger the deprecation warning of including Slate.h.
#BUN

[CL 2329610 by Wes Hunt in Main branch]
2014-10-14 22:50:06 -04:00
Thomas Sarkanen
a758fdcb30 Do not include BOM signature in non-ASCII commit messages to subversion.
Commit messages now do not include ? leading character as BOM is no longer included.

GitHub pull request #472

https://github.com/EpicGames/UnrealEngine/pull/472

reviewed by steve.robb

[CL 2317249 by Thomas Sarkanen in Main branch]
2014-10-02 10:51:56 -04:00
Michael Trepka
62e7793fa0 Another batch of fixes for Clang compile warnings
[CL 2237490 by Michael Trepka in Main branch]
2014-07-30 16:16:46 -04:00
Thomas Sarkanen
155bd251e4 Added ISourceControlLabel::Sync() overload that takes multiple files
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]
2014-07-11 04:28:12 -04:00
Thomas Sarkanen
f42f5d0781 Fix branching creating multiple files
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]
2014-07-09 06:31:13 -04:00
Ben Marsh
e35719b0b4 Store whether a plugin is enabled by default in the uplugin file (rather than in the INI file). Simplifies checks for what is enabled in UE4Game and decentralizes everything.
[CL 2119957 by Ben Marsh in Main branch]
2014-06-27 16:38:50 -04:00
Dan Oconnor
be25e93db6 #ue4 modificatiosn to source control plugins to better handle files that are in a conflicted state, or are not at head and are going to enter a conflicted state when we sync
#codereview Thomas.Sarkanen

[CL 2111945 by Dan Oconnor in Main branch]
2014-06-20 12:57:45 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Thomas Sarkanen
e27e005773 Source control copies now integrate/copy instead of Delete + Add
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]
2014-06-05 12:10:47 -04:00
Marc Audy
83dcc2fe11 Shadow variable fixes
[CL 2094759 by Marc Audy in Main branch]
2014-06-04 15:11:29 -04:00
Ben Marsh
113608cb66 [GitHub] Updated all *.uplugin files to descriptor file format version 3, fixed a few categories for display in the plugins browser. (SRombauts)
https://github.com/EpicGames/UnrealEngine/pull/196

[CL 2093311 by Ben Marsh in Main branch]
2014-06-03 13:33:02 -04:00
Dmitry Rekman
8878620adb Source control changes from PR 185.
This is a subset of changes (warning fixes needed to compile Linux editor) from pull request 185 by sbc100, 3dluvr, wshearn, abarbu et al: https://github.com/EpicGames/UnrealEngine/pull/185

#codereview Thomas.Sarkanen

[CL 2085557 by Dmitry Rekman in Main branch]
2014-05-29 17:09:06 -04:00
Steve Robb
e78e096889 TSet is constructible from a TArray.
#add New explicit constructors which append.
#add Move support for TSet::Append.
#add Move operators for TSetElement.
#change Some ranged-for loop changes.
#change Some existing code changed for testing (PluginManager, Subversion plugin).

#codereview robert.manuszewski,gareth.martin

[CL 2080362 by Steve Robb in Main branch]
2014-05-21 10:35:57 -04:00
Thomas Sarkanen
ecaf01661c Prevented source control state from being fetched for every content browser widget
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]
2014-05-16 06:46:44 -04:00
Thomas Sarkanen
06466ce255 Added CanCheckIn() to ISourceControlProvider
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]
2014-05-15 04:14:04 -04:00
Max Preussner
b63129a60c Slate: Refactored core Slate implementation into SlateCore module in preparation for UMG.
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]
2014-04-26 15:07:24 -04:00