Use ISimpleRepositoryModel instead of IGitRepositoryInfo

IGitRepositoryInfo is a VS type that doesn't cache url information.
Switch to our ISimpleRepositoryModel which caches the local and remote
information and that we can control.

Author: shana

src/GitHub.Exports/Services/ITeamExplorerServiceHolder.cs

@@ -1,6 +1,7 @@
 using System;
 using GitHub.Primitives;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
+using GitHub.Models;
 
 namespace GitHub.Services
 {
@@ -28,13 +29,13 @@ public interface ITeamExplorerServiceHolder
         /// <summary>
         /// A IGitRepositoryInfo representing the currently active repository
         /// </summary>
-        IGitRepositoryInfo ActiveRepo { get; }
+        ISimpleRepositoryModel ActiveRepo { get; }
         /// <summary>
         /// Subscribe to be notified when the active repository is set and Notify is called.
         /// </summary>
         /// <param name="who">The instance that is interested in being called (or a unique key/object for that instance)</param>
         /// <param name="handler">The handler to call when ActiveRepo is set</param>
-        void Subscribe(object who, Action<IGitRepositoryInfo> handler);
+        void Subscribe(object who, Action<ISimpleRepositoryModel> handler);
         /// <summary>
         /// Unsubscribe from notifications
         /// </summary>
@@ -46,7 +47,7 @@ public interface ITeamExplorerServiceHolder
 
     public interface IGitAwareItem
     {
-        IGitRepositoryInfo ActiveRepo { get; }
+        ISimpleRepositoryModel ActiveRepo { get; }
 
         /// <summary>
         /// Represents the web URL of the repository on GitHub.com, even if the origin is an SSH address.

src/GitHub.VisualStudio/Base/TeamExplorerGitRepoInfo.cs

@@ -1,4 +1,5 @@
-using GitHub.Primitives;
+using GitHub.Models;
+using GitHub.Primitives;
 using GitHub.Services;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using NullGuard;
@@ -12,9 +13,9 @@ public TeamExplorerGitRepoInfo()
             ActiveRepo = null;
         }
 
-        IGitRepositoryInfo activeRepo;
+        ISimpleRepositoryModel activeRepo;
         [AllowNull]
-        public IGitRepositoryInfo ActiveRepo
+        public ISimpleRepositoryModel ActiveRepo
         {
             [return: AllowNull]
             get { return activeRepo; }

src/GitHub.VisualStudio/Base/TeamExplorerItemBase.cs

@@ -7,6 +7,7 @@
 using GitHub.VisualStudio.Helpers;
 using NullGuard;
 using Octokit;
+using GitHub.Extensions;
 
 namespace GitHub.VisualStudio.Base
 {
@@ -49,7 +50,7 @@ protected virtual void RepoChanged()
             var repo = ActiveRepo;
             if (repo != null)
             {
-                var uri = repo.GetUriFromRepository();
+                var uri = repo.CloneUrl;
                 if (uri?.RepositoryName != null)
                 {
                     ActiveRepoUri = uri;

src/GitHub.VisualStudio/Base/TeamExplorerNavigationItemBase.cs

@@ -10,6 +10,7 @@
 using Microsoft.VisualStudio.PlatformUI;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using NullGuard;
+using GitHub.Models;
 
 namespace GitHub.VisualStudio.Base
 {
@@ -56,7 +57,7 @@ void OnThemeChanged()
             }
         }
 
-        void UpdateRepo(IGitRepositoryInfo repo)
+        void UpdateRepo(ISimpleRepositoryModel repo)
         {
             ActiveRepo = repo;
             RepoChanged();

src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs

@@ -100,7 +100,7 @@ public virtual void SaveContext(object sender, SectionSaveContextEventArgs e)
 
         void SubscribeToRepoChanges()
         {
-            holder.Subscribe(this, (IGitRepositoryInfo repo) =>
+            holder.Subscribe(this, (ISimpleRepositoryModel repo) =>
             {
                 ActiveRepo = repo;
                 RepoChanged();

src/GitHub.VisualStudio/Base/TeamExplorerServiceHolder.cs

@@ -11,15 +11,16 @@
 using System.Linq;
 using System.Threading;
 using System.Globalization;
+using GitHub.Models;
 
 namespace GitHub.VisualStudio.Base
 {
     [Export(typeof(ITeamExplorerServiceHolder))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class TeamExplorerServiceHolder : ITeamExplorerServiceHolder
     {
-        readonly Dictionary<object, Action<IGitRepositoryInfo>> activeRepoHandlers = new Dictionary<object, Action<IGitRepositoryInfo>>();
-        IGitRepositoryInfo activeRepo;
+        readonly Dictionary<object, Action<ISimpleRepositoryModel>> activeRepoHandlers = new Dictionary<object, Action<ISimpleRepositoryModel>>();
+        ISimpleRepositoryModel activeRepo;
         bool activeRepoNotified = false;
 
         IServiceProvider serviceProvider;
@@ -48,24 +49,24 @@ public IServiceProvider ServiceProvider
                 if (serviceProvider == null)
                     return;
                 GitUIContext = GitUIContext ?? UIContext.FromUIContextGuid(new Guid("11B8E6D7-C08B-4385-B321-321078CDD1F8"));
-                UIContextChanged(GitUIContext?.IsActive ?? false);
+                UIContextChanged(GitUIContext?.IsActive ?? false, false);
             }
         }
 
         [AllowNull]
-        public IGitRepositoryInfo ActiveRepo
+        public ISimpleRepositoryModel ActiveRepo
         {
             [return: AllowNull] get { return activeRepo; }
             private set
             {
-                if (activeRepo.Compare(value))
+                if (Equals(activeRepo, value))
                     return;
                 activeRepo = value;
                 NotifyActiveRepo();
             }
         }
 
-        public void Subscribe(object who, Action<IGitRepositoryInfo> handler)
+        public void Subscribe(object who, Action<ISimpleRepositoryModel> handler)
         {
             lock(activeRepoHandlers)
             {
@@ -140,7 +141,7 @@ async void UIContextChanged(bool active)
                             if (repos == null)
                                 VsOutputLogger.WriteLine(string.Format(CultureInfo.CurrentCulture, "Error 2002: ActiveRepositories is null. GitService: '{0}'", GitService));
                         }
-                        return repos?.FirstOrDefault();
+                        return repos?.FirstOrDefault()?.ToModel();
                     });
             }
             else
@@ -156,11 +157,11 @@ void CheckAndUpdate(object sender, System.ComponentModel.PropertyChangedEventArg
             if (service == null)
                 return;
 
-            var repo = service.ActiveRepositories.FirstOrDefault();
+            var repo = service.ActiveRepositories.FirstOrDefault()?.ToModel();
             // this comparison is safe, the extension method supports null instances
-            if (!repo.Compare(ActiveRepo))
+            if (!repo.Equals(ActiveRepo))
                 // so annoying that this is on the wrong thread
-                syncContext.Post(r => ActiveRepo = r as IGitRepositoryInfo, repo);
+                syncContext.Post(r => ActiveRepo = r as ISimpleRepositoryModel, repo);
         }
 
         public IGitAwareItem HomeSection

src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubConnectSection.cs

@@ -209,7 +209,7 @@ async void UpdateRepositoryList(object sender, NotifyCollectionChangedEventArgs
                         .Cast<ISimpleRepositoryModel>()
                         .ForEach(async r =>
                     {
-                        if (String.Equals(Holder.ActiveRepo?.RepositoryPath, r.LocalPath, StringComparison.CurrentCultureIgnoreCase))
+                        if (Equals(Holder.ActiveRepo, r))
                             SelectedRepository = r;
                         var repo = await ApiFactory.Create(r.CloneUrl).GetRepository();
                         r.SetIcon(repo.Private, repo.Fork);
@@ -298,7 +298,7 @@ public void Login()
 
         public bool OpenRepository()
         {
-            var old = Repositories.FirstOrDefault(x => String.Equals(Holder.ActiveRepo?.RepositoryPath, x.LocalPath, StringComparison.CurrentCultureIgnoreCase));
+            var old = Repositories.FirstOrDefault(x => x.Equals(Holder.ActiveRepo));
             // open the solution selection dialog when the user wants to switch to a different repo
             // since there's no other way of changing the source control context in VS
             if (!Equals(SelectedRepository, old))