Merge remote-tracking branch 'origin/master' into features/check-suites

# Conflicts:
#	src/GitHub.App/Services/PullRequestService.cs
#	src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs
#	src/GitHub.Exports/Models/PullRequestDetailModel.cs
#	src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
#	test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs

Author: StanleyGoldman

CONTRIBUTING.md

@@ -13,16 +13,16 @@ This project adheres to the [Open Code of Conduct][code-of-conduct]. By particip
 
 ## Submitting a pull request
 
-0. [Fork][] and clone the repository (see Build Instructions in the [README][readme])
-0. Create a new branch: `git checkout -b my-branch-name`
-0. Make your change, add tests, and make sure the tests still pass
-0. Push to your fork and [submit a pull request][pr]
-0. Pat your self on the back and wait for your pull request to be reviewed and merged.
+1. [Fork][] and clone the repository (see Build Instructions in the [README][readme])
+2. Create a new branch: `git checkout -b my-branch-name`
+3. Make your change, add tests, and make sure the tests still pass
+4. Push to your fork and [submit a pull request][pr]
+5. Pat your self on the back and wait for your pull request to be reviewed and merged.
 
 Here are a few things you can do that will increase the likelihood of your pull request being accepted:
 
-- Follow the existing code's style.
-- Write tests.
+- Follow the style/format of the existing code.
+- Write tests for your changes.
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
@@ -38,7 +38,7 @@ There are certain areas of the extension that are restricted in what they can do
 ### Bug Reporting
 
 Here are a few helpful tips when reporting a bug:
