Merge branch 'master' into fixes/1154-fix-links-in-inline-comments

Author: grokys

src/GitHub.App/Services/GitClient.cs

@@ -424,16 +424,7 @@ public Task<bool> IsHeadPushed(IRepository repo)
 
             return Task.Factory.StartNew(() =>
             {
-                if (repo.Head.IsTracking)
-                {
-                    var trackedBranchTip = repo.Head.TrackedBranch.Tip;
-                    if (trackedBranchTip != null)
-                    {
-                        return repo.Head.Tip.Sha == trackedBranchTip.Sha;
-                    }
-                }
-
-                return false;
+                return repo.Head.TrackingDetails.AheadBy == 0;
             });
         }
 

src/GitHub.App/Services/PullRequestService.cs

@@ -328,12 +328,14 @@ public IObservable<string> ExtractFile(
             });
         }
 
-        public Encoding GetEncoding(string path)
+        public Encoding GetEncoding(ILocalRepositoryModel repository, string relativePath)
         {
-            if (File.Exists(path))
+            var fullPath = Path.Combine(repository.LocalPath, relativePath);
+
+            if (File.Exists(fullPath))
             {
                 var encoding = Encoding.UTF8;
-                if (HasPreamble(path, encoding))
+                if (HasPreamble(fullPath, encoding))
                 {
                     return encoding;
                 }

src/GitHub.App/ViewModels/PullRequestDetailViewModel.cs

@@ -478,9 +478,9 @@ public async Task Load(IRemoteRepositoryModel remoteRepository, IPullRequestMode
         /// <returns>The path to a temporary file.</returns>
         public Task<string> ExtractFile(IPullRequestFileNode file, bool head)
         {
-            var path = Path.Combine(file.DirectoryPath, file.FileName);
-            var encoding = pullRequestsService.GetEncoding(path);
-            return pullRequestsService.ExtractFile(LocalRepository, model, path, head, encoding).ToTask();
+            var relativePath = Path.Combine(file.DirectoryPath, file.FileName);
+            var encoding = pullRequestsService.GetEncoding(LocalRepository, relativePath);
+            return pullRequestsService.ExtractFile(LocalRepository, model, relativePath, head, encoding).ToTask();
         }
 
         /// <summary>

src/GitHub.Exports.Reactive/Services/IPullRequestService.cs

@@ -124,9 +124,12 @@ IObservable<IPullRequestModel> CreatePullRequest(IRepositoryHost host,
         /// <summary>
         /// Gets the encoding for the specified file.
         /// </summary>
-        /// <param name="path">The path to the file.</param>
-        /// <returns>The file's encoding</returns>
-        Encoding GetEncoding(string path);
+        /// <param name="repository">The repository.</param>
+        /// <param name="relativePath">The relative path to the file in the repository.</param>
+        /// <returns>
+        /// The file's encoding or <see cref="Encoding.Default"/> if the file doesn't exist.
+        /// </returns>
+        Encoding GetEncoding(ILocalRepositoryModel repository, string relativePath);
 
         /// <summary>
         /// Gets a file as it appears in a pull request.

src/UnitTests/GitHub.App/Services/GitClientTests.cs

@@ -14,46 +14,29 @@ public class GitClientTests
     public class TheIsHeadPushedMethod : TestBaseClass
     {
         [Theory]
-        [InlineData(true, "sha", "sha", true)]
-        [InlineData(true, "xxx", "yyy", false)]
-        [InlineData(true, "headSha", null, false)]
-        [InlineData(false, "sha", "sha", false)]
-        public async Task IsHeadPushed(bool istracking, string headSha, string trackedBranchSha, bool expectHeadPushed)
+        [InlineData(0, true)]
+        [InlineData(2, false)]
+        [InlineData(null, false)]
+        public async Task IsHeadPushed(int? aheadBy, bool expected)
         {
             var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
-            var repository = MockTrackedBranchRepository(istracking, headSha, trackedBranchSha);
+            var repository = MockTrackedBranchRepository(aheadBy);
 
             var isHeadPushed = await gitClient.IsHeadPushed(repository);
 
-            Assert.Equal(expectHeadPushed, isHeadPushed);
+            Assert.Equal(expected, isHeadPushed);
         }
 
-        static IRepository MockTrackedBranchRepository(bool isTracking, string headSha, string trackedBranchSha)
+        static IRepository MockTrackedBranchRepository(int? aheadBy)
         {
-            var trackedBranch = Substitute.For<Branch>();
-            var trackedBranchTip = MockCommitOrNull(trackedBranchSha);
-            trackedBranch.Tip.Returns(trackedBranchTip);
             var headBranch = Substitute.For<Branch>();
-            var headTip = MockCommitOrNull(headSha);
-            headBranch.Tip.Returns(headTip);
-            headBranch.IsTracking.Returns(isTracking);
-            headBranch.TrackedBranch.Returns(trackedBranch);
+            var trackingDetails = Substitute.For<BranchTrackingDetails>();
+            trackingDetails.AheadBy.Returns(aheadBy);
+            headBranch.TrackingDetails.Returns(trackingDetails);
             var repository = Substitute.For<IRepository>();
             repository.Head.Returns(headBranch);
             return repository;
         }
-
-        static Commit MockCommitOrNull(string sha)
-        {
-            if (sha != null)
-            {
-                var commit = Substitute.For<Commit>();
-                commit.Sha.Returns(sha);
-                return commit;
-            }
-
-            return null;
-        }
     }
 
     public class ThePushMethod : TestBaseClass