Merge branch 'master' into ncover/reference-serilog

Author: grokys

src/GitHub.App/Models/PullRequestDetailArgument.cs

@@ -1,5 +1,6 @@
 using System;
 using GitHub.ViewModels;
+using GitHub.Primitives;
 
 namespace GitHub.Models
 {
@@ -9,9 +10,9 @@ namespace GitHub.Models
     public class PullRequestDetailArgument
     {
         /// <summary>
-        /// Gets or sets the repository containing the pull request.
+        /// Gets or sets the owner of the repository containing the pull request.
         /// </summary>
-        public IRemoteRepositoryModel Repository { get; set; }
+        public string RepositoryOwner { get; set; }
 
         /// <summary>
         /// Gets or sets the number of the pull request.

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -36,7 +36,7 @@ public PullRequestDetailViewModelDesigner()
         {
             var repoPath = @"C:\Repo";
 
-            Model = new PullRequestModel(419, 
+            Model = new PullRequestModel(419,
                 "Error handling/bubbling from viewmodels to views to viewhosts",
                  new AccountDesigner { Login = "shana", IsUser = true },
                  DateTime.Now.Subtract(TimeSpan.FromDays(3)))
@@ -75,7 +75,7 @@ public PullRequestDetailViewModelDesigner()
         public IPullRequestModel Model { get; }
         public IPullRequestSession Session { get; }
         public ILocalRepositoryModel LocalRepository { get; }
-        public IRemoteRepositoryModel RemoteRepository { get; }
+        public string RemoteRepositoryOwner { get; }
         public string SourceBranchDisplayName { get; set; }
         public string TargetBranchDisplayName { get; set; }
         public int CommentCount { get; set; }

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -148,13 +148,13 @@ private set
         public ILocalRepositoryModel LocalRepository { get; }
 
         /// <summary>
-        /// Gets the remote repository that contains the pull request.
+        /// Gets the owner of the remote repository that contains the pull request.
         /// </summary>
         /// <remarks>
         /// The remote repository may be different from the local repository if the local
         /// repository is a fork and the user is viewing pull requests from the parent repository.
         /// </remarks>
-        public IRemoteRepositoryModel RemoteRepository { get; private set; }
+        public string RemoteRepositoryOwner { get; private set; }
 
         /// <summary>
         /// Gets the session for the pull request.
@@ -326,13 +326,13 @@ public IReadOnlyList<IPullRequestChangeNode> ChangedFilesTree
         public override void Initialize(ViewWithData data)
         {
             int number;
-            var repo = RemoteRepository;
+            var repoOwner = RemoteRepositoryOwner;
 
             if (data != null)
             {
                 var arg = (PullRequestDetailArgument)data.Data;
                 number = arg.Number;
-                repo = arg.Repository;
+                repoOwner = arg.RepositoryOwner;
             }
             else
             {
@@ -349,7 +349,7 @@ public override void Initialize(ViewWithData data)
             }
 
             ErrorMessage = OperationError = null;
-            modelService.GetPullRequest(repo, number)
+            modelService.GetPullRequest(repoOwner, LocalRepository.Name, number)
                 .TakeLast(1)
                 .ObserveOn(RxApp.MainThreadScheduler)
                 .Catch<IPullRequestModel, Exception>(ex =>
@@ -359,23 +359,23 @@ public override void Initialize(ViewWithData data)
                     IsLoading = IsBusy = false;
                     return Observable.Empty<IPullRequestModel>();
                 })
-                .Subscribe(x => Load(repo, x).Forget());
+                .Subscribe(x => Load(repoOwner, x).Forget());
         }
 
         /// <summary>
         /// Loads the view model from octokit models.
         /// </summary>
-        /// <param name="remoteRepository">The remote repository.</param>
+        /// <param name="remoteRepositoryOwner">The owner of the remote repository.</param>
         /// <param name="pullRequest">The pull request model.</param>
-        public async Task Load(IRemoteRepositoryModel remoteRepository, IPullRequestModel pullRequest)
+        public async Task Load(string remoteRepositoryOwner, IPullRequestModel pullRequest)
         {
-            Guard.ArgumentNotNull(remoteRepository, nameof(remoteRepository));
+            Guard.ArgumentNotNull(remoteRepositoryOwner, nameof(remoteRepositoryOwner));
 
             try
             {
                 var firstLoad = (Model == null);
                 Model = pullRequest;
-                RemoteRepository = remoteRepository;
+                RemoteRepositoryOwner = remoteRepositoryOwner;
                 Session = await sessionManager.GetSession(pullRequest);
                 Title = Resources.PullRequestNavigationItemText + " #" + pullRequest.Number;
 

src/GitHub.App/ViewModels/PullRequestListViewModel.cs

@@ -331,7 +331,7 @@ void DoOpenPullRequest(object pullRequest)
             {
                 Data = new PullRequestDetailArgument
                 {
-                    Repository = SelectedRepository,
+                    RepositoryOwner = SelectedRepository.Owner,
                     Number = (int)pullRequest,
                 }
             };

src/GitHub.Exports.Reactive/ViewModels/IPullRequestDetailViewModel.cs

@@ -83,13 +83,13 @@ public interface IPullRequestDetailViewModel : IViewModel, IHasLoading, IHasBusy
         ILocalRepositoryModel LocalRepository { get; }
 
         /// <summary>
-        /// Gets the remote repository that contains the pull request.
+        /// Gets the owner of the remote repository that contains the pull request.
         /// </summary>
         /// <remarks>
         /// The remote repository may be different from the local repository if the local
         /// repository is a fork and the user is viewing pull requests from the parent repository.
         /// </remarks>
-        IRemoteRepositoryModel RemoteRepository { get; }
+        string RemoteRepositoryOwner { get; }
 
         /// <summary>
         /// Gets a string describing how to display the pull request's source branch.

src/GitHub.Exports/Settings/PkgCmdID.cs

@@ -9,6 +9,7 @@ public static class PkgCmdIDList
         public const int idGitHubToolbar = 0x1120;
         public const int showGitHubPaneCommand = 0x200;
         public const int openPullRequestsCommand = 0x201;
+        public const int showCurrentPullRequestCommand = 0x202;
         public const int backCommand = 0x300;
         public const int forwardCommand = 0x301;
         public const int refreshCommand = 0x302;

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -311,6 +311,7 @@
     <Compile Include="Helpers\ActiveDocumentSnapshot.cs" />
     <Compile Include="Menus\OpenLink.cs" />
     <Compile Include="Menus\LinkMenuBase.cs" />
+    <Compile Include="Menus\ShowCurrentPullRequest.cs" />
     <Compile Include="Menus\OpenPullRequests.cs" />
     <Compile Include="Menus\ShowGitHubPane.cs" />
     <Compile Include="Menus\AddConnection.cs" />

src/GitHub.VisualStudio/GitHub.VisualStudio.vsct

@@ -88,6 +88,16 @@
         </Strings>
       </Button>
 
+      <Button guid="guidGitHubCmdSet" id="showCurrentPullRequestCommand" type="Button">
+        <Icon guid="guidImages" id="logo" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <ButtonText>Show Current Pull Request</ButtonText>
+          <CanonicalName>GitHub.ShowCurrentPullRequest</CanonicalName>
+          <LocCanonicalName>GitHub.ShowCurrentPullRequest</LocCanonicalName>
+        </Strings>
+      </Button>
+
       <!--- Toolbar buttons -->
       <Button guid="guidGitHubToolbarCmdSet" id="backCommand" type="Button">
         <Icon guid="guidImages" id="arrow_left" />
@@ -181,13 +191,13 @@
           <ButtonText>Blame</ButtonText>
         </Strings>
       </Button>
-      
+
     </Buttons>
 
   </Commands>
 
   <CommandPlacements>
-    
+
     <!-- context menu -->
     <CommandPlacement guid="guidContextMenuSet" id="idGitHubContextMenuGroup" priority="0x1000">
       <Parent guid="GUID_XAML_EDITOR" id="ID_XAML_CTXT"/>
@@ -260,7 +270,7 @@
     </CommandPlacement>
 
   </CommandPlacements>
-  
+
   <Symbols>
     <!-- This is the package guid. -->
     <GuidSymbol name="guidGitHubPkg" value="{c3d3dc68-c977-411f-b3e8-03b0dccf7dfc}" />
@@ -271,13 +281,14 @@
       <IDSymbol name="idGitHubMenuGroup" value="0x1020"/>
       <IDSymbol name="addConnectionCommand" value="0x110"/>
       <IDSymbol name="showGitHubPaneCommand" value="0x200"/>
+      <IDSymbol name="showCurrentPullRequestCommand" value="0x202"/>
     </GuidSymbol>
 
     <!-- This is the Manage Connections menu -->
     <GuidSymbol name="guidManageConnections" value="{0A014553-A0AA-46DD-8D6B-B8E3178CA435}">
       <IDSymbol name="idManageConnections" value="0x1009"/>
     </GuidSymbol>
-    
+
     <GuidSymbol name="guidImages" value="{27841f47-070a-46d6-90be-a5cbbfc724ac}" >
       <IDSymbol name="logo" value="1" />
       <IDSymbol name="arrow_left" value="2" />
@@ -313,7 +324,7 @@
       <IDSymbol name="idBlameCommand" value="0x0500" />
 
     </GuidSymbol>
-    
+
     <GuidSymbol name="GUID_XAML_EDITOR" value="{4C87B692-1202-46AA-B64C-EF01FAEC53DA}">
       <IDSymbol name="ID_XAML_CTXT" value="259"/>
     </GuidSymbol>

src/GitHub.VisualStudio/Menus/MenuProvider.cs

@@ -44,7 +44,8 @@ public MenuProvider(IGitHubServiceProvider serviceProvider)
             {
                 new AddConnection(serviceProvider),
                 new OpenPullRequests(serviceProvider),
-                new ShowGitHubPane(serviceProvider)
+                new ShowGitHubPane(serviceProvider),
+                new ShowCurrentPullRequest(serviceProvider)
             };
 
             DynamicMenus = new List<IDynamicMenuHandler>

src/GitHub.VisualStudio/Menus/ShowCurrentPullRequest.cs

@@ -0,0 +1,40 @@
+using System;
+using GitHub.Exports;
+using GitHub.UI;
+using GitHub.Services;
+using GitHub.Extensions;
+using GitHub.Models;
+
+namespace GitHub.VisualStudio.Menus
+{
+    [ExportMenu(MenuType = MenuType.OpenPullRequests)]
+    public class ShowCurrentPullRequest : MenuBase, IMenuHandler
+    {
+        public ShowCurrentPullRequest(IGitHubServiceProvider serviceProvider)
+            : base(serviceProvider)
+        {
+            Guard.ArgumentNotNull(serviceProvider, nameof(serviceProvider));
+        }
+
+        public Guid Guid => Guids.guidGitHubCmdSet;
+        public int CmdId => PkgCmdIDList.showCurrentPullRequestCommand;
+
+        public void Activate(object data = null)
+        {
+            var pullRequestSessionManager = ServiceProvider.ExportProvider.GetExportedValueOrDefault<IPullRequestSessionManager>();
+            var session = pullRequestSessionManager?.CurrentSession;
+            if (session == null)
+            {
+                return; // No active PR session.
+            }
+
+            var pullRequest = session.PullRequest;
+            var arg = new PullRequestDetailArgument { RepositoryOwner = session.RepositoryOwner, Number = pullRequest.Number };
+            var viewWithData = new ViewWithData(UIControllerFlow.PullRequestDetail) { Data = arg };
+
+            var manager = ServiceProvider.TryGetService<IGitHubToolWindowManager>();
+            var host = manager.ShowHomePane();
+            host?.ShowView(viewWithData);
+        }
+    }
+}