Making all the unit tests pass

Author: StanleyGoldman

src/GitHub.Api/Git/IRepository.cs

@@ -52,8 +52,8 @@ public interface IRepository : IEquatable<IRepository>
         ConfigBranch? CurrentBranch { get; set; }
         GitStatus CurrentStatus { get; set; }
         IList<GitRemote> Remotes { get; }
-        IList<GitBranch> LocalBranches { get; }
-        IList<GitBranch> RemoteBranches { get; }
+        IEnumerable<GitBranch> LocalBranches { get; }
+        IEnumerable<GitBranch> RemoteBranches { get; }
         IUser User { get; set; }
         IList<GitLock> CurrentLocks { get; }
         string CurrentBranchName { get; }

src/GitHub.Api/Git/Repository.cs

@@ -188,15 +188,6 @@ private void OnRepositoryManager_OnRemoteBranchListUpdated(Dictionary<string, Co
 
             remoteBranches = branches;
 
-            RemoteBranches = remoteBranches.Values
-                .SelectMany(x => x.Values)
-                .Select(x =>
-                {
-                    var name = x.Remote.Value.Name + "/" + x.Name;
-                    return new GitBranch(name, "[None]", false);
-                }).ToArray();
-
-
             Logger.Trace("OnRemoteBranchListChanged");
             OnRemoteBranchListChanged?.Invoke();
         }
@@ -205,19 +196,6 @@ private void OnRepositoryManager_OnLocalBranchListUpdated(Dictionary<string, Con
         {
             localBranches = branches;
 
-            LocalBranches = localBranches.Values.Select(x =>
-            {
-                var argName = x.Name;
-
-                var tracking = x.IsTracking
-                    ? x.Remote.Value.Name + "/" + argName
-                    : "[None]";
-
-                var active = argName == CurrentBranch?.Name;
-
-                return new GitBranch(argName, tracking, active);
-            }).ToArray();
-
             Logger.Trace("OnLocalBranchListChanged");
             OnLocalBranchListChanged?.Invoke();
         }
@@ -315,9 +293,20 @@ private void RepositoryManager_OnRemoteBranchRemoved(string remote, string name)
 
         public IList<GitRemote> Remotes { get; private set; }
 
-        public IList<GitBranch> LocalBranches { get; private set; }
+        public IEnumerable<GitBranch> LocalBranches => localBranches.Values.Select(x => {
+            var name = x.Name;
+            var trackingName = x.IsTracking ? x.Remote.Value.Name + "/" + name : "[None]";
+            var isActive = name == CurrentBranch?.Name;
+
+            return new GitBranch(name, trackingName, isActive);
+        });
+
+        public IEnumerable<GitBranch> RemoteBranches => remoteBranches.Values.SelectMany(x => x.Values).Select(x => {
+            var name = x.Remote.Value.Name + "/" + x.Name;
+            var trackingName = "[None]";
 
-        public IList<GitBranch> RemoteBranches { get; private set; }
+            return new GitBranch(name, trackingName, false);
+        });
 
         public ConfigBranch? CurrentBranch
         {

src/GitHub.Api/Git/RepositoryManager.cs

@@ -8,23 +8,20 @@ namespace GitHub.Unity
 {
     public interface IRepositoryManager : IDisposable
     {
-        event Action<bool> OnIsBusyChanged;
-        event Action<GitStatus> OnStatusUpdated;
-        event Action<IList<GitLock>> OnLocksUpdated;
-        event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
-        event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
         event Action<ConfigBranch?> OnCurrentBranchUpdated;
         event Action<ConfigRemote?> OnCurrentRemoteUpdated;
-        event Action<string> OnLocalBranchUpdated;
+        event Action<IUser> OnGitUserLoaded;
+        event Action<bool> OnIsBusyChanged;
         event Action<string> OnLocalBranchAdded;
+        event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
         event Action<string> OnLocalBranchRemoved;
+        event Action<string> OnLocalBranchUpdated;
+        event Action<IList<GitLock>> OnLocksUpdated;
         event Action<string, string> OnRemoteBranchAdded;
+        event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
         event Action<string, string> OnRemoteBranchRemoved;
-        event Action<IUser> OnGitUserLoaded;
+        event Action<GitStatus> OnStatusUpdated;
 
-        IGitConfig Config { get; }
-        IGitClient GitClient { get; }
-        bool IsBusy { get; }
         void Initialize();
         void Start();
         void Stop();
@@ -46,6 +43,10 @@ public interface IRepositoryManager : IDisposable
         ITask LockFile(string file);
         ITask UnlockFile(string file, bool force);
         int WaitForEvents();
+
+        IGitConfig Config { get; }
+        IGitClient GitClient { get; }
+        bool IsBusy { get; }
     }
 
     interface IRepositoryPathConfiguration
@@ -103,36 +104,20 @@ class RepositoryManager : IRepositoryManager
         private readonly IRepositoryWatcher watcher;
 
         private bool isBusy;
-        private Action repositoryUpdateCallback;
-
-        // internal busy flag signal
-        public event Action<bool> OnIsBusyChanged;
 
-        public event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
-        public event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
-        public event Action<IList<GitLock>> OnLocksUpdated;
-        public event Action<GitStatus> OnStatusUpdated;
         public event Action<ConfigBranch?> OnCurrentBranchUpdated;
         public event Action<ConfigRemote?> OnCurrentRemoteUpdated;
-        public event Action<string> OnLocalBranchUpdated;
+        public event Action<IUser> OnGitUserLoaded;
+        public event Action<bool> OnIsBusyChanged;
         public event Action<string> OnLocalBranchAdded;
+        public event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
         public event Action<string> OnLocalBranchRemoved;
+        public event Action<string> OnLocalBranchUpdated;
+        public event Action<IList<GitLock>> OnLocksUpdated;
         public event Action<string, string> OnRemoteBranchAdded;
+        public event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
         public event Action<string, string> OnRemoteBranchRemoved;
-        public event Action<IUser> OnGitUserLoaded;
-
-        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
-            IGitClient gitClient, NPath repositoryRoot)
-        {
-            var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
-            string filePath = repositoryPathConfiguration.DotGitConfig;
-            var gitConfig = new GitConfig(filePath);
-
-            var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
-
-            return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
-                gitClient, repositoryPathConfiguration, taskManager.Token);
-        }
+        public event Action<GitStatus> OnStatusUpdated;
 
         public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker, IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
@@ -150,6 +135,19 @@ public RepositoryManager(IPlatform platform, ITaskManager taskManager, IUsageTra
             SetupWatcher();
         }
 
+        public static RepositoryManager CreateInstance(IPlatform platform, ITaskManager taskManager, IUsageTracker usageTracker,
+            IGitClient gitClient, NPath repositoryRoot)
+        {
+            var repositoryPathConfiguration = new RepositoryPathConfiguration(repositoryRoot);
+            string filePath = repositoryPathConfiguration.DotGitConfig;
+            var gitConfig = new GitConfig(filePath);
+
+            var repositoryWatcher = new RepositoryWatcher(platform, repositoryPathConfiguration, taskManager.Token);
+
+            return new RepositoryManager(platform, taskManager, usageTracker, gitConfig, repositoryWatcher,
+                gitClient, repositoryPathConfiguration, taskManager.Token);
+        }
+
         public void Initialize()
         {
             Logger.Trace("Initialize");