Display commit count.

github · StanleyGoldman · Feb 21, 2019 · Oct 26, 2018 · Oct 26, 2018 · Oct 26, 2018
commit 996aac3a639630843ffff63dd70ac3d5f1a50ba9
diff --git a/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs b/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs
@@ -90,6 +90,7 @@ Depends on #1993
         public string SourceBranchDisplayName { get; set; } = "feature/save-drafts";
         public string TargetBranchDisplayName { get; set; } = "master";
         public IActorViewModel Author { get; set; } = new ActorViewModelDesigner("grokys");
+        public int CommitCount { get; set; } = 2;
         public string Body { get; set; }
         public int Number { get; set; } = 1994;
         public ILocalRepositoryModel LocalRepository { get; }

diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs
@@ -53,6 +53,9 @@ public PullRequestPageViewModel(
         /// <inheritdoc/>
         public IActorViewModel CurrentUser { get; private set; }
 
+        /// <inheritdoc/>
+        public int CommitCount { get; private set; }
+
         /// <inheritdoc/>
         public IReadOnlyList<IViewModel> Timeline => timeline;
 
@@ -68,6 +71,7 @@ public async Task InitializeAsync(
         {
             await base.InitializeAsync(repository, localRepository, model).ConfigureAwait(true);
 
+            CommitCount = 0;
             currentUserModel = currentUser;
             CurrentUser = new ActorViewModel(currentUser);
             timeline = new ReactiveList<IViewModel>();
@@ -86,6 +90,7 @@ public async Task InitializeAsync(
                 {
                     case CommitModel commit:
                         commits.Add(new CommitSummaryViewModel(commit));
+                        ++CommitCount;
                         break;
                     case CommentModel comment:
                         await AddComment(comment).ConfigureAwait(true);

diff --git a/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs
@@ -11,6 +11,11 @@ namespace GitHub.ViewModels.Documents
     /// </summary>
     public interface IPullRequestPageViewModel : IPullRequestViewModelBase
     {
+        /// <summary>
+        /// Gets the number of commits in the pull request.
+        /// </summary>
+        int CommitCount { get; }
+
         /// <summary>
         /// Gets the pull request's timeline.
         /// </summary>

diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs
diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx
@@ -860,4 +860,7 @@ https://git-scm.com/download/win</value>
   <data name="ReopenPullRequest" xml:space="preserve">
     <value>Reopen pull request</value>
   </data>
+  <data name="CommitCountFormat" xml:space="preserve">
+    <value>{0} commits</value>
+  </data>
 </root>
diff --git a/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml b/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml
@@ -56,7 +56,7 @@
                     </InlineUIContainer>
                     <TextBlock FontWeight="Bold" Text="{Binding Author.Login, Mode=OneWay}"/>
                     wants to merge
-                    <TextBlock FontWeight="Black" Text="{Binding Commits.Count, Mode=OneWay, StringFormat={}{0} commits}"/>
+                    <TextBlock FontWeight="Bold" Text="{Binding CommitCount, Mode=OneWay, StringFormat={x:Static ghfvs:Resources.CommitCountFormat}}"/>
                     into
                     <InlineUIContainer BaselineAlignment="Bottom">
                         <Border CornerRadius="2" Padding="5 0" Background="{DynamicResource GitHubBranchNameBackgroundBrush}">