Merge branch 'master' into fixes/publish-view-loading

Author: shana

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();
                     }
                 }

src/GitHub.Api/Git/GitClient.cs

@@ -103,17 +103,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;
@@ -134,16 +147,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;
         }

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;

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()

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

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; } }
     }

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)
         {

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)

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

@@ -226,9 +226,13 @@ public override void OnGUI()
 
                         var organization = owners[selectedOwner] == username ? null : owners[selectedOwner];
 
+                        var cleanRepoDescription = repoDescription.Trim();
+                        cleanRepoDescription = cleanRepoDescription == string.Empty ? null : cleanRepoDescription;
+
                         Client.CreateRepository(new NewRepository(repoName)
                         {
                             Private = togglePrivate,
+                            Description = cleanRepoDescription
                         }, (repository, ex) =>
                         {
                             Logger.Trace("Create Repository Callback");