Properly updating repository info

Author: StanleyGoldman

src/GitHub.Api/Git/Repository.cs

@@ -145,13 +145,21 @@ public ITask ReleaseLock(string file, bool force)
             return repositoryManager.UnlockFile(file, force);
         }
 
-        private void SetCloneUrl()
+        private void UpdateRepositoryInfo()
         {
             if (CurrentRemote.HasValue)
+            {
                 CloneUrl = new UriString(CurrentRemote.Value.Url);
+                Name = CloneUrl.RepositoryName;
+                Logger.Trace("CloneUrl: {0}", CloneUrl.ToString());
+            }
             else
+            {
                 CloneUrl = null;
-            Name = CloneUrl != null ? CloneUrl.RepositoryName : LocalPath.FileName;
+                Name = LocalPath.FileName;
+                Logger.Trace("CloneUrl: [NULL]");
+            }
+
             OnRepositoryInfoChanged?.Invoke();
         }
 
@@ -204,7 +212,11 @@ private void UpdateCurrentBranchAndRemote()
 
             if (!remote.HasValue)
             {
-                remote = repositoryManager.Config.GetRemotes().FirstOrDefault();
+                var configRemotes = repositoryManager.Config.GetRemotes().ToArray();
+                if (configRemotes.Any())
+                {
+                    remote = configRemotes.FirstOrDefault();
+                }
             }
 
             CurrentRemote = remote;
@@ -334,8 +346,8 @@ public ConfigBranch? CurrentBranch
                 if (!Nullable.Equals(currentBranch, value))
                 {
                     currentBranch = value;
-                    Logger.Trace("OnCurrentBranchChanged: {0}", value?.ToString() ?? "NULL");
-                    OnCurrentBranchChanged?.Invoke(CurrentBranch.HasValue ? CurrentBranch.Value.Name : null);
+                    Logger.Trace("OnCurrentBranchChanged: {0}", currentBranch.HasValue ? currentBranch.ToString() : "[NULL]");
+                    OnCurrentBranchChanged?.Invoke(currentBranch.HasValue ? currentBranch.Value.Name : null);
                 }
             }
         }
@@ -356,9 +368,9 @@ public ConfigRemote? CurrentRemote
                 if (!Nullable.Equals(currentRemote, value))
                 {
                     currentRemote = value;
-                    SetCloneUrl();
-                    Logger.Trace("OnCurrentRemoteChanged: {0}", value?.ToString() ?? "NULL");
-                    OnCurrentRemoteChanged?.Invoke(CurrentRemote.HasValue ? CurrentRemote.Value.Name : null);
+                    Logger.Trace("OnCurrentRemoteChanged: {0}", currentRemote.HasValue ? currentRemote.Value.ToString() : "[NULL]");
+                    OnCurrentRemoteChanged?.Invoke(currentRemote.HasValue ? currentRemote.Value.Name : null);
+                    UpdateRepositoryInfo();
                 }
             }
         }

src/tests/UnitTests/Git/RepositoryTests.cs

@@ -31,11 +31,13 @@ private static Repository LoadRepository()
         }
 
         private RepositoryEvents repositoryEvents;
+        private TimeSpan repositoryEventsTimeout;
 
         [SetUp]
         public void OnSetup()
         {
             repositoryEvents = new RepositoryEvents();
+            repositoryEventsTimeout = TimeSpan.FromSeconds(0.5);
         }
 
         [Test]
@@ -89,16 +91,17 @@ public void Repository()
 
             repositoryManager.OnLocalBranchListUpdated += Raise.Event<Action<Dictionary<string, ConfigBranch>>>(branchDictionary);
 
-            repositoryEvents.OnLocalBranchListChanged.WaitOne().Should().BeTrue();
+            repositoryEvents.OnLocalBranchListChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnLocalBranchListChanged not raised");
 
             repositoryManager.OnRemoteBranchListUpdated += Raise.Event<Action<Dictionary<string, Dictionary<string, ConfigBranch>>>>(remoteBranchDictionary);
 
-            repositoryEvents.OnRemoteBranchListChanged.WaitOne().Should().BeTrue();
+            repositoryEvents.OnRemoteBranchListChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnRemoteBranchListChanged not raised");
 
             repositoryManager.OnHeadUpdated += Raise.Event<Action<string>>("ref:refs/heads/master");
 
-            repositoryEvents.OnCurrentBranchChanged.WaitOne().Should().BeTrue();
-            repositoryEvents.OnCurrentRemoteChanged.WaitOne().Should().BeTrue();
+            repositoryEvents.OnCurrentBranchChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnCurrentBranchChanged not raised");
+            repositoryEvents.OnCurrentRemoteChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnCurrentRemoteChanged not raised");
+            repositoryEvents.OnRepositoryInfoChanged.WaitOne(repositoryEventsTimeout).Should().BeTrue("OnRepositoryInfoChanged not raised");
 
             expectedBranch.Should().Be("master");
             expectedRemote.Should().Be("origin");