-- Verify the bug resides in the GitHub for Visual Studio extension
+- Verify that the bug resides in the GitHub for Visual Studio extension
   - A lot of functionality provided by this extension resides in the Team Explorer pane, alongside other non-GitHub tools to manage and collaborate on source code, including Visual Studio's Git support, which is owned by Microsoft.
   - If this bug not is related to the GitHub extension, visit the [Visual Studio support page](https://www.visualstudio.com/support/support-overview-vs) for help
 - Screenshots are very helpful in diagnosing bugs and understanding the state of the extension when it's experiencing problems. Please include them whenever possible.

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.5.4.{build}'
+version: '2.5.5.{build}'
 skip_tags: true
 install:
 - ps: |

docs/developer/how-viewmodels-are-turned-into-views.md

@@ -65,8 +65,8 @@ This is the basis for converting view models to views.
 
 There are currently two top-level controls for our UI:
 
-- [GitHubDialogWindow](../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
-- [GitHubPaneView](../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
+- [GitHubDialogWindow](../../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
+- [GitHubPaneView](../../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
 
 In the resources for each of these top-level controls we define a `DataTemplate` like so:
 
@@ -77,10 +77,10 @@ In the resources for each of these top-level controls we define a `DataTemplate`
 </DataTemplate>
 ```
 
-The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
+The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
 
-The [`ViewLocator`](../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
+The [`ViewLocator`](../../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
 
 And thus a view model becomes a view.
 
-[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.
+[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.

src/GitHub.App/GitHub.App.csproj

@@ -197,6 +197,7 @@
       <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -258,6 +259,7 @@
     <Compile Include="ViewModels\GitHubPane\LoggedOutViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\NavigationViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\GitHubPaneViewModel.cs" />
+    <Compile Include="SampleData\PullRequestCheckViewModelDesigner.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestFilesViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestListItemViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\PullRequestListViewModel.cs" />

src/GitHub.App/Models/PullRequestModel.cs

@@ -3,6 +3,7 @@
 using GitHub.Primitives;
 using GitHub.VisualStudio.Helpers;
 using System.Diagnostics;
+using System.Collections.Generic;
 using GitHub.Extensions;
 
 namespace GitHub.Models
@@ -124,17 +125,6 @@ public PullRequestStateEnum State
             }
         }
 
-        PullRequestChecksEnum checks;
-        public PullRequestChecksEnum Checks
-        {
-            get { return checks; }
-            set
-            {
-                checks = value;
-                this.RaisePropertyChange();
-            }
-        }
-
         // TODO: Remove these property once maintainer workflow has been merged to master.
         public bool IsOpen => State == PullRequestStateEnum.Open;
         public bool Merged => State == PullRequestStateEnum.Merged;
@@ -193,4 +183,4 @@ internal string DebuggerDisplay
             }
         }
     }
-}
+}

src/GitHub.App/Resources.Designer.cs

@@ -321,4 +321,10 @@ https://git-scm.com/download/win</value>
   <data name="SwitchOriginTitle" xml:space="preserve">
     <value>Switch Origin</value>
   </data>
+  <data name="CancelPendingReviewConfirmation" xml:space="preserve">
+    <value>Are you sure you want to cancel this review? You will lose all your pending comments.</value>
+  </data>
+  <data name="CancelPendingReviewConfirmationCaption" xml:space="preserve">
+    <value>Cancel Review</value>
+  </data>
 </root>

src/GitHub.App/Resources.resx

@@ -0,0 +1,25 @@
+using System;
+using System.Windows.Media.Imaging;
+using GitHub.ViewModels;
+using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
+
+namespace GitHub.SampleData
+{
+    public sealed class PullRequestCheckViewModelDesigner : ViewModelBase, IPullRequestCheckViewModel
+    {
+        public string Title { get; set; } = "continuous-integration/appveyor/pr";
+
+        public string Description { get; set; } = "AppVeyor build failed";
+
+        public PullRequestCheckStatus Status { get; set; } = PullRequestCheckStatus.Failure;
+
+        public Uri DetailsUrl { get; set; } = new Uri("http://github.com");
+
+        public string AvatarUrl { get; set; } = "https://avatars1.githubusercontent.com/u/417571?s=88&v=4";
+
+        public BitmapImage Avatar { get; set; } = null;
+
+        public ReactiveCommand<object> OpenDetailsUrl { get; set; } = null;
+    }
+}

src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs

@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Text;
-using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Services;
 using GitHub.ViewModels;
 using GitHub.ViewModels.GitHubPane;
 using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive;
+using System.Threading.Tasks;
+using GitHub.SampleData;
 
 namespace GitHub.SampleData
 {
@@ -96,35 +96,7 @@ public PullRequestDetailViewModelDesigner()
 
             Files = new PullRequestFilesViewModelDesigner();
 
-            var defaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
-
-            Checks = new[]
-            {
-                new PullRequestCheckViewModel
-                {
-                    Title = "continuous-integration/appveyor/branch",
-                    Description = "AppVeyor build succeeded",
-                    Status = PullRequestCheckStatusEnum.Success,
-                    AvatarUrl = defaultAvatar,
-                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
-                },
-                new PullRequestCheckViewModel
-                {
-                    Title = "continuous-integration/appveyor/pr",
-                    Description = "AppVeyor building",
-                    Status = PullRequestCheckStatusEnum.Pending,
-                    AvatarUrl = defaultAvatar,
-                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
-                },
-                new PullRequestCheckViewModel
-                {
-                    Title = "continuous-integration/appveyor/other",
-                    Description = "AppVeyor build failed",
-                    Status = PullRequestCheckStatusEnum.Failure,
-                    AvatarUrl = defaultAvatar,
-                    Avatar = AvatarProvider.CreateBitmapImage(defaultAvatar),
-                },
-            };
+            Checks = new PullRequestCheckViewModelDesigner[0];
         }
 
         public PullRequestDetailModel Model { get; }

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -17,6 +17,6 @@ public class PullRequestListItemViewModelDesigner : ViewModelBase, IPullRequestL
         public int Number { get; set; }
         public string Title { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
-        public PullRequestChecksEnum Checks { get; set; }
+        public PullRequestChecksState Checks { get; set; }
     }
 }

src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs

@@ -58,6 +58,8 @@ public class GitHubContextService : IGitHubContextService
         static readonly Regex treeishCommitRegex = new Regex($"(?<commit>[a-z0-9]{{40}})(/(?<tree>.+))?", RegexOptions.Compiled);
         static readonly Regex treeishBranchRegex = new Regex($"(?<branch>master)(/(?<tree>.+))?", RegexOptions.Compiled);
 
+        static readonly Regex tempFileObjectishRegex = new Regex(@"\\TFSTemp\\[^\\]*[.](?<objectish>[a-z0-9]{8})[.][^.\\]*$", RegexOptions.Compiled);
+
         [ImportingConstructor]
         public GitHubContextService(IGitHubServiceProvider serviceProvider, IGitService gitService)
         {
@@ -305,6 +307,55 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)
             }
         }
 
+        /// <inheritdoc/>
+        public string FindObjectishForTFSTempFile(string tempFile)
+        {
+            var match = tempFileObjectishRegex.Match(tempFile);
+            if (match.Success)
+            {
+                return match.Groups["objectish"].Value;
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public (string commitSha, string blobPath) ResolveBlobFromHistory(string repositoryDir, string objectish)
+        {
+            using (var repo = gitService.GetRepository(repositoryDir))
+            {
+                var blob = repo.Lookup<Blob>(objectish);
+                if (blob == null)
+                {
+                    return (null, null);
+                }
+
+                foreach (var commit in repo.Commits)
+                {
+                    var trees = new Stack<Tree>();
+                    trees.Push(commit.Tree);
+
+                    while (trees.Count > 0)
+                    {
+                        foreach (var treeEntry in trees.Pop())
+                        {
+                            if (treeEntry.Target == blob)
+                            {
+                                return (commit.Sha, treeEntry.Path);
+                            }
+
+                            if (treeEntry.TargetType == TreeEntryTargetType.Tree)
+                            {
+                                trees.Push((Tree)treeEntry.Target);
+                            }
+                        }
+                    }
+                }
+
+                return (null, null);
+            }
+        }
+
         /// <inheritdoc/>
         public bool HasChangesInWorkingDirectory(string repositoryDir, string commitish, string path)
         {

src/GitHub.App/Services/GitHubContextService.cs

@@ -440,7 +440,6 @@ IPullRequestModel Create(PullRequestCacheItem prCacheItem)
                 CommitCount = prCacheItem.CommitCount,
                 CreatedAt = prCacheItem.CreatedAt,
                 Head = Create(prCacheItem.Head),
-                Checks = prCacheItem.Checks ?? PullRequestChecksEnum.None,
                 State = prCacheItem.State.HasValue ?
                     prCacheItem.State.Value :
                     prCacheItem.IsOpen.Value ? PullRequestStateEnum.Open : PullRequestStateEnum.Closed,
@@ -578,7 +577,6 @@ public PullRequestCacheItem(PullRequest pr)
 
             // Nullable for compatibility with old caches.
             public PullRequestStateEnum? State { get; set; }
-            public PullRequestChecksEnum? Checks { get; set; }
 
             // This fields exists only for compatibility with old caches. The State property should be used.
             public bool? IsOpen { get; set; }