Merge enhancements/git-install-validation into enhancements/git-path-view

shana · shana · commit 5d890395ee90 · 2017-09-14T20:26:48.000+02:00
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -64,8 +64,15 @@ private async Task SetupGit()
                 if (Environment.IsWindows)
                 {
                     var credentialHelper = await GitClient.GetConfig("credential.helper", GitConfigSource.Global).StartAwait();
-                    if (string.IsNullOrEmpty(credentialHelper))
+
+                    if (!string.IsNullOrEmpty(credentialHelper))
+                    {
+                        Logger.Trace("Windows CredentialHelper: {0}", credentialHelper);
+                    }
+                    else
                     {
+                        Logger.Warning("No Windows CredentialHeloper found: Setting to wincred");
+
                         await GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global).StartAwait();
                     }
                 }
diff --git a/src/GitHub.Api/Authentication/Keychain.cs b/src/GitHub.Api/Authentication/Keychain.cs
@@ -64,14 +64,15 @@ public async Task<IKeychainAdapter> Load(UriString host)
                 logger.Warning("Cannot load host from Credential Manager; removing from cache");
                 await Clear(host, false);
             }
-            else if (keychainItem.Username != cachedConnection.Username)
-            {
-                logger.Warning("Item loaded from credential manager does not match connection cache ; removing from cache");
-                await Clear(host, false);
-            }
             else
             {
-                logger.Trace($@"Loaded from Credential Manager Host:""{keychainItem.Host}"" Username:""{keychainItem.Username}""");
+                if (keychainItem.Username != cachedConnection.Username)
+                {
+                    logger.Warning("Keychain Username: {0} does not match; Hopefully it works", keychainItem.Username);
+                }
+
+                logger.Trace("Loaded from Credential Manager Host:\"{0}\" Username:\"{1}\"", keychainItem.Host, keychainItem.Username); 
+
                 keychainAdapter.Set(keychainItem);
             }
 
diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs
@@ -107,17 +107,30 @@ public async Task<NPath> FindGitInstallation()
             if (!String.IsNullOrEmpty(environment.GitExecutablePath))
                 return environment.GitExecutablePath;
 
-            var path = await LookForPortableGit();
+            NPath path = null;
+
+            if (environment.IsWindows)
+                path = await LookForPortableGit();
+
             if (path == null)
                 path = await LookForSystemGit();
 
-            Logger.Trace("Git Installation folder {0} discovered: '{1}'", path == null ? "not" : "", path);
+            if (path == null)
+            {
+                Logger.Trace("Git Installation not discovered");
+            }
+            else
+            {
+                Logger.Trace("Git Installation discovered: '{0}'", path);
+            }
 
             return path;
         }
 
         private Task<NPath> LookForPortableGit()
         {
+            Logger.Trace("LookForPortableGit");
+
             var gitHubLocalAppDataPath = environment.UserCachePath;
             if (!gitHubLocalAppDataPath.DirectoryExists())
                 return null;
@@ -138,16 +151,22 @@ private Task<NPath> LookForPortableGit()
 
         private async Task<NPath> LookForSystemGit()
         {
+            Logger.Trace("LookForSystemGit");
+
             NPath path = null;
             if (!environment.IsWindows)
             {
                 var p = new NPath("/usr/local/bin/git");
+
                 if (p.FileExists())
                     path = p;
             }
 
             if (path == null)
-                path = await new FindExecTask("git", taskManager.Token).StartAwait();
+            {
+                path = await new FindExecTask("git", taskManager.Token)
+                    .Configure(processManager).StartAwait();
+            }
 
             return path;
         }
@@ -172,11 +191,10 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(string path)
                 gitLfsVersionTask.ProcessArguments, environment.RepositoryPath);
 
             return gitVersionTask
-                .Then((result, version) => { gitVersion = version; })
+                .Then((result, version) => gitVersion = version)
                 .Then(gitLfsVersionTask)
