Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Setting UnityYamlMerge options on repo initialization #744

Merged
merged 1 commit into from
May 15, 2018
Merged

Setting UnityYamlMerge options on repo initialization #744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions src/GitHub.Api/Application/ApplicationManagerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,7 @@ public void SetupGit(GitInstaller.GitInstallationState state)
{
if (Environment.RepositoryPath.IsInitialized)
{
var unityYamlMergeExec = Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
var yamlMergeCommand = Environment.IsWindows
? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
: $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";

GitClient.SetConfig("merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local)
.Catch(e =>
{
Logger.Error(e, "Error setting merge.unityyamlmerge.cmd");
return true;
})
.RunWithReturn(true);

GitClient.SetConfig("merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local)
.Catch(e =>
{
Logger.Error(e, "Error setting merge.unityyamlmerge.trustExitCode");
return true;
})
.RunWithReturn(true);
ConfigureMergeSettings();

GitClient.LfsInstall()
.Catch(e =>
Expand Down Expand Up @@ -236,6 +217,8 @@ public void InitializeRepository()
var filesForInitialCommit = new List<string> { gitignore, gitAttrs, assetsGitignore };

GitClient.Init().RunWithReturn(true);

ConfigureMergeSettings();
GitClient.LfsInstall().RunWithReturn(true);
AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath, Environment);
AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath, Environment);
Expand All @@ -261,6 +244,25 @@ public void InitializeRepository()
thread.Start();
}

private void ConfigureMergeSettings()
{
var unityYamlMergeExec =
Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
var yamlMergeCommand = Environment.IsWindows
? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
: $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";

GitClient.SetConfig("merge.unityyamlmerge.cmd", yamlMergeCommand, GitConfigSource.Local).Catch(e => {
Logger.Error(e, "Error setting merge.unityyamlmerge.cmd");
return true;
}).RunWithReturn(true);

GitClient.SetConfig("merge.unityyamlmerge.trustExitCode", "false", GitConfigSource.Local).Catch(e => {
Logger.Error(e, "Error setting merge.unityyamlmerge.trustExitCode");
return true;
}).RunWithReturn(true);
}

public void RestartRepository()
{
if (!Environment.RepositoryPath.IsInitialized)
Expand Down