Refresh PullRequestSessionManager.CurrentSession when PR branch changes

src/GitHub.App/GitHub.App.csproj

@@ -50,6 +50,9 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)\src\common\signing.props" />
   <ItemGroup>
+    <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
     <Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
@@ -139,6 +142,7 @@
     <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="Services\EnterpriseCapabilitiesService.cs" />
     <Compile Include="Services\GlobalConnection.cs" />
+    <Compile Include="Services\TeamExplorerContext.cs" />
     <Compile Include="Services\OAuthCallbackListener.cs" />
     <Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />
     <Compile Include="ViewModels\Dialog\GitHubDialogWindowViewModel.cs" />

src/GitHub.App/Services/PullRequestService.cs

@@ -14,7 +14,6 @@
 using System.Reactive;
 using System.Collections.Generic;
 using LibGit2Sharp;
-using System.Diagnostics;
 using GitHub.Logging;
 
 namespace GitHub.Services
@@ -287,7 +286,7 @@ public bool IsPullRequestFromRepository(ILocalRepositoryModel repository, IPullR
         {
             if (pullRequest.Head?.RepositoryCloneUrl != null)
             {
-                return repository.CloneUrl.ToRepositoryUrl() == pullRequest.Head.RepositoryCloneUrl.ToRepositoryUrl();
+                return repository.CloneUrl?.ToRepositoryUrl() == pullRequest.Head.RepositoryCloneUrl.ToRepositoryUrl();
             }
 
             return false;

src/GitHub.App/Services/TeamExplorerContext.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Linq;
+using System.ComponentModel;
+using System.ComponentModel.Composition;
+using GitHub.Models;
+using GitHub.Logging;
+using Serilog;
+using EnvDTE;
+
+namespace GitHub.Services
+{
+    /// <summary>
+    /// This implementation listenes to IGitExt for ActiveRepositories property change events and fires
+    /// <see cref="PropertyChanged"/> and <see cref="StatusChanged"/> events when appropriate.
+    /// </summary>
+    /// <remarks>
+    /// A <see cref="PropertyChanged"/> is fired when a solution is opened in a new repository (or not in a repository).
+    /// A <see cref="StatusChanged"/> event is only fired when the current branch, head SHA or tracked SHA changes (not
+    /// on every IGitExt property change event). <see cref="ActiveRepository"/> contains the active repository or null
+    /// if a solution is opened that isn't in a repository. No events are fired when the same solution is unloaded then
+    /// reloaded (e.g. when a .sln file is touched).
+    /// </remarks>
+    [Export(typeof(ITeamExplorerContext))]
+    [PartCreationPolicy(CreationPolicy.Shared)]
+    public class TeamExplorerContext : ITeamExplorerContext
+    {
+        static ILogger log = LogManager.ForContext<TeamExplorerContext>();
+
+        readonly DTE dte;
+        readonly IVSGitExt gitExt;
+
+        string solutionPath;
+        string repositoryPath;
+        string branchName;
+        string headSha;
+        string trackedSha;
+
+        ILocalRepositoryModel repositoryModel;
+
+        [ImportingConstructor]
+        public TeamExplorerContext(IGitHubServiceProvider serviceProvider, IVSGitExt gitExt)
+            : this(gitExt, serviceProvider)
+        {
+        }
+
+        public TeamExplorerContext(IVSGitExt gitExt, IGitHubServiceProvider serviceProvider)
+        {
+            this.gitExt = gitExt;
+
+            // This is a standard service which should always be available.
+            dte = serviceProvider.GetService<DTE>();
+
+            Refresh();
+            gitExt.ActiveRepositoriesChanged += Refresh;
+        }
+
+        void Refresh()
+        {
+            try
+            {
+                var repo = gitExt.ActiveRepositories?.FirstOrDefault();
+                var newSolutionPath = dte.Solution?.FullName;
+
+                if (repo == null && newSolutionPath == solutionPath)
+                {
+                    // Ignore when ActiveRepositories is empty and solution hasn't changed.
+                    // https://github.com/github/VisualStudio/issues/1421
+                    log.Information("Ignoring no ActiveRepository when solution hasn't changed");
+                }
+                else
+                {
+                    var newRepositoryPath = repo?.LocalPath;
+                    var newBranchName = repo?.CurrentBranch?.Name;
+                    var newHeadSha = repo?.CurrentBranch?.Sha;
+                    var newTrackedSha = repo?.CurrentBranch?.TrackedSha;
+
+                    if (newRepositoryPath != repositoryPath)
+                    {
+                        log.Information("Fire PropertyChanged event for ActiveRepository");
+                        ActiveRepository = repo;
+                    }
+                    else if (newBranchName != branchName)
+                    {
+                        log.Information("Fire StatusChanged event when BranchName changes for ActiveRepository");
+                        StatusChanged?.Invoke(this, EventArgs.Empty);
+                    }
+                    else if (newHeadSha != headSha)
+                    {
+                        log.Information("Fire StatusChanged event when HeadSha changes for ActiveRepository");
+                        StatusChanged?.Invoke(this, EventArgs.Empty);
+                    }
+                    else if (newTrackedSha != trackedSha)
+                    {
+                        log.Information("Fire StatusChanged event when TrackedSha changes for ActiveRepository");
+                        StatusChanged?.Invoke(this, EventArgs.Empty);
+                    }
+
+                    repositoryPath = newRepositoryPath;
+                    branchName = newBranchName;
+                    headSha = newHeadSha;
+                    solutionPath = newSolutionPath;
+                    trackedSha = newTrackedSha;
+                }
+            }
+            catch (Exception e)
+            {
+                log.Error(e, "Refreshing active repository");
+            }
+        }
+
+        /// <summary>
+        /// The active repository or null if not in a repository.
+        /// </summary>
+        public ILocalRepositoryModel ActiveRepository
+        {
+            get
+            {
+                return repositoryModel;
+            }
+
+            private set
+            {
+                if (value != repositoryModel)
+                {
+                    repositoryModel = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ActiveRepository)));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Fired when a solution is opened in a new repository (or that isn't in a repository).
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Fired when the current branch, head SHA or tracked SHA changes.
+        /// </summary>
+        public event EventHandler StatusChanged;
+    }
+}

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

@@ -32,7 +32,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly IViewViewModelFactory viewModelFactory;
         readonly ISimpleApiClientFactory apiClientFactory;
         readonly IConnectionManager connectionManager;
-        readonly ITeamExplorerServiceHolder teServiceHolder;
+        readonly ITeamExplorerContext teamExplorerContext;
         readonly IVisualStudioBrowser browser;
         readonly IUsageTracker usageTracker;
         readonly INavigationViewModel navigator;
@@ -46,7 +46,6 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly ReactiveCommand<Unit> refresh;
         readonly ReactiveCommand<Unit> showPullRequests;
         readonly ReactiveCommand<object> openInBrowser;
-        bool initialized;
         IViewModel content;
         ILocalRepositoryModel localRepository;
         string searchQuery;
@@ -56,7 +55,7 @@ public GitHubPaneViewModel(
             IViewViewModelFactory viewModelFactory,
             ISimpleApiClientFactory apiClientFactory,
             IConnectionManager connectionManager,
-            ITeamExplorerServiceHolder teServiceHolder,
+            ITeamExplorerContext teamExplorerContext,
             IVisualStudioBrowser browser,
             IUsageTracker usageTracker,
             INavigationViewModel navigator,
@@ -67,7 +66,7 @@ public GitHubPaneViewModel(
             Guard.ArgumentNotNull(viewModelFactory, nameof(viewModelFactory));
             Guard.ArgumentNotNull(apiClientFactory, nameof(apiClientFactory));
             Guard.ArgumentNotNull(connectionManager, nameof(connectionManager));
-            Guard.ArgumentNotNull(teServiceHolder, nameof(teServiceHolder));
+            Guard.ArgumentNotNull(teamExplorerContext, nameof(teamExplorerContext));
             Guard.ArgumentNotNull(browser, nameof(browser));
             Guard.ArgumentNotNull(usageTracker, nameof(usageTracker));
             Guard.ArgumentNotNull(navigator, nameof(navigator));
@@ -78,7 +77,7 @@ public GitHubPaneViewModel(
             this.viewModelFactory = viewModelFactory;
             this.apiClientFactory = apiClientFactory;
             this.connectionManager = connectionManager;
-            this.teServiceHolder = teServiceHolder;
+            this.teamExplorerContext = teamExplorerContext;
             this.browser = browser;
             this.usageTracker = usageTracker;
             this.navigator = navigator;
@@ -199,8 +198,12 @@ public void Dispose()
         /// <inheritdoc/>
         public async Task InitializeAsync(IServiceProvider paneServiceProvider)
         {
-            await UpdateContent(teServiceHolder.ActiveRepo);
-            teServiceHolder.Subscribe(this, x => UpdateContentIfRepositoryChanged(x).Forget());
+            await UpdateContent(teamExplorerContext.ActiveRepository);
+            teamExplorerContext.WhenAnyValue(x => x.ActiveRepository)
+               .Skip(1)
+               .ObserveOn(RxApp.MainThreadScheduler)
+               .Subscribe(x => UpdateContent(x).Forget());
+
             connectionManager.Connections.CollectionChanged += (_, __) => UpdateContent(LocalRepository).Forget();
 
             BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.pullRequestCommand, showPullRequests);
@@ -274,7 +277,7 @@ public Task ShowCreatePullRequest()
         /// <inheritdoc/>
         public Task ShowPullRequests()
         {
-            return NavigateTo<IPullRequestListViewModel>(x => x.InitializeAsync(LocalRepository, Connection)); 
+            return NavigateTo<IPullRequestListViewModel>(x => x.InitializeAsync(LocalRepository, Connection));
         }
 
         /// <inheritdoc/>
@@ -344,7 +347,6 @@ async Task NavigateTo<TViewModel>(Func<TViewModel, Task> initialize, Func<TViewM
 
         async Task UpdateContent(ILocalRepositoryModel repository)
         {
-            initialized = true;
             LocalRepository = repository;
             Connection = null;
             Content = null;
@@ -388,14 +390,6 @@ async Task UpdateContent(ILocalRepositoryModel repository)
             }
         }
 
-        async Task UpdateContentIfRepositoryChanged(ILocalRepositoryModel repository)
-        {
-            if (!initialized || !Equals(repository, LocalRepository))
-            {
-                await UpdateContent(repository);
-            }
-        }
-
         static async Task<bool> IsValidRepository(ISimpleApiClient client)
         {
             try