Fixing path variable calculation

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
@@ -54,14 +53,35 @@ public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
 
-            var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
-                    (_, path) => InitializeEnvironment(path))
+            ITask<string> setExistingEnvironmentPath;
+            if (Environment.IsMac)
+            {
+                setExistingEnvironmentPath = new SimpleProcessTask(CancellationToken, "bash".ToNPath(), "-c \"/usr/libexec/path_helper\"")
+                           .Configure(ProcessManager, dontSetupGit: true)
+                           .Catch(e => true) // make sure this doesn't throw if the task fails
+                           .Then((success, path) => success ? path.Split(new[] { "\"" }, StringSplitOptions.None)[1] : null);
+            }
+            else
+            {
+                setExistingEnvironmentPath = new FuncTask<string>(CancellationToken, () => null);
+            }
+
+            setExistingEnvironmentPath.OnEnd += (t, path, success, ex) => {
+                if (path != null)
+                {
+                    Logger.Trace("Existing Environment Path Original:{0} Updated:{1}", Environment.Path, path);
+                    Environment.Path = path;
+                }
+            };
+
+            var initEnvironmentTask = new ActionTask<GitInstaller.GitInstallationState>(CancellationToken,
+                    (_, state) => InitializeEnvironment(state))
                 { Affinity = TaskAffinity.UI };
 
             isBusy = true;
 
             var octorunInstaller = new OctorunInstaller(Environment, TaskManager);
