Show commit in TE when OID clicked.

grokys · grokys · commit 424439dc0ac9 · 2018-10-31T14:59:41.000+01:00
diff --git a/src/GitHub.App/Models/RemoteRepositoryModel.cs b/src/GitHub.App/Models/RemoteRepositoryModel.cs
@@ -25,7 +25,6 @@ public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPr
             : base(name, cloneUrl)
         {
             Guard.ArgumentNotEmptyString(name, nameof(name));
-            Guard.ArgumentNotNull(ownerAccount, nameof(ownerAccount));
 
             Id = id;
             OwnerAccount = ownerAccount;
diff --git a/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs b/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs
@@ -91,11 +91,17 @@ Depends on #1993
         public IActorViewModel Author { get; set; } = new ActorViewModelDesigner("grokys");
         public string Body { get; set; }
         public int Number { get; set; } = 1994;
-        public IRepositoryModel Repository { get; set; }
+        public ILocalRepositoryModel LocalRepository { get; }
+        public IRemoteRepositoryModel Repository { get; set; }
         public string Title { get; set; } = "Save drafts of comments";
         public Uri WebUrl { get; set; }
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
+        public ReactiveCommand<string, Unit> ShowCommit { get; }
 
-        public Task InitializeAsync(ActorModel currentUser, PullRequestDetailModel model) => Task.CompletedTask;
+
+        public Task InitializeAsync(IRemoteRepositoryModel repository, ILocalRepositoryModel localRepository, ActorModel currentUser, PullRequestDetailModel model)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/GitHub.App/Services/GitClient.cs b/src/GitHub.App/Services/GitClient.cs
@@ -181,6 +181,11 @@ public Task Checkout(IRepository repository, string branchName)
             });
         }
 
+        public async Task<bool> CommitExists(IRepository repository, string sha)
+        {
+            return await Task.Run(() => repository.Lookup<Commit>(sha) != null).ConfigureAwait(false);
+        }
+
         public Task CreateBranch(IRepository repository, string branchName)
         {
             Guard.ArgumentNotNull(repository, nameof(repository));
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -567,6 +567,21 @@ public IObservable<Unit> Checkout(ILocalRepositoryModel repository, PullRequestD
             });
         }
 