-                .Then((result, version) => {
-                    gitLfsVersion = version;
-                }).Then(result => {
+                .Then((result, version) => gitLfsVersion = version)
+                .Then(result => {
                     var b = result 
                         && gitVersion != null
                         && gitVersion >= Constants.MinimumGitVersion
diff --git a/src/GitHub.Api/Git/GitCredentialManager.cs b/src/GitHub.Api/Git/GitCredentialManager.cs
@@ -133,6 +133,8 @@ private async Task<bool> LoadCredentialHelper()
                 .Configure(processManager)
                 .StartAwait();
 
+            Logger.Trace("Loaded Credential Helper: {0}", credHelper);
+
             if (credHelper != null)
             {
                 return true;
diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs
@@ -312,16 +312,16 @@ public ITask LockFile(string file)
         {
             var task = GitClient.Lock(file);
             HookupHandlers(task);
-            ListLocks(false);
-            return task;
+            
+            return task.Then(ListLocks(false));
         }
 
         public ITask UnlockFile(string file, bool force)
         {
             var task = GitClient.Unlock(file, force);
             HookupHandlers(task).Schedule(taskManager);
-            ListLocks(false);
-            return task;
+
+            return task.Then(ListLocks(false));
         }
 
         private void LoadGitUser()
diff --git a/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/LfsVersionOutputProcessor.cs
@@ -1,21 +1,26 @@
 using System;
+using System.Text.RegularExpressions;
 
 namespace GitHub.Unity
 {
     class LfsVersionOutputProcessor : BaseOutputProcessor<Version>
     {
+        public static Regex GitLfsVersionRegex = new Regex(@"git-lfs/([\d]+)\.([\d]+)\.([\d]+)");
+
         public override void LineReceived(string line)
         {
             if (String.IsNullOrEmpty(line))
                 return;
 
-            var gitVersion = "git-lfs/";
-            if (line.StartsWith(gitVersion))
-            {
-                line = line.Substring(gitVersion.Length, line.IndexOf(" ", StringComparison.InvariantCultureIgnoreCase) - gitVersion.Length);
-                var strings = line.Split(new[] { "." }, StringSplitOptions.None);
+            var match = GitLfsVersionRegex.Match(line);
 
-                RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));
+            if (match.Groups.Count > 0)
+            {
+                var major = Int32.Parse(match.Groups[1].Value);
+                var minor = Int32.Parse(match.Groups[2].Value);
+                var build = Int32.Parse(match.Groups[3].Value);
+                var version = new Version(major, minor, build);
+                RaiseOnEntry(version);
             }
         }
     }
diff --git a/src/GitHub.Api/OutputProcessors/ProcessManager.cs b/src/GitHub.Api/OutputProcessors/ProcessManager.cs
@@ -24,15 +24,28 @@ public ProcessManager(IEnvironment environment, IProcessEnvironment gitEnvironme
 
         public T Configure<T>(T processTask, bool withInput = false) where T : IProcess
         {
+            NPath executableFileName;
+            if (processTask.ProcessName != null)
+            {
+                executableFileName = processTask.ProcessName.ToNPath();
+                //logger.Trace("Configuring Task:{0} with Exec:{1}", processTask.GetType().Name, executableFileName);
+            }
+            else
+            {
+                executableFileName = environment.GitExecutablePath;
+                //logger.Trace("Configuring Task:{0} with Git", processTask.GetType().Name);
+            }
+
             return Configure(processTask,
-                processTask.ProcessName?.ToNPath() ?? environment.GitExecutablePath,
+                executableFileName,
                 processTask.ProcessArguments,
                 environment.RepositoryPath, withInput);
         }
 
         public T Configure<T>(T processTask, string executableFileName, string arguments, NPath workingDirectory = null, bool withInput = false)
              where T : IProcess
         {
+            //If this null check fails, be sure you called Configure() on your task
             Guard.ArgumentNotNull(executableFileName, nameof(executableFileName));
 
             var startInfo = new ProcessStartInfo
diff --git a/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs b/src/GitHub.Api/OutputProcessors/VersionOutputProcessor.cs
@@ -1,22 +1,28 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace GitHub.Unity
 {
     class VersionOutputProcessor : BaseOutputProcessor<Version>
     {
+        public static Regex GitVersionRegex = new Regex(@"git version ([\d]+)\.([\d]+)\.([\d]+)");
+
         public override void LineReceived(string line)
         {
             if (String.IsNullOrEmpty(line))
                 return;
 
-            var gitVersion = "git version ";
-            if (line.StartsWith(gitVersion))
-            {
-                line = line.Substring(gitVersion.Length);
-                var strings = line.Split(new[] { "." }, StringSplitOptions.None);
+            var match = GitVersionRegex.Match(line);
 
-                RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));
+            if (match.Groups.Count > 0)
+            {
+                var major = Int32.Parse(match.Groups[1].Value);
+                var minor = Int32.Parse(match.Groups[2].Value);
+                var build = Int32.Parse(match.Groups[3].Value);
+                var version = new Version(major, minor, build);
+                RaiseOnEntry(version);
             }
         }
     }
diff --git a/src/GitHub.Api/Platform/FindExecTask.cs b/src/GitHub.Api/Platform/FindExecTask.cs
@@ -13,6 +13,7 @@ public FindExecTask(string executable, CancellationToken token)
             arguments = executable;
         }
 
+        public override string ProcessName { get { return Name; } }
         public override string ProcessArguments { get { return arguments; } }
         public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }
     }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -52,7 +52,7 @@ class BranchesView : Subview
         [SerializeField] private List<Remote> remotes = new List<Remote>();
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
-        private List<string> favoritesList;
+        [SerializeField] private List<string> favoritesList = new List<string>();
 
         public override void InitializeView(IView parent)
         {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs
@@ -41,9 +41,9 @@ public static PopupWindow Open(PopupViewType popupViewType, Action<bool> onClose
 
             popupWindow.ActiveViewType = popupViewType;
             popupWindow.titleContent = new GUIContent(popupWindow.ActiveView.Title, Styles.SmallLogo);
-
-            popupWindow.InitializeWindow(EntryPoint.ApplicationManager);
+            popupWindow.OnEnable();
             popupWindow.Show();
+            popupWindow.Refresh();
 
             return popupWindow;
         }
@@ -64,7 +64,6 @@ public override void Initialize(IApplicationManager applicationManager)
         public override void OnEnable()
         {
             base.OnEnable();
-
             minSize = maxSize = ActiveView.Size;
             ActiveView.OnEnable();
         }
@@ -75,6 +74,12 @@ public override void OnDisable()
             ActiveView.OnDisable();
         }
 
+        public override void OnDataUpdate()
+        {
+            base.OnDataUpdate();
+            ActiveView.OnDataUpdate();
+        }
+
         public override void OnUI()
         {
             base.OnUI();
@@ -132,7 +137,14 @@ private Subview ActiveView
         private PopupViewType ActiveViewType
         {
             get { return activeViewType; }
-            set { activeViewType = value; }
+            set
+            {
+                if (activeViewType != value)
+                {
+                    ActiveView.OnDisable();
+                    activeViewType = value;
+                }
+            }
         }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -22,6 +22,8 @@ class ProjectWindowInterface : AssetPostprocessor
 
         public static void Initialize(IRepository repo)
         {
+            Logger.Trace("Initialize HasRepository:{0}", repo != null);
+
             EditorApplication.projectWindowItemOnGUI -= OnProjectWindowItemGUI;
             EditorApplication.projectWindowItemOnGUI += OnProjectWindowItemGUI;
             initialized = true;
@@ -149,7 +151,9 @@ private static void Refresh()
         private static void RunLocksUpdateOnMainThread(IEnumerable<GitLock> update)
         {
             new ActionTask(EntryPoint.ApplicationManager.TaskManager.Token, _ => OnLocksUpdate(update))
-                .ScheduleUI(EntryPoint.ApplicationManager.TaskManager);
+            {
+                Affinity = TaskAffinity.UI
+            }.Start();
         }
 
         private static void OnLocksUpdate(IEnumerable<GitLock> update)
@@ -169,11 +173,16 @@ private static void OnLocksUpdate(IEnumerable<GitLock> update)
                 var g = AssetDatabase.AssetPathToGUID(assetPath);
                 guidsLocks.Add(g);
             }
+
+            EditorApplication.RepaintProjectWindow();
         }
 
         private static void RunStatusUpdateOnMainThread(GitStatus update)
         {
-            EntryPoint.ApplicationManager.TaskManager.ScheduleUI(new ActionTask(EntryPoint.ApplicationManager.TaskManager.Token, _ => OnStatusUpdate(update)));
+            new ActionTask(EntryPoint.ApplicationManager.TaskManager.Token, _ => OnStatusUpdate(update))
+            {
+                Affinity = TaskAffinity.UI
+            }.Start();
         }
 
         private static void OnStatusUpdate(GitStatus update)
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs
diff --git a/src/tests/UnitTests/Authentication/KeychainTests.cs b/src/tests/UnitTests/Authentication/KeychainTests.cs
diff --git a/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.cs b/src/tests/UnitTests/IO/LfsVersionOutputProcessorTests.cs
diff --git a/src/tests/UnitTests/IO/VersionOutputProcessorTests.cs b/src/tests/UnitTests/IO/VersionOutputProcessorTests.cs

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,15 @@ private async Task SetupGit()`
`64`	`64`	`if (Environment.IsWindows)`
`65`	`65`	`{`
`66`	`66`	`var credentialHelper = await GitClient.GetConfig("credential.helper", GitConfigSource.Global).StartAwait();`
`67`		`- if (string.IsNullOrEmpty(credentialHelper))`
	`67`	`+`
	`68`	`+ if (!string.IsNullOrEmpty(credentialHelper))`
	`69`	`+ {`
	`70`	`+ Logger.Trace("Windows CredentialHelper: {0}", credentialHelper);`
	`71`	`+ }`
	`72`	`+ else`
`68`	`73`	`{`
	`74`	`+ Logger.Warning("No Windows CredentialHeloper found: Setting to wincred");`
	`75`	`+`
`69`	`76`	`await GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global).StartAwait();`
`70`	`77`	`}`
`71`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,8 @@ private async Task<bool> LoadCredentialHelper()`
`133`	`133`	`.Configure(processManager)`
`134`	`134`	`.StartAwait();`
`135`	`135`
	`136`	`+ Logger.Trace("Loaded Credential Helper: {0}", credHelper);`
	`137`	`+`
`136`	`138`	`if (credHelper != null)`
`137`	`139`	`{`
`138`	`140`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -312,16 +312,16 @@ public ITask LockFile(string file)`
`312`	`312`	`{`
`313`	`313`	`var task = GitClient.Lock(file);`
`314`	`314`	`HookupHandlers(task);`
`315`		`- ListLocks(false);`
`316`		`- return task;`
	`315`	`+`
	`316`	`+ return task.Then(ListLocks(false));`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`public ITask UnlockFile(string file, bool force)`
`320`	`320`	`{`
`321`	`321`	`var task = GitClient.Unlock(file, force);`
`322`	`322`	`HookupHandlers(task).Schedule(taskManager);`
`323`		`- ListLocks(false);`
`324`		`- return task;`
	`323`	`+`
	`324`	`+ return task.Then(ListLocks(false));`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`private void LoadGitUser()`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,26 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Text.RegularExpressions;`
`2`	`3`
`3`	`4`	`namespace GitHub.Unity`
`4`	`5`	`{`
`5`	`6`	`class LfsVersionOutputProcessor : BaseOutputProcessor<Version>`
`6`	`7`	`{`
	`8`	`+ public static Regex GitLfsVersionRegex = new Regex(@"git-lfs/([\d]+)\.([\d]+)\.([\d]+)");`
	`9`	`+`
`7`	`10`	`public override void LineReceived(string line)`
`8`	`11`	`{`
`9`	`12`	`if (String.IsNullOrEmpty(line))`
`10`	`13`	`return;`
`11`	`14`
`12`		`- var gitVersion = "git-lfs/";`
`13`		`- if (line.StartsWith(gitVersion))`
`14`		`- {`
`15`		`- line = line.Substring(gitVersion.Length, line.IndexOf(" ", StringComparison.InvariantCultureIgnoreCase) - gitVersion.Length);`
`16`		`- var strings = line.Split(new[] { "." }, StringSplitOptions.None);`
	`15`	`+ var match = GitLfsVersionRegex.Match(line);`
`17`	`16`
`18`		`- RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));`
	`17`	`+ if (match.Groups.Count > 0)`
	`18`	`+ {`
	`19`	`+ var major = Int32.Parse(match.Groups[1].Value);`
	`20`	`+ var minor = Int32.Parse(match.Groups[2].Value);`
	`21`	`+ var build = Int32.Parse(match.Groups[3].Value);`
	`22`	`+ var version = new Version(major, minor, build);`
	`23`	`+ RaiseOnEntry(version);`
`19`	`24`	`}`
`20`	`25`	`}`
`21`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,28 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Linq;`
	`4`	`+using System.Text.RegularExpressions;`
`3`	`5`
`4`	`6`	`namespace GitHub.Unity`
`5`	`7`	`{`
`6`	`8`	`class VersionOutputProcessor : BaseOutputProcessor<Version>`
`7`	`9`	`{`
	`10`	`+ public static Regex GitVersionRegex = new Regex(@"git version ([\d]+)\.([\d]+)\.([\d]+)");`
	`11`	`+`
`8`	`12`	`public override void LineReceived(string line)`
`9`	`13`	`{`
`10`	`14`	`if (String.IsNullOrEmpty(line))`
`11`	`15`	`return;`
`12`	`16`
`13`		`- var gitVersion = "git version ";`
`14`		`- if (line.StartsWith(gitVersion))`
`15`		`- {`
`16`		`- line = line.Substring(gitVersion.Length);`
`17`		`- var strings = line.Split(new[] { "." }, StringSplitOptions.None);`
	`17`	`+ var match = GitVersionRegex.Match(line);`
`18`	`18`
`19`		`- RaiseOnEntry(new Version(Int32.Parse(strings[0]), Int32.Parse(strings[1]), Int32.Parse(strings[2])));`
	`19`	`+ if (match.Groups.Count > 0)`
	`20`	`+ {`
	`21`	`+ var major = Int32.Parse(match.Groups[1].Value);`
	`22`	`+ var minor = Int32.Parse(match.Groups[2].Value);`
	`23`	`+ var build = Int32.Parse(match.Groups[3].Value);`
	`24`	`+ var version = new Version(major, minor, build);`
	`25`	`+ RaiseOnEntry(version);`
`20`	`26`	`}`
`21`	`27`	`}`
`22`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public FindExecTask(string executable, CancellationToken token)`
`13`	`13`	`arguments = executable;`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ public override string ProcessName { get { return Name; } }`
`16`	`17`	`public override string ProcessArguments { get { return arguments; } }`
`17`	`18`	`public override TaskAffinity Affinity { get { return TaskAffinity.Concurrent; } }`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class BranchesView : Subview`
`52`	`52`	`[SerializeField] private List<Remote> remotes = new List<Remote>();`
`53`	`53`	`[SerializeField] private Vector2 scroll;`
`54`	`54`	`[SerializeField] private BranchTreeNode selectedNode;`
`55`		`- private List<string> favoritesList;`
	`55`	`+ [SerializeField] private List<string> favoritesList = new List<string>();`
`56`	`56`
`57`	`57`	`public override void InitializeView(IView parent)`
`58`	`58`	`{`