Merge branch 'master' into fixes/batching-repository-watcher

Author: shana

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -7,6 +7,7 @@ namespace GitHub.Unity
     class Styles
     {
         public const float BaseSpacing = 10f,
+                           BrowseButtonWidth = 25f,
                            BroadModeLimit = 500f,
                            NarrowModeLimit = 300f,
                            ModeNotificationDelay = .5f,

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -48,11 +48,6 @@ public override void OnDataUpdate()
             MaybeUpdateData();
         }
 
-        public override bool IsBusy
-        {
-            get { return isBusy; }
-        }
-
         public override void OnGUI()
         {
             // Install path
@@ -73,7 +68,7 @@ public override void OnGUI()
                         CheckEnteredGitPath();
                     }
 
-                    if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
+                    if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(Styles.BrowseButtonWidth)))
                     {
                         GUI.FocusControl(null);
 
@@ -122,13 +117,14 @@ public override void OnGUI()
                         newGitExec = gitExec;
                         CheckEnteredGitPath();
 
-                        new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
-                            .Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
-                            .FinallyInUI((success, ex, path) =>
-                            {
+                        new FindExecTask("git", Manager.CancellationToken)
+                            .Configure(Manager.ProcessManager)
+                            .FinallyInUI((success, ex, path) => {
                                 if (success)
                                 {
                                     Logger.Trace("FindGit Path:{0}", path);
+                                    newGitExec = path;
+                                    CheckEnteredGitPath();
                                 }
                                 else
                                 {
@@ -142,12 +138,6 @@ public override void OnGUI()
                                     }
                                 }
 
-                                if (success)
-                                {
-                                    newGitExec = path;
-                                    CheckEnteredGitPath();
-                                }
-
                                 isBusy = false;
                             }).Start();
                     }
@@ -179,30 +169,27 @@ private void MaybeUpdateData()
         {
             if (gitExecHasChanged)
             {
-                if (Environment != null)
+                if (gitExecExtension == null)
                 {
-                    if (gitExecExtension == null)
-                    {
-                        gitExecExtension = Environment.ExecutableExtension;
+                    gitExecExtension = Environment.ExecutableExtension;
 
-                        if (Environment.IsWindows)
-                        {
-                            gitExecExtension = gitExecExtension.TrimStart('.');
-                        }
+                    if (Environment.IsWindows)
+                    {
+                        gitExecExtension = gitExecExtension.TrimStart('.');
                     }
+                }
 
-                    if (Environment.GitExecutablePath != null)
-                    {
-                        newGitExec = gitExec = Environment.GitExecutablePath.ToString();
-                        gitExecParent = Environment.GitExecutablePath.Parent.ToString();
+                if (Environment.GitExecutablePath != null)
+                {
+                    newGitExec = gitExec = Environment.GitExecutablePath.ToString();
+                    gitExecParent = Environment.GitExecutablePath.Parent.ToString();
 
-                        CheckEnteredGitPath();
-                    }
+                    CheckEnteredGitPath();
+                }
 
-                    if (gitExecParent == null)
-                    {
-                        gitExecParent = Environment.GitInstallPath;
-                    }
+                if (gitExecParent == null)
+                {
+                    gitExecParent = Environment.GitInstallPath;
                 }
 
                 gitExecHasChanged = false;
@@ -233,25 +220,20 @@ private void ValidateAndSetGitInstallPath(string value)
                     {
                         Logger.Trace(ErrorGettingSoftwareVersionMessage);
                         gitVersionErrorMessage = ErrorGettingSoftwareVersionMessage;
-
-                        isBusy = false;
-
-                        return;
                     }
-
-                    if (!result.IsValid)
+                    else if (!result.IsValid)
                     {
-                        Logger.Warning("Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})",
-                            result.GitVersion,
-                            Constants.MinimumGitVersion,
-                            result.GitLfsVersion,
+                        Logger.Warning(
+                            "Software versions do not meet minimums Git:{0} (Minimum:{1}) GitLfs:{2} (Minimum:{3})",
+                            result.GitVersion, Constants.MinimumGitVersion, result.GitLfsVersion,
                             Constants.MinimumGitLfsVersion);
 
                         var errorMessageStringBuilder = new StringBuilder();
 
                         if (result.GitVersion < Constants.MinimumGitVersion)
                         {
-                            errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat, result.GitVersion, Constants.MinimumGitVersion);
+                            errorMessageStringBuilder.AppendFormat(ErrorMinimumGitVersionMessageFormat,
+                                result.GitVersion, Constants.MinimumGitVersion);
                         }
 
                         if (result.GitLfsVersion < Constants.MinimumGitLfsVersion)
@@ -261,26 +243,32 @@ private void ValidateAndSetGitInstallPath(string value)
                                 errorMessageStringBuilder.Append(Environment.NewLine);
                             }
 
-                            errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat, result.GitLfsVersion, Constants.MinimumGitLfsVersion);
+                            errorMessageStringBuilder.AppendFormat(ErrorMinimumGitLfsVersionMessageFormat,
+                                result.GitLfsVersion, Constants.MinimumGitLfsVersion);
                         }
 
                         gitVersionErrorMessage = errorMessageStringBuilder.ToString();
-
-                        isBusy = false;
-                        return;
                     }
+                    else
+                    {
+                        Logger.Trace("Software versions meet minimums Git:{0} GitLfs:{1}",
+                            result.GitVersion,
+                            result.GitLfsVersion);
 
-                    Logger.Trace("Software versions meet minimums Git:{0} GitLfs:{1}",
-                        result.GitVersion,
-                        result.GitLfsVersion);
+                        Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
+                        Environment.GitExecutablePath = value.ToNPath();
 
-                    Manager.SystemSettings.Set(Constants.GitInstallPathKey, value);
-                    Environment.GitExecutablePath = value.ToNPath();
+                        gitExecHasChanged = true;
+                    }
 
-                    gitExecHasChanged = true;
                     isBusy = false;
 
                 }).Start();
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -85,11 +85,7 @@ public override void OnDisable()
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
-
-            if (gitPathView != null)
-            {
-                gitPathView.OnDataUpdate();
-            }
+            gitPathView.OnDataUpdate();
             MaybeUpdateData();
         }