Merge pull request #287 from github/fixes/unity-yaml-merge

shana · web-flow · commit c5e809c7ee82 · 2017-04-27T16:34:00.000+02:00
Fix to configure Yaml merging with Unity
diff --git a/src/GitHub.Api/DefaultEnvironment.cs b/src/GitHub.Api/DefaultEnvironment.cs
@@ -22,6 +22,7 @@ public string GetEnvironmentVariable(string variable)
             return Environment.GetEnvironmentVariable(variable);
         }
 
+        public string UnityApplication { get; set; }
         public string UnityAssetsPath { get; set; }
         public string UnityProjectPath { get; set; }
         public string ExtensionInstallPath { get; set; }
diff --git a/src/GitHub.Api/IEnvironment.cs b/src/GitHub.Api/IEnvironment.cs
@@ -15,6 +15,7 @@ interface IEnvironment
         bool IsWindows { get; }
         bool IsLinux { get; }
         bool IsMac { get; }
+        string UnityApplication { get; set; }
         string UnityAssetsPath { get; set; }
         string UnityProjectPath { get; set; }
         string ExtensionInstallPath { get; set; }
diff --git a/src/GitHub.Api/Installer/GitInstaller.cs b/src/GitHub.Api/Installer/GitInstaller.cs
@@ -13,7 +13,6 @@ class GitInstaller : IGitInstaller
         private const string TempPathPrefix = "github-unity-portable";
         private const string GitZipFile = "git.zip";
         private const string GitLfsZipFile = "git-lfs.zip";
-        private NPath gitConfigDestinationPath;
 
         private readonly CancellationToken cancellationToken;
         private readonly IEnvironment environment;
@@ -68,15 +67,13 @@ public GitInstaller(IEnvironment environment, IZipHelper sharpZipLibHelper, IFil
             GitDestinationPath = GitDestinationPath.Combine(GitExecutable);
 
             GitLfsDestinationPath = PackageDestinationDirectory;
-            gitConfigDestinationPath = PackageDestinationDirectory;
+
             if (DefaultEnvironment.OnWindows)
             {
                 GitLfsDestinationPath = GitLfsDestinationPath.Combine("mingw32");
-                gitConfigDestinationPath = gitConfigDestinationPath.Combine("mingw32");
             }
-            GitLfsDestinationPath = GitLfsDestinationPath.Combine("libexec", "git-core", GitLfsExecutable);
-            gitConfigDestinationPath = gitConfigDestinationPath.Combine("etc", "gitconfig");
 
+            GitLfsDestinationPath = GitLfsDestinationPath.Combine("libexec", "git-core", GitLfsExecutable);
         }
 
         public bool IsExtracted()
@@ -138,12 +135,6 @@ public async Task<bool> SetupIfNeeded(IProgress<float> zipFileProgress = null, I
 
                 ret &= await SetupGitLfsIfNeeded(tempPath, zipFileProgress, estimatedDurationProgress);
 
-                var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, "gitconfig", tempPath);
-                if (archiveFilePath.FileExists())
-                {
-                    archiveFilePath.Copy(gitConfigDestinationPath);
-                }
-
                 tempPath.Delete();
                 return ret;
             }
diff --git a/src/GitHub.Api/RepositoryLocator.cs b/src/GitHub.Api/RepositoryLocator.cs
@@ -40,6 +40,24 @@ public void Run()
 
                 var initTask = new GitInitTask(environment, processManager, null);
                 return initTask.RunAsync(token)
