Merge fixes/repository-tests-are-borked into fixes/mac-path-variable-more

Author: shana

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/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);

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -590,7 +590,7 @@ public void AddRemoteBranch(string remote, string branch)
                 if (!branchList.ContainsKey(branch))
                 {
                     var now = DateTimeOffset.Now;
-                    branchList.Add(branch, new ConfigBranch(branch, ConfigRemotes[remote]));
+                    branchList.Add(branch, new ConfigBranch(branch, ConfigRemotes[remote], null));
                     Logger.Trace("AddRemoteBranch {0} remote:{1} branch:{2} ", now, remote, branch);
                     SaveData(now, true);
                 }

src/tests/IntegrationTests/BaseIntegrationTest.cs

@@ -219,6 +219,13 @@ public virtual void OnTearDown()
         {
             TaskManager.Dispose();
             Environment?.CacheContainer.Dispose();
+            BranchesCache.Instance = null;
+            GitAheadBehindCache.Instance = null;
+            GitLocksCache.Instance = null;
+            GitLogCache.Instance = null;
+            GitStatusCache.Instance = null;
+            GitUserCache.Instance = null;
+            RepositoryInfoCache.Instance = null;
 
             Logger.Debug("Deleting TestBasePath: {0}", TestBasePath.ToString());
             for (var i = 0; i < 5; i++)

src/tests/IntegrationTests/CachingClasses.cs

@@ -19,6 +19,7 @@ public static T Instance
                     CreateAndLoad();
                 return instance;
             }
+            set { instance = value; }
         }
 
         protected ScriptObjectSingleton()
@@ -560,7 +561,7 @@ public void AddRemoteBranch(string remote, string branch)
                 if (!branchList.ContainsKey(branch))
                 {
                     var now = DateTimeOffset.Now;
-                    branchList.Add(branch, new ConfigBranch(branch, ConfigRemotes[remote]));
+                    branchList.Add(branch, new ConfigBranch(branch, ConfigRemotes[remote], null));
                     Logger.Trace("AddRemoteBranch {0} remote:{1} branch:{2} ", now, remote, branch);
                     SaveData(now, true);
                 }