Commit Graph

109 Commits

Author SHA1 Message Date
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
Max Preussner
256933f5ab Merging using UE4-To-UE4-LauncherDev, up to CL 2431138
#CodeReview: carlos.cuello

[CL 2431178 by Max Preussner in Main branch]
2015-02-04 00:28:16 -05:00
Ben Marsh
7e445df208 [INTEGRATE] Change 2420845 by Mike.Fricker@MFRICKER_G3686_Alpha on 2015/01/27 14:53:16
Enabled Git SCC plugin
	- Marked the Git plugin as "Beta" in the UI
	- Fixed Git.exe folder not using correct path separators
	- Added missing icon for SCC plugin
	- Removed experimental setting for Git SCC plugin (the plugin itself is still 'beta' though)
	- Moved README contents into the source code, cleaned it up a bit

[CL 2425776 by Ben Marsh in Main branch]
2015-01-30 10:30:56 -05:00
Max Preussner
9a2cef9933 Fixed deprecation warning
[CL 2420715 by Max Preussner in Main branch]
2015-01-27 13:28:42 -05:00
Ben Marsh
e8f1de377b [INTEGRATE] Change 2412228 by Matt.Kuhlenschmidt@matt_kuhlenschmidt_main on 2015/01/20 10:40:35
Fix compile errors

	#codereview matthew.griffin, thomas.sarkanen

[CL 2419434 by Ben Marsh in Main branch]
2015-01-26 18:35:48 -05:00
Thomas Sarkanen
91a7cbbc2a Fixed Git 'Submit to source control' always failing
Added RemoveRedundantErrors (similar to SVN and P4) so thats erors we dont care about can be rectified.

[CL 2412011 by Thomas Sarkanen in Main branch]
2015-01-20 06:37:25 -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
Thomas Sarkanen
9b4fc8c7d0 Git source control plugin is now experimental
Added setting and wrapped registration of modular feature in the flag.

[CL 2411975 by Thomas Sarkanen in Main branch]
2015-01-20 05:30:21 -05:00
UnrealBot
ea4dfacd88 Snapshot for changelist 2410693.
[CL 2410693 in Main branch]
2015-01-19 05:38:08 -05:00