+                    .ContinueWith(_ => {
+                        var unityYamlMergeExec = environment.UnityApplication.ToNPath().Parent.Combine("Tools", "UnityYAMLMerge");
+                        var yamlMergeCommand = string.Format(@"'{0}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED""", unityYamlMergeExec);
+                        var t = new GitConfigSetTask(environment, processManager, null, "merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local);
+                        return t.RunAsync(token);
+                    }, token, TaskContinuationOptions.NotOnCanceled | TaskContinuationOptions.NotOnFaulted, ThreadingHelper.TaskScheduler)
+                    .ContinueWith(_ =>
+                    {
+                        var t = new GitConfigSetTask(environment, processManager, null, "merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local);
+                        return t.RunAsync(token);
+                    }, token, TaskContinuationOptions.NotOnCanceled | TaskContinuationOptions.NotOnFaulted, ThreadingHelper.TaskScheduler)
+                    .ContinueWith(_ =>
+                    {
+                        Logger.Trace("LFS install");
+
+                        var t = new GitLfsInstallTask(environment, processManager, null);
+                        return t.RunAsync(token);
+                    }, token, TaskContinuationOptions.NotOnCanceled | TaskContinuationOptions.NotOnFaulted, ThreadingHelper.TaskScheduler)
                     .ContinueWith(_ =>
                     {
                         Logger.Trace("LFS install");
diff --git a/src/GitHub.Api/RepositoryProcessRunner.cs b/src/GitHub.Api/RepositoryProcessRunner.cs
@@ -8,6 +8,7 @@ interface IRepositoryProcessRunner
     {
         ITask<GitStatus?> PrepareGitStatus(ITaskResultDispatcher<GitStatus> resultDispatcher);
         Task<bool> RunGitConfigGet(ITaskResultDispatcher<string> resultDispatcher, string key, GitConfigSource configSource);
+        Task<bool> RunGitConfigSet(ITaskResultDispatcher<string> resultDispatcher, string key, string value, GitConfigSource configSource);
         ITask<IEnumerable<GitLock>> PrepareGitListLocks(ITaskResultDispatcher<IEnumerable<GitLock>> resultDispatcher, bool local);
         ITask PrepareGitPull(ITaskResultDispatcher<string> resultDispatcher, string remote, string branch);
         ITask PrepareGitPush(ITaskResultDispatcher<string> resultDispatcher, string remote, string branch);
@@ -55,6 +56,12 @@ public Task<bool> RunGitConfigGet(ITaskResultDispatcher<string> resultDispatcher
             return task.RunAsync(cancellationToken);
         }
 
+        public Task<bool> RunGitConfigSet(ITaskResultDispatcher<string> resultDispatcher, string key, string value, GitConfigSource configSource)
+        {
+            var task = new GitConfigSetTask(environment, processManager, resultDispatcher, key, value, configSource);
+            return task.RunAsync(cancellationToken);
+        }
+
         public ITask<IEnumerable<GitLock>> PrepareGitListLocks(ITaskResultDispatcher<IEnumerable<GitLock>> resultDispatcher,
             bool local)
         {
diff --git a/src/GitHub.Api/Resources/.gitattributes b/src/GitHub.Api/Resources/.gitattributes
@@ -1,10 +1,10 @@
 * text=auto
 
 # Unity files
-*.meta -text
-*.unity -text
-*.asset -text
-*.prefab -text
+*.meta -text -merge=unityamlmerge
+*.unity -text -merge=unityamlmerge
+*.asset -text -merge=unityamlmerge
+*.prefab -text -merge=unityamlmerge
 
 # Image formats
 *.psd filter=lfs diff=lfs merge=lfs -text
diff --git a/src/GitHub.Api/Tasks/GitConfigSetTask.cs b/src/GitHub.Api/Tasks/GitConfigSetTask.cs
@@ -8,6 +8,7 @@ class GitConfigSetTask : GitTask
         private readonly string value;
         private readonly string arguments;
         private bool done = false;
+        private string label;
 
         public GitConfigSetTask(IEnvironment environment, IProcessManager processManager,
             ITaskResultDispatcher<string> resultDispatcher,
@@ -23,6 +24,7 @@ public GitConfigSetTask(IEnvironment environment, IProcessManager processManager
                         configSource == GitConfigSource.User ? "--replace-all --global" :
                             "--replace-all --system";
             arguments = String.Format("config {0} {1} \"{2}\"", source, key, value);
+            label = String.Format("config {0} {1} \"{2}\"", source, key, new String('*', value.Length));
         }
 
         protected override ProcessOutputManager HookupOutput(IProcess process)
@@ -43,7 +45,7 @@ protected override ProcessOutputManager HookupOutput(IProcess process)
         public override bool Blocking { get { return false; } }
         public override bool Critical { get { return false; } }
         public override bool Cached { get { return false; } }
-        public override string Label { get { return "git config"; } }
+        public override string Label { get { return label;} }
         protected override string ProcessArguments { get { return arguments; } }
     }
 }
diff --git a/src/IntegrationTests/Git/IntegrationTestEnvironment.cs b/src/IntegrationTests/Git/IntegrationTestEnvironment.cs
@@ -85,6 +85,8 @@ public string GitExecutablePath
         public bool IsLinux => defaultEnvironment.IsLinux;
         public bool IsMac => defaultEnvironment.IsMac;
 
+        public string UnityApplication { get; set; }
+
         public string UnityAssetsPath { get; set; }
 
         public string UnityProjectPath
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs
@@ -79,6 +79,8 @@ protected override void InitializeEnvironment()
             var assetsPath = Application.dataPath.ToNPath();
             var projectPath = assetsPath.Parent;
 
+            Environment.UnityApplication = EditorApplication.applicationPath;
+
             Environment.UnityAssetsPath = assetsPath.ToString(SlashMode.Forward);
             Environment.UnityProjectPath = projectPath.ToString(SlashMode.Forward);
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public string GetEnvironmentVariable(string variable)`
`22`	`22`	`return Environment.GetEnvironmentVariable(variable);`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ public string UnityApplication { get; set; }`
`25`	`26`	`public string UnityAssetsPath { get; set; }`
`26`	`27`	`public string UnityProjectPath { get; set; }`
`27`	`28`	`public string ExtensionInstallPath { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ interface IRepositoryProcessRunner`
`8`	`8`	`{`
`9`	`9`	`ITask<GitStatus?> PrepareGitStatus(ITaskResultDispatcher<GitStatus> resultDispatcher);`
`10`	`10`	`Task<bool> RunGitConfigGet(ITaskResultDispatcher<string> resultDispatcher, string key, GitConfigSource configSource);`
	`11`	`+ Task<bool> RunGitConfigSet(ITaskResultDispatcher<string> resultDispatcher, string key, string value, GitConfigSource configSource);`
`11`	`12`	`ITask<IEnumerable<GitLock>> PrepareGitListLocks(ITaskResultDispatcher<IEnumerable<GitLock>> resultDispatcher, bool local);`
`12`	`13`	`ITask PrepareGitPull(ITaskResultDispatcher<string> resultDispatcher, string remote, string branch);`
`13`	`14`	`ITask PrepareGitPush(ITaskResultDispatcher<string> resultDispatcher, string remote, string branch);`
`@@ -55,6 +56,12 @@ public Task<bool> RunGitConfigGet(ITaskResultDispatcher<string> resultDispatcher`
`55`	`56`	`return task.RunAsync(cancellationToken);`
`56`	`57`	`}`
`57`	`58`
	`59`	`+ public Task<bool> RunGitConfigSet(ITaskResultDispatcher<string> resultDispatcher, string key, string value, GitConfigSource configSource)`
	`60`	`+ {`
	`61`	`+ var task = new GitConfigSetTask(environment, processManager, resultDispatcher, key, value, configSource);`
	`62`	`+ return task.RunAsync(cancellationToken);`
	`63`	`+ }`
	`64`	`+`
`58`	`65`	`public ITask<IEnumerable<GitLock>> PrepareGitListLocks(ITaskResultDispatcher<IEnumerable<GitLock>> resultDispatcher,`
`59`	`66`	`bool local)`
`60`	`67`	`{`