Merge branch 'master' into fixes/debug-files-missing

grokys · web-flow · commit 2423b1c865cc · 2017-08-25T16:57:07.000+02:00
diff --git a/script b/script
@@ -1 +1 @@
-Subproject commit 36b017ead3eceb8507340336ab5cadeee67184bf
+Subproject commit ff9ea80d8df7c33fa94966ce4c8dbbd7896b8a07
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -333,6 +333,10 @@
       <HintPath>..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NLog, Version=3.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
diff --git a/src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs
@@ -85,7 +85,8 @@ Task<byte[]> ExtractFileFromGit(
         /// <summary>
         /// Posts a new PR review comment.
         /// </summary>
-        /// <param name="repository">The repository.</param>
+        /// <param name="localRepository">The local repository.</param>
+        /// <param name="remoteRepositoryOwner">The owner of the repository fork to post to.</param>
         /// <param name="user">The user posting the comment.</param>
         /// <param name="number">The pull request number.</param>
         /// <param name="body">The comment body.</param>
@@ -94,7 +95,8 @@ Task<byte[]> ExtractFileFromGit(
         /// <param name="position">The line index in the diff to comment on.</param>
         /// <returns>A model representing the posted comment.</returns>
         Task<IPullRequestReviewCommentModel> PostReviewComment(
-            ILocalRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
             IAccount user,
             int number,
             string body,
@@ -105,14 +107,16 @@ Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// <summary>
         /// Posts a PR review comment reply.
         /// </summary>
-        /// <param name="repository">The repository.</param>
+        /// <param name="localRepository">The local repository.</param>
+        /// <param name="remoteRepositoryOwner">The owner of the repository fork to post to.</param>
         /// <param name="user">The user posting the comment.</param>
         /// <param name="number">The pull request number.</param>
         /// <param name="body">The comment body.</param>
         /// <param name="inReplyTo">The comment ID to reply to.</param>
         /// <returns>A model representing the posted comment.</returns>
         Task<IPullRequestReviewCommentModel> PostReviewComment(
-            ILocalRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
             IAccount user,
             int number,
             string body,
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSession.cs b/src/GitHub.InlineReviews/Services/PullRequestSession.cs
@@ -121,6 +121,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(string body,
         {
             var model = await service.PostReviewComment(
                 LocalRepository,
+                RepositoryOwner,
                 User,
                 PullRequest.Number,
                 body,
@@ -136,6 +137,7 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(string body,
         {
             var model = await service.PostReviewComment(
                 LocalRepository,
+                RepositoryOwner,
                 User,
                 PullRequest.Number,
                 body,
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -9,6 +9,7 @@
 using GitHub.Primitives;
 using GitHub.Services;
 using LibGit2Sharp;
+using NLog;
 
 namespace GitHub.InlineReviews.Services
 {
@@ -137,20 +138,21 @@ public async Task<string> GetPullRequestMergeBase(ILocalRepositoryModel reposito
 
         /// <inheritdoc/>
         public async Task<IPullRequestReviewCommentModel> PostReviewComment(
-            ILocalRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
             IAccount user,
             int number,
             string body,
             string commitId,
             string path,
             int position)
         {
-            var address = HostAddress.Create(repository.CloneUrl.Host);
+            var address = HostAddress.Create(localRepository.CloneUrl.Host);
             var apiClient = await apiClientFactory.Create(address);
 
             var result = await apiClient.CreatePullRequestReviewComment(
-                repository.Owner,
-                repository.Name,
+                remoteRepositoryOwner,
+                localRepository.Name,
                 number,
                 body,
                 commitId,
@@ -176,18 +178,19 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
 
         /// <inheritdoc/>
         public async Task<IPullRequestReviewCommentModel> PostReviewComment(
-            ILocalRepositoryModel repository,
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
             IAccount user,
             int number,
             string body,
             int inReplyTo)
         {
-            var address = HostAddress.Create(repository.CloneUrl.Host);
+            var address = HostAddress.Create(localRepository.CloneUrl.Host);
             var apiClient = await apiClientFactory.Create(address);
 
             var result = await apiClient.CreatePullRequestReviewComment(
-                repository.Owner,
-                repository.Name,
+                remoteRepositoryOwner,
+                localRepository.Name,
                 number,
                 body,
                 inReplyTo);
diff --git a/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs b/src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs
@@ -7,6 +7,7 @@
 using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.UI;
+using NLog;
 using Octokit;
 using ReactiveUI;
 
@@ -17,6 +18,7 @@ namespace GitHub.InlineReviews.ViewModels
     /// </summary>
     public class CommentViewModel : ReactiveObject, ICommentViewModel
     {
+        static readonly Logger log = LogManager.GetCurrentClassLogger();
         string body;
         string errorMessage;
         bool isReadOnly;
@@ -167,6 +169,7 @@ async Task DoCommitEdit(object unused)
                 }
 
                 ErrorMessage = message;
+                log.Error("Error posting inline comment.", e);
             }
         }
 
diff --git a/src/GitHub.InlineReviews/packages.config b/src/GitHub.InlineReviews/packages.config
@@ -30,6 +30,7 @@
   <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
   <package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
+  <package id="NLog" version="3.1.0.0" targetFramework="net461" />
   <package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
   <package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />
   <package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net461" />
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -11,7 +11,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <ApplicationVersion>2.3.0.24</ApplicationVersion>
+    <ApplicationVersion>2.3.0.26</ApplicationVersion>
     <OutputPath>..\..\build\$(Configuration)\</OutputPath>
     <VsixType>v3</VsixType>
     <IsProductComponent>false</IsProductComponent>
diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.3.0.24" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.3.0.26" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>
diff --git a/src/MsiInstaller/Version.wxi b/src/MsiInstaller/Version.wxi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define VersionNumber="2.3.0.24" ?>
+  <?define VersionNumber="2.3.0.26" ?>
 </Include>
diff --git a/src/common/SolutionInfo.cs b/src/common/SolutionInfo.cs
@@ -3,8 +3,8 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("GitHub Extension for Visual Studio")]
-[assembly: AssemblyVersion("2.3.0.24")]
-[assembly: AssemblyFileVersion("2.3.0.24")]
+[assembly: AssemblyVersion("2.3.0.26")]
+[assembly: AssemblyFileVersion("2.3.0.26")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyCompany("GitHub, Inc.")]
 [assembly: AssemblyCopyright("Copyright � GitHub, Inc. 2014-2016")]
@@ -16,6 +16,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.3.0.24";
+        internal const string Version = "2.3.0.26";
     }
 }
diff --git a/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionTests.cs b/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionTests.cs
@@ -6,6 +6,7 @@
 using GitHub.InlineReviews.Services;
 using GitHub.InlineReviews.UnitTests.TestDoubles;
 using GitHub.Models;
+using GitHub.Primitives;
 using LibGit2Sharp;
 using NSubstitute;
 using Xunit;
@@ -511,6 +512,42 @@ Line 3 with comment
 
         public class ThePostReviewCommentMethod
         {
+            [Fact]
+            public async Task PostsToCorrectFork()
+            {
+                var service = Substitute.For<IPullRequestSessionService>();
+                var target = CreateTarget(service, "fork", "owner");
+
+                await target.PostReviewComment("New Comment", "COMMIT_ID", "file.cs", 1);
+
+                await service.Received(1).PostReviewComment(
+                    Arg.Any<ILocalRepositoryModel>(),
+                    "owner",
+                    Arg.Any<IAccount>(),
+                    PullRequestNumber,
+                    "New Comment",
+                    "COMMIT_ID",
+                    "file.cs",
+                    1);
+            }
+
+            [Fact]
+            public async Task PostsReplyToCorrectFork()
+            {
+                var service = Substitute.For<IPullRequestSessionService>();
+                var target = CreateTarget(service, "fork", "owner");
+
+                await target.PostReviewComment("New Comment", 1);
+
+                await service.Received(1).PostReviewComment(
+                    Arg.Any<ILocalRepositoryModel>(),
+                    "owner",
+                    Arg.Any<IAccount>(),
+                    PullRequestNumber,
+                    "New Comment",
+                    1);
+            }
+
             [Fact]
             public async Task UpdatesFileWithNewThread()
             {
@@ -529,6 +566,26 @@ public async Task UpdatesFileWithNewThread()
                 }
             }
 
+            PullRequestSession CreateTarget(
+                IPullRequestSessionService service,
+                string localRepositoryOwner,
+                string remoteRepositoryOwner)
+            {
+                var repository = Substitute.For<ILocalRepositoryModel>();
+
+                repository.CloneUrl.Returns(new UriString($"https://github.com/{localRepositoryOwner}/reop"));
+                repository.Owner.Returns(localRepositoryOwner);
+                repository.Name.Returns("repo");
+
+                return new PullRequestSession(
+                    service,
+                    Substitute.For<IAccount>(),
+                    CreatePullRequest(),
+                    repository,
+                    remoteRepositoryOwner,
+                    true);
+            }
+
             async Task<PullRequestSession> CreateTarget(FakeDiffService diffService)
             {
                 var baseContents = @"Line 1
@@ -652,10 +709,10 @@ static IPullRequestSessionService CreateService(FakeDiffService diffService)
             result.GetTipSha(Arg.Any<ILocalRepositoryModel>()).Returns("BRANCH_TIP");
 
             var diffChunk = "@@ -1,4 +1,4 @@";
-            result.PostReviewComment(null, null, 0, null, 0).ReturnsForAnyArgs(i =>
-                CreateComment(diffChunk, i.ArgAt<string>(3)));
-            result.PostReviewComment(null, null, 0, null, null, null, 0).ReturnsForAnyArgs(i =>
-                CreateComment(diffChunk, i.ArgAt<string>(3)));
+            result.PostReviewComment(null, null, null, 0, null, 0).ReturnsForAnyArgs(i =>
+                CreateComment(diffChunk, i.ArgAt<string>(4)));
+            result.PostReviewComment(null, null, null, 0, null, null, null, 0).ReturnsForAnyArgs(i =>
+                CreateComment(diffChunk, i.ArgAt<string>(4)));
             return result;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using GitHub.Extensions;`
`8`	`8`	`using GitHub.Models;`
`9`	`9`	`using GitHub.UI;`
	`10`	`+using NLog;`
`10`	`11`	`using Octokit;`
`11`	`12`	`using ReactiveUI;`
`12`	`13`
`@@ -17,6 +18,7 @@ namespace GitHub.InlineReviews.ViewModels`
`17`	`18`	`/// </summary>`
`18`	`19`	`public class CommentViewModel : ReactiveObject, ICommentViewModel`
`19`	`20`	`{`
	`21`	`+ static readonly Logger log = LogManager.GetCurrentClassLogger();`
`20`	`22`	`string body;`
`21`	`23`	`string errorMessage;`
`22`	`24`	`bool isReadOnly;`
`@@ -167,6 +169,7 @@ async Task DoCommitEdit(object unused)`
`167`	`169`	`}`
`168`	`170`
`169`	`171`	`ErrorMessage = message;`
	`172`	`+ log.Error("Error posting inline comment.", e);`
`170`	`173`	`}`
`171`	`174`	`}`
`172`	`175`