+        public async Task<bool> FetchCommit(ILocalRepositoryModel localRepository, IRepositoryModel remoteRepository, string sha)
+        {
+            using (var repo = gitService.GetRepository(localRepository.LocalPath))
+            {
+                if (!await gitClient.CommitExists(repo, sha).ConfigureAwait(false))
+                {
+                    var remote = await CreateRemote(repo, remoteRepository.CloneUrl).ConfigureAwait(false);
+                    await gitClient.Fetch(repo, remote).ConfigureAwait(false);
+                    return await gitClient.CommitExists(repo, sha).ConfigureAwait(false);
+                }
+
+                return true;
+            }
+        }
+
         public IObservable<string> GetDefaultLocalBranchName(ILocalRepositoryModel repository, int pullRequestNumber, string pullRequestTitle)
         {
             return Observable.Defer(() =>
diff --git a/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs b/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs
@@ -1,20 +1,31 @@
-﻿using System;
-using GitHub.Models;
-using GitHub.ViewModels;
+﻿using GitHub.Models;
 
 namespace GitHub.ViewModels.Documents
 {
     public class CommitSummaryViewModel : ViewModelBase
     {
-        public CommitSummaryViewModel(CommitModel model)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommitSummaryViewModel"/> class.
+        /// </summary>
+        /// <param name="commit">The commit model.</param>
+        public CommitSummaryViewModel(CommitModel commit)
         {
-            AbbreviatedOid = model.AbbreviatedOid;
-            Author = new ActorViewModel(model.Author);
-            Header = model.MessageHeadline;
+            AbbreviatedOid = commit.AbbreviatedOid;
+            Author = new ActorViewModel(commit.Author);
+            Header = commit.MessageHeadline;
+            Oid = commit.Oid;
         }
 
-        public string AbbreviatedOid { get; }
-        public IActorViewModel Author { get; }
-        public string Header { get; }
+        /// <inheritdoc/>
+        public string AbbreviatedOid { get; private set; }
+
+        /// <inheritdoc/>
+        public IActorViewModel Author { get; private set; }
+
+        /// <inheritdoc/>
+        public string Header { get; private set; }
+
+        /// <inheritdoc/>
+        public string Oid { get; private set; }
     }
 }
diff --git a/src/GitHub.App/ViewModels/Documents/IssueishPaneViewModel.cs b/src/GitHub.App/ViewModels/Documents/IssueishPaneViewModel.cs
@@ -49,7 +49,21 @@ public async Task Load(IConnection connection, string owner, string name, int nu
             {
                 var session = await sessionManager.GetSession(owner, name, number).ConfigureAwait(true);
                 var vm = factory.CreateViewModel<IPullRequestPageViewModel>();
-                await vm.InitializeAsync(session.User, session.PullRequest).ConfigureAwait(true);
+
+                var repository = new RemoteRepositoryModel(
+                    0,
+                    name,
+                    session.LocalRepository.CloneUrl.WithOwner(session.PullRequest.HeadRepositoryOwner),
+                    false,
+                    false,
+                    null,
+                    null);
+
+                await vm.InitializeAsync(
+                    repository,
+                    session.LocalRepository,
+                    session.User,
+                    session.PullRequest).ConfigureAwait(true);
                 Content = vm;
             }
             catch (Exception ex)
diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Factories;
@@ -19,7 +20,9 @@ namespace GitHub.ViewModels.Documents
     public class PullRequestPageViewModel : PullRequestViewModelBase, IPullRequestPageViewModel, ICommentThreadViewModel
     {
         readonly IViewViewModelFactory factory;
+        readonly IPullRequestService service;
         readonly IPullRequestSessionManager sessionManager;
+        readonly ITeamExplorerServices teServices;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestPageViewModel"/> class.
@@ -28,13 +31,21 @@ public class PullRequestPageViewModel : PullRequestViewModelBase, IPullRequestPa
         [ImportingConstructor]
         public PullRequestPageViewModel(
             IViewViewModelFactory factory,
-            IPullRequestSessionManager sessionManager)
+            IPullRequestService service,
+            IPullRequestSessionManager sessionManager,
+            ITeamExplorerServices teServices)
         {
             Guard.ArgumentNotNull(factory, nameof(factory));
+            Guard.ArgumentNotNull(service, nameof(service));
             Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
+            Guard.ArgumentNotNull(teServices, nameof(teServices));
 
             this.factory = factory;
+            this.service = service;
             this.sessionManager = sessionManager;
+            this.teServices = teServices;
+
+            ShowCommit = ReactiveCommand.CreateFromTask<string>(DoShowCommit);
         }
 
         /// <inheritdoc/>
@@ -43,15 +54,20 @@ public PullRequestPageViewModel(
         /// <inheritdoc/>
         public IReadOnlyList<IViewModel> Timeline { get; private set; }
 
+        /// <inheritdoc/>
+        public ReactiveCommand<string, Unit> ShowCommit { get; }
+
         /// <inheritdoc/>
         IReadOnlyReactiveList<ICommentViewModel> ICommentThreadViewModel.Comments => throw new NotImplementedException();
 
         /// <inheritdoc/>
         public async Task InitializeAsync(
+            IRemoteRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
             ActorModel currentUser,
             PullRequestDetailModel model)
         {
-            await base.InitializeAsync(model).ConfigureAwait(true);
+            await base.InitializeAsync(repository, localRepository, model).ConfigureAwait(true);
 
             CurrentUser = new ActorViewModel(currentUser);
 
@@ -72,9 +88,11 @@ public async Task InitializeAsync(
                         commits.Add(new CommitSummaryViewModel(commit));
                         break;
                     case CommentModel comment:
-                        var vm = factory.CreateViewModel<ICommentViewModel>();
-                        await vm.InitializeAsync(this, currentUser, comment, CommentEditState.None).ConfigureAwait(true);
-                        timeline.Add(vm);
+                        {
+                            var vm = factory.CreateViewModel<ICommentViewModel>();
+                            await vm.InitializeAsync(this, currentUser, comment, CommentEditState.None).ConfigureAwait(true);
+                            timeline.Add(vm);
+                        }
                         break;
                 }
             }
@@ -101,5 +119,11 @@ Task ICommentThreadViewModel.PostComment(string body)
         {
             throw new NotImplementedException();
         }
+
+        async Task DoShowCommit(string oid)
+        {
+            await service.FetchCommit(LocalRepository, Repository, oid).ConfigureAwait(true);
+            teServices.ShowCommitDetails(oid);
+        }
     }
 }
diff --git a/src/GitHub.App/ViewModels/IssueishViewModel.cs b/src/GitHub.App/ViewModels/IssueishViewModel.cs
@@ -30,7 +30,7 @@ public IssueishViewModel()
         }
 
         /// <inheritdoc/>
-        public IRepositoryModel Repository { get; private set; }
+        public IRemoteRepositoryModel Repository { get; private set; }
 
         /// <inheritdoc/>
         public int Number { get; private set; }
@@ -66,8 +66,11 @@ public Uri WebUrl
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
 
-        protected Task InitializeAsync(IssueishDetailModel model)
+        protected Task InitializeAsync(
+            IRemoteRepositoryModel repository,
+            IssueishDetailModel model)
         {
+            Repository = repository;
             Author = new ActorViewModel(model.Author);
             Body = model.Body;
             Number = model.Number;
diff --git a/src/GitHub.App/ViewModels/PullRequestViewModelBase.cs b/src/GitHub.App/ViewModels/PullRequestViewModelBase.cs
@@ -26,6 +26,9 @@ public PullRequestViewModelBase()
         {
         }
 
+        /// <inheritdoc/>
+        public ILocalRepositoryModel LocalRepository { get; private set; }
+
         public PullRequestState State
         {
             get => state;
@@ -44,11 +47,15 @@ public string TargetBranchDisplayName
             private set => this.RaiseAndSetIfChanged(ref targetBranchDisplayName, value);
         }
 
-        protected virtual async Task InitializeAsync(PullRequestDetailModel model)
+        protected virtual async Task InitializeAsync(
+            IRemoteRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            PullRequestDetailModel model)
         {
-            await base.InitializeAsync(model).ConfigureAwait(true);
+            await base.InitializeAsync(repository, model).ConfigureAwait(true);
 
             var fork = model.BaseRepositoryOwner != model.HeadRepositoryOwner;
+            LocalRepository = localRepository;
             SourceBranchDisplayName = GetBranchDisplayName(fork, model.HeadRepositoryOwner, model.HeadRefName);
             TargetBranchDisplayName = GetBranchDisplayName(fork, model.BaseRepositoryOwner, model.BaseRefName);
         }
diff --git a/src/GitHub.Exports.Reactive/Services/IGitClient.cs b/src/GitHub.Exports.Reactive/Services/IGitClient.cs
@@ -64,6 +64,14 @@ public interface IGitClient
         /// <returns></returns>
         Task Checkout(IRepository repository, string branchName);
 
+        /// <summary>
+        /// Checks if a commit exists a the repository.
+        /// </summary>
+        /// <param name="repository">The repository.</param>
+        /// <param name="sha">The SHA of the commit.</param>
+        /// <returns></returns>
+        Task<bool> CommitExists(IRepository repository, string sha);
+
         /// <summary>
         /// Creates a new branch.
         /// </summary>
diff --git a/src/GitHub.Exports.Reactive/Services/IPullRequestService.cs b/src/GitHub.Exports.Reactive/Services/IPullRequestService.cs
@@ -69,6 +69,15 @@ IObservable<IPullRequestModel> CreatePullRequest(IModelService modelService,
         /// <returns></returns>
         IObservable<Unit> Checkout(ILocalRepositoryModel repository, PullRequestDetailModel pullRequest, string localBranchName);
 
+        /// <summary>
+        /// Checks if a commit is available and if not tries to fetch the commit.
+        /// </summary>
+        /// <param name="localRepository">The local repository.</param>
+        /// <param name="remoteRepository">The remote repository.</param>
+        /// <param name="sha">The SHA of the commit.</param>
+        /// <returns>True if the commit was found, otherwise false.</returns>
+        Task<bool> FetchCommit(ILocalRepositoryModel localRepository, IRepositoryModel remoteRepository, string sha);
+
         /// <summary>
         /// Carries out a pull on the current branch.
         /// </summary>
diff --git a/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs
@@ -1,6 +1,8 @@
 ﻿using System.Collections.Generic;
+using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Models;
+using ReactiveUI;
 
 namespace GitHub.ViewModels.Documents
 {
@@ -14,11 +16,22 @@ public interface IPullRequestPageViewModel : IPullRequestViewModelBase
         /// </summary>
         IReadOnlyList<IViewModel> Timeline { get; }
 
+        /// <summary>
+        /// Gets a command that will open a commit in Team Explorer.
+        /// </summary>
+        ReactiveCommand<string, Unit> ShowCommit { get; }
+
         /// <summary>
         /// Initializes the view model with data.
         /// </summary>
+        /// <param name="repository">The repository to which the pull request belongs.</param>
+        /// <param name="localRepository">The local repository.</param>
         /// <param name="currentUser">The currently logged in user.</param>
         /// <param name="model">The pull request model.</param>
-        Task InitializeAsync(ActorModel currentUser, PullRequestDetailModel model);
+        Task InitializeAsync(
+            IRemoteRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            ActorModel currentUser,
+            PullRequestDetailModel model);
     }
 }
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IIssueishViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/IIssueishViewModel.cs
@@ -28,7 +28,7 @@ public interface IIssueishViewModel : IViewModel
         /// <summary>
         /// Gets the repository that the issue or pull request comes from.
         /// </summary>
-        IRepositoryModel Repository { get; }
+        IRemoteRepositoryModel Repository { get; }
 
         /// <summary>
         /// Gets the issue or pull request title.
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestViewModelBase.cs b/src/GitHub.Exports.Reactive/ViewModels/IPullRequestViewModelBase.cs
@@ -7,6 +7,11 @@ namespace GitHub.ViewModels
     /// </summary>
     public interface IPullRequestViewModelBase : IIssueishViewModel
     {
+        /// <summary>
+        /// Gets the local repository.
+        /// </summary>
+        ILocalRepositoryModel LocalRepository { get; }
+
         /// <summary>
         /// Gets the pull request state.
         /// </summary>
diff --git a/src/GitHub.Exports/Models/CommitModel.cs b/src/GitHub.Exports/Models/CommitModel.cs
@@ -13,13 +13,18 @@ public class CommitModel
         public ActorModel Author { get; set; }
 
         /// <summary>
-        /// Gets the abbreviated git object ID for the commit.
+        /// Gets or sets the abbreviated git object ID for the commit.
         /// </summary>
         public string AbbreviatedOid { get; set; }
 
         /// <summary>
-        /// Gets the commit headline.
+        /// Gets or sets the commit headline.
         /// </summary>
         public string MessageHeadline { get; set; }
+
+        /// <summary>
+        /// Gets or sets the git object ID for the commit.
+        /// </summary>
+        public string Oid { get; set; }
     }
 }
diff --git a/src/GitHub.Exports/Models/PullRequestDetailModel.cs b/src/GitHub.Exports/Models/PullRequestDetailModel.cs
@@ -53,11 +53,6 @@ public class PullRequestDetailModel : IssueishDetailModel
         /// </summary>
         public IReadOnlyList<CheckSuiteModel> CheckSuites { get; set; }
 
-        /// <summary>
-        /// Gets or sets a collection of pull request commits.
-        /// </summary>
-        public IReadOnlyList<CommitModel> Commits { get; set; }
-
         /// <summary>
         /// Gets or sets a collection of pull request Statuses
         /// </summary>
diff --git a/src/GitHub.Exports/Services/ITeamExplorerServices.cs b/src/GitHub.Exports/Services/ITeamExplorerServices.cs
@@ -5,6 +5,7 @@ namespace GitHub.Services
     public interface ITeamExplorerServices : INotificationService
     {
         void ShowConnectPage();
+        void ShowCommitDetails(string oid);
         void ShowHomePage();
         void ShowPublishSection();
         void ClearNotifications();
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs
diff --git a/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml b/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public RemoteRepositoryModel(long id, string name, UriString cloneUrl, bool isPr`
`25`	`25`	`: base(name, cloneUrl)`
`26`	`26`	`{`
`27`	`27`	`Guard.ArgumentNotEmptyString(name, nameof(name));`
`28`		`- Guard.ArgumentNotNull(ownerAccount, nameof(ownerAccount));`
`29`	`28`
`30`	`29`	`Id = id;`
`31`	`30`	`OwnerAccount = ownerAccount;`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,11 @@ public Task Checkout(IRepository repository, string branchName)`
`181`	`181`	`});`
`182`	`182`	`}`
`183`	`183`
	`184`	`+ public async Task<bool> CommitExists(IRepository repository, string sha)`
	`185`	`+ {`
	`186`	`+ return await Task.Run(() => repository.Lookup<Commit>(sha) != null).ConfigureAwait(false);`
	`187`	`+ }`
	`188`	`+`
`184`	`189`	`public Task CreateBranch(IRepository repository, string branchName)`
`185`	`190`	`{`
`186`	`191`	`Guard.ArgumentNotNull(repository, nameof(repository));`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ public PullRequestViewModelBase()`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ /// <inheritdoc/>`
	`30`	`+ public ILocalRepositoryModel LocalRepository { get; private set; }`
	`31`	`+`
`29`	`32`	`public PullRequestState State`
`30`	`33`	`{`
`31`	`34`	`get => state;`
`@@ -44,11 +47,15 @@ public string TargetBranchDisplayName`
`44`	`47`	`private set => this.RaiseAndSetIfChanged(ref targetBranchDisplayName, value);`
`45`	`48`	`}`
`46`	`49`
`47`		`- protected virtual async Task InitializeAsync(PullRequestDetailModel model)`
	`50`	`+ protected virtual async Task InitializeAsync(`
	`51`	`+ IRemoteRepositoryModel repository,`
	`52`	`+ ILocalRepositoryModel localRepository,`
	`53`	`+ PullRequestDetailModel model)`
`48`	`54`	`{`
`49`		`- await base.InitializeAsync(model).ConfigureAwait(true);`
	`55`	`+ await base.InitializeAsync(repository, model).ConfigureAwait(true);`
`50`	`56`
`51`	`57`	`var fork = model.BaseRepositoryOwner != model.HeadRepositoryOwner;`
	`58`	`+ LocalRepository = localRepository;`
`52`	`59`	`SourceBranchDisplayName = GetBranchDisplayName(fork, model.HeadRepositoryOwner, model.HeadRefName);`
`53`	`60`	`TargetBranchDisplayName = GetBranchDisplayName(fork, model.BaseRepositoryOwner, model.BaseRefName);`
`54`	`61`	`}`