Merge remote-tracking branch 'remotes/origin/fixes/1646-refresh-origin-url' into feature/github-fork

Author: StanleyGoldman

src/GitHub.App/Services/TeamExplorerContext.cs

@@ -4,6 +4,7 @@
 using System.ComponentModel.Composition;
 using GitHub.Models;
 using GitHub.Logging;
+using GitHub.Primitives;
 using Serilog;
 using EnvDTE;
 
@@ -31,6 +32,7 @@ public class TeamExplorerContext : ITeamExplorerContext
 
         string solutionPath;
         string repositoryPath;
+        UriString cloneUrl;
         string branchName;
         string headSha;
         string trackedSha;
@@ -70,6 +72,7 @@ void Refresh()
                 else
                 {
                     var newRepositoryPath = repo?.LocalPath;
+                    var newCloneUrl = repo?.CloneUrl;
                     var newBranchName = repo?.CurrentBranch?.Name;
                     var newHeadSha = repo?.CurrentBranch?.Sha;
                     var newTrackedSha = repo?.CurrentBranch?.TrackedSha;
@@ -79,6 +82,11 @@ void Refresh()
                         log.Debug("ActiveRepository changed to {CloneUrl} @ {Path}", repo?.CloneUrl, newRepositoryPath);
                         ActiveRepository = repo;
                     }
+                    else if (newCloneUrl != cloneUrl)
+                    {
+                        log.Debug("ActiveRepository changed to {CloneUrl} @ {Path}", repo?.CloneUrl, newRepositoryPath);
+                        ActiveRepository = repo;
+                    }
                     else if (newBranchName != branchName)
                     {
                         log.Debug("Fire StatusChanged event when BranchName changes for ActiveRepository");
@@ -96,6 +104,7 @@ void Refresh()
                     }
 
                     repositoryPath = newRepositoryPath;
+                    cloneUrl = newCloneUrl;
                     branchName = newBranchName;
                     headSha = newHeadSha;
                     solutionPath = newSolutionPath;

src/GitHub.Exports/Services/IVSGitExt.cs

@@ -8,5 +8,6 @@ public interface IVSGitExt
     {
         IReadOnlyList<ILocalRepositoryModel> ActiveRepositories { get; }
         event Action ActiveRepositoriesChanged;
+        void RefreshActiveRepositories();
     }
 }

src/GitHub.TeamFoundation.14/Services/VSGitExt.cs

@@ -74,7 +74,7 @@ void Initialize()
             }, TaskScheduler.Default);
         }
 
-        void RefreshActiveRepositories()
+        public void RefreshActiveRepositories()
         {
             try
             {