-            var setupTask = octorunInstaller.SetupOctorunIfNeeded();
+            var setupTask = setExistingEnvironmentPath.Then(octorunInstaller.SetupOctorunIfNeeded());
 
             var initializeGitTask = new FuncTask<NPath>(CancellationToken, () =>
                 {
@@ -87,7 +107,8 @@ public void Run(bool firstRun)
                 {
                     if (path.IsInitialized)
                     {
-                        t.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
+                        t.GetEndOfChain()
+                            .Then(initEnvironmentTask, taskIsTopOfChain: true);
                         return;
                     }
                     Logger.Trace("Using portable git");
@@ -98,7 +119,8 @@ public void Run(bool firstRun)
                     task.Progress(progressReporter.UpdateProgress);
                     task.OnEnd += (thisTask, result, success, exception) =>
                     {
-                        thisTask.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
+                        thisTask.GetEndOfChain()
+                            .Then(initEnvironmentTask, taskIsTopOfChain: true);
                     };
 
                     // append installer task to top chain
@@ -205,17 +227,23 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         /// </summary>
         /// <param name="gitExecutablePath"></param>
         /// <param name="octorunScriptPath"></param>
-        private void InitializeEnvironment(NPath gitExecutablePath)
+        private void InitializeEnvironment(GitInstaller.GitInstallationState installationState)
         {
             isBusy = false;
             SetupMetrics();
 
-            if (!gitExecutablePath.IsInitialized)
+            if (!installationState.GitIsValid)
             {
                 return;
             }
 
-            Environment.GitExecutablePath = gitExecutablePath;
+            var gitInstallDetails = new GitInstaller.GitInstallDetails(Environment.UserCachePath, Environment.IsWindows);
+            var isCustomGitExec = installationState.GitExecutablePath != gitInstallDetails.GitExecutablePath;
+
+            Environment.GitExecutablePath = installationState.GitExecutablePath;
+            Environment.GitLfsExecutablePath = installationState.GitLfsExecutablePath;
+
+            Environment.IsCustomGitExecutable = isCustomGitExec;
             Environment.User.Initialize(GitClient);
 
             var afterGitSetup = new ActionTask(CancellationToken, RestartRepository)
@@ -226,7 +254,7 @@ private void InitializeEnvironment(NPath gitExecutablePath)
             {
                 var credHelperTask = GitClient.GetConfig("credential.helper", GitConfigSource.Global);
                 credHelperTask.OnEnd += (thisTask, credentialHelper, success, exception) =>
-                    {
+                    {   
                         if (!success || string.IsNullOrEmpty(credentialHelper))
                         {
                             Logger.Warning("No Windows CredentialHelper found: Setting to wincred");

src/GitHub.Api/Cache/CacheContainer.cs

@@ -60,13 +60,11 @@ public void CheckAndRaiseEventsIfCacheNewer(CacheType cacheType, CacheUpdateEven
 
         private void OnCacheUpdated(CacheType cacheType, DateTimeOffset datetime)
         {
-            Logger.Trace("OnCacheUpdated cacheType:{0} datetime:{1}", cacheType, datetime);
             CacheUpdated.SafeInvoke(cacheType, datetime);
         }
 
         private void OnCacheInvalidated(CacheType cacheType)
         {
-            Logger.Trace("OnCacheInvalidated cacheType:{0}", cacheType);
             CacheInvalidated.SafeInvoke(cacheType);
         }
 

src/GitHub.Api/Git/GitClient.cs

@@ -9,7 +9,7 @@ namespace GitHub.Unity
 {
     public interface IGitClient
     {
-        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path);
+        ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCustomGit);
 
         ITask Init(IOutputProcessor<string> processor = null);
 
@@ -110,7 +110,7 @@ public GitClient(IEnvironment environment, IProcessManager processManager, Cance
             this.cancellationToken = cancellationToken;
         }
 
-        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
+        public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCustomGit)
         {
             Version gitVersion = null;
             Version gitLfsVersion = null;
@@ -123,9 +123,11 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path)
 
             if (path.FileExists())
             {
-                var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken).Configure(processManager, path);
+                var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken)
+                    .Configure(processManager, path, dontSetupGit: isCustomGit);
                 gitLfsVersionTask.OnEnd += (t, v, _, __) => gitLfsVersion = v;
-                var gitVersionTask = new GitVersionTask(cancellationToken).Configure(processManager, path);
+                var gitVersionTask = new GitVersionTask(cancellationToken)
+                    .Configure(processManager, path, dontSetupGit: isCustomGit);
                 gitVersionTask.OnEnd += (t, v, _, __) => gitVersion = v;
 
                 gitVersionTask

src/GitHub.Api/Git/GitConfig.cs

@@ -79,17 +79,20 @@ public struct ConfigBranch
 
         public string name;
         public ConfigRemote remote;
+        public string trackingBranch;
 
         public ConfigBranch(string name)
         {
             this.name = name;
+            this.trackingBranch = null;
             remote = ConfigRemote.Default;
         }
 
-        public ConfigBranch(string name, ConfigRemote? remote)
+        public ConfigBranch(string name, ConfigRemote? remote, string trackingBranch)
         {
             this.name = name;
             this.remote = remote ?? ConfigRemote.Default;
+            this.trackingBranch = trackingBranch != null && trackingBranch.StartsWith("refs/heads") ? trackingBranch.Substring("refs/heads".Length + 1) : null;
         }
 
         public override int GetHashCode()
@@ -137,6 +140,7 @@ public bool Equals(ConfigBranch other)
         public bool IsTracking => Remote.HasValue;
 
         public string Name => name;
+        public string TrackingBranch => trackingBranch;
 
         public ConfigRemote? Remote => Equals(remote, ConfigRemote.Default) ? (ConfigRemote?) null : remote;
 
@@ -189,7 +193,7 @@ public IEnumerable<ConfigBranch> GetBranches()
             return groups
                 .Where(x => x.Key == "branch")
                 .SelectMany(x => x.Value)
-                .Select(x => new ConfigBranch(x.Key, GetRemote(x.Value.TryGetString("remote"))));
+                .Select(x => new ConfigBranch(x.Key, GetRemote(x.Value.TryGetString("remote")), x.Value.TryGetString("merge")));
         }
 
         public IEnumerable<ConfigRemote> GetRemotes()
@@ -217,7 +221,7 @@ public IEnumerable<ConfigRemote> GetRemotes()
                 .Where(x => x.Key == "branch")
                 .SelectMany(x => x.Value)
                 .Where(x => x.Key == branch)
-                .Select(x => new ConfigBranch(x.Key,GetRemote(x.Value.TryGetString("remote"))) as ConfigBranch?)
+                .Select(x => new ConfigBranch(x.Key, GetRemote(x.Value.TryGetString("remote")), x.Value.TryGetString("merge")) as ConfigBranch?)
                 .FirstOrDefault();
         }
 

src/GitHub.Api/Git/IRepository.cs

@@ -8,7 +8,7 @@ namespace GitHub.Unity
     /// </summary>
     public interface IRepository : IEquatable<IRepository>, IDisposable
     {
-        void Initialize(IRepositoryManager repositoryManager, ITaskManager taskManager);
+        void Initialize(IRepositoryManager theRepositoryManager, ITaskManager theTaskManager);
         void Start();
 
         ITask CommitAllFiles(string message, string body);

src/GitHub.Api/Git/Repository.cs

@@ -70,14 +70,14 @@ public Repository(NPath localPath, ICacheContainer container)
             };
         }
 
-        public void Initialize(IRepositoryManager repositoryManager, ITaskManager taskManager)
+        public void Initialize(IRepositoryManager theRepositoryManager, ITaskManager theTaskManager)
         {
             //Logger.Trace("Initialize");
-            Guard.ArgumentNotNull(repositoryManager, nameof(repositoryManager));
-            Guard.ArgumentNotNull(taskManager, nameof(taskManager));
+            Guard.ArgumentNotNull(theRepositoryManager, nameof(theRepositoryManager));
+            Guard.ArgumentNotNull(theTaskManager, nameof(theTaskManager));
 
-            this.taskManager = taskManager;
-            this.repositoryManager = repositoryManager;
+            this.taskManager = theTaskManager;
+            this.repositoryManager = theRepositoryManager;
             this.repositoryManager.CurrentBranchUpdated += RepositoryManagerOnCurrentBranchUpdated;
             this.repositoryManager.GitStatusUpdated += RepositoryManagerOnGitStatusUpdated;
             this.repositoryManager.GitAheadBehindStatusUpdated += RepositoryManagerOnGitAheadBehindStatusUpdated;
@@ -176,7 +176,6 @@ private void CacheHasBeenInvalidated(CacheType cacheType)
                 return;
             }
 
-            Logger.Trace($"CacheInvalidated {cacheType.ToString()}");
             switch (cacheType)
             {
                 case CacheType.Branches:

src/GitHub.Api/Git/RepositoryManager.cs

@@ -348,7 +348,7 @@ public void UpdateGitAheadBehindStatus()
             if (configBranch.HasValue && configBranch.Value.Remote.HasValue)
             {
                 var name = configBranch.Value.Name;
-                var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + name : "[None]";
+                var trackingName = configBranch.Value.IsTracking ? configBranch.Value.Remote.Value.Name + "/" + configBranch.Value.TrackingBranch : "[None]";
 
                 var task = GitClient.AheadBehindStatus(name, trackingName)
                     .Then((success, status) =>
@@ -491,6 +491,10 @@ private void WatcherOnLocalBranchesChanged()
         {
             Logger.Trace("WatcherOnLocalBranchesChanged");
             DataNeedsRefreshing?.Invoke(CacheType.Branches);
+            // the watcher should tell us what branch has changed so we can fire this only
+            // when the active branch has changed
+            DataNeedsRefreshing?.Invoke(CacheType.GitLog);
+            DataNeedsRefreshing?.Invoke(CacheType.GitAheadBehind);
         }
 
         private void WatcherOnRepositoryCommitted()
@@ -520,6 +524,7 @@ private void WatcherOnHeadChanged()
             Logger.Trace("WatcherOnHeadChanged");
             DataNeedsRefreshing?.Invoke(CacheType.RepositoryInfo);
             DataNeedsRefreshing?.Invoke(CacheType.GitLog);
+            DataNeedsRefreshing?.Invoke(CacheType.GitAheadBehind);
         }
 
         private void WatcherOnIndexChanged()
@@ -577,7 +582,7 @@ private void UpdateRemoteBranches()
                                .Select(x => x.RelativeTo(basedir))
                                .Select(x => x.ToString(SlashMode.Forward)))
                     {
-                        branchList.Add(branch, new ConfigBranch(branch, remotes[remote]));
+                        branchList.Add(branch, new ConfigBranch(branch, remotes[remote], null));
                     }
 
                     remoteBranches.Add(remote, branchList);