Change ResolveBlob to resolve remote refs

jcansdale · jcansdale · commit ab3e7e9035f2 · 2018-07-09T18:52:12.000+01:00
We need to find the same blob as on GitHub.
diff --git a/src/GitHub.App/Services/GitHubContextService.cs b/src/GitHub.App/Services/GitHubContextService.cs
@@ -249,7 +249,7 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)
             return true;
         }
 
-        public (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context)
+        public (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context, string remoteName = "origin")
         {
             Guard.ArgumentNotNull(repositoryDir, nameof(repositoryDir));
             Guard.ArgumentNotNull(context, nameof(context));
@@ -269,29 +269,31 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)
                 }
 
                 var objectishPath = $"{context.TreeishPath}/{context.BlobName}";
-                foreach (var (commitish, path) in ToObjectish(objectishPath))
+                var objectish = ToObjectish(objectishPath);
+                var (commitSha, pathSha) = objectish.First();
+                if (ObjectId.TryParse(commitSha, out ObjectId objectId) && repository.Lookup(objectId) != null)
                 {
-                    bool isSha;
-                    if (ObjectId.TryParse(commitish, out ObjectId objectId) && repository.Lookup(objectId) != null)
+                    if (repository.Lookup($"{commitSha}:{pathSha}") != null)
                     {
-                        isSha = true;
+                        return (commitSha, pathSha, true);
                     }
-                    else if (repository.Lookup(commitish) != null)
-                    {
-                        isSha = false;
-                    }
-                    else
+                }
+
+                foreach (var (commitish, path) in objectish)
+                {
+                    var remoteRef = $"refs/remotes/{remoteName}/{commitish}";
+                    if (repository.Lookup(remoteRef) == null)
                     {
                         continue;
                     }
 
-                    if (repository.Lookup($"{commitish}:{path}") == null)
+                    if (repository.Lookup($"{remoteRef}:{path}") == null)
                     {
                         // Resolved commitish but not path
-                        return (commitish, null, isSha);
+                        return (remoteRef, null, false);
                     }
 
-                    return (commitish, path, isSha);
+                    return (remoteRef, path, false);
                 }
 
                 return (null, null, false);
diff --git a/src/GitHub.Exports/Services/IGitHubContextService.cs b/src/GitHub.Exports/Services/IGitHubContextService.cs
@@ -14,7 +14,7 @@ public interface IGitHubContextService
         Uri ToRepositoryUrl(GitHubContext context);
         bool TryOpenFile(string repositoryDir, GitHubContext context);
         Task<bool> TryAnnotateFile(string repositoryDir, string currentBranch, GitHubContext context);
-        (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context);
+        (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context, string remoteName = "origin");
         bool HasChangesInWorkingDirectory(string repositoryDir, string commitish, string path);
     }
 }
diff --git a/test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs b/test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs
@@ -325,12 +325,12 @@ public void RepositoryHome(string windowTitle, string expectOwner, string expect
 
     public class TheResolveBlobMethod
     {
-        [TestCase("https://github.com/github/VisualStudio/blob/master/foo.cs", "master", "master:foo.cs", "master", "foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/master/src/foo.cs", "master", "master:src/foo.cs", "master", "src/foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/branch-name/src/foo.cs", "branch-name", "branch-name:src/foo.cs", "branch-name", "src/foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/fixes/666-bug/src/foo.cs", "fixes/666-bug", "fixes/666-bug:src/foo.cs", "fixes/666-bug", "src/foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/fixes/666-bug/A/B/foo.cs", "fixes/666-bug", "fixes/666-bug:A/B/foo.cs", "fixes/666-bug", "A/B/foo.cs")]
-        [TestCase("https://github.com/github/VisualStudio/blob/master/foo.cs", "master", null, "master", null, Description = "Resolve commit only")]
+        [TestCase("https://github.com/github/VisualStudio/blob/master/foo.cs", "refs/remotes/origin/master", "refs/remotes/origin/master:foo.cs", "refs/remotes/origin/master", "foo.cs")]
+        [TestCase("https://github.com/github/VisualStudio/blob/master/src/foo.cs", "refs/remotes/origin/master", "refs/remotes/origin/master:src/foo.cs", "refs/remotes/origin/master", "src/foo.cs")]
+        [TestCase("https://github.com/github/VisualStudio/blob/branch-name/src/foo.cs", "refs/remotes/origin/branch-name", "refs/remotes/origin/branch-name:src/foo.cs", "refs/remotes/origin/branch-name", "src/foo.cs")]
+        [TestCase("https://github.com/github/VisualStudio/blob/fixes/666-bug/src/foo.cs", "refs/remotes/origin/fixes/666-bug", "refs/remotes/origin/fixes/666-bug:src/foo.cs", "refs/remotes/origin/fixes/666-bug", "src/foo.cs")]
+        [TestCase("https://github.com/github/VisualStudio/blob/fixes/666-bug/A/B/foo.cs", "refs/remotes/origin/fixes/666-bug", "refs/remotes/origin/fixes/666-bug:A/B/foo.cs", "refs/remotes/origin/fixes/666-bug", "A/B/foo.cs")]
+        [TestCase("https://github.com/github/VisualStudio/blob/master/foo.cs", "refs/remotes/origin/master", null, "refs/remotes/origin/master", null, Description = "Resolve commit only")]
         [TestCase("https://github.com/github/VisualStudio/blob/36d6b0bb6e319337180d523281c42d9611744e66/src/code.cs", "36d6b0bb6e319337180d523281c42d9611744e66", "36d6b0bb6e319337180d523281c42d9611744e66:src/code.cs", "36d6b0bb6e319337180d523281c42d9611744e66", "src/code.cs", true, Description = "Resolve commit only")]
         [TestCase("https://github.com/github/VisualStudio/commit/8cf9a268c497adb4fc0a14572253165e179dd11e", "8cf9a268c497adb4fc0a14572253165e179dd11e", null, null, null)]
         public void ResolveBlob(string url, string commitish, string objectish, string expectCommitish, string expectPath, bool expectIsSha = false)

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)`
`249`	`249`	`return true;`
`250`	`250`	`}`
`251`	`251`
`252`		`- public (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context)`
	`252`	`+ public (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context, string remoteName = "origin")`
`253`	`253`	`{`
`254`	`254`	`Guard.ArgumentNotNull(repositoryDir, nameof(repositoryDir));`
`255`	`255`	`Guard.ArgumentNotNull(context, nameof(context));`
`@@ -269,29 +269,31 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`var objectishPath = $"{context.TreeishPath}/{context.BlobName}";`
`272`		`- foreach (var (commitish, path) in ToObjectish(objectishPath))`
	`272`	`+ var objectish = ToObjectish(objectishPath);`
	`273`	`+ var (commitSha, pathSha) = objectish.First();`
	`274`	`+ if (ObjectId.TryParse(commitSha, out ObjectId objectId) && repository.Lookup(objectId) != null)`
`273`	`275`	`{`
`274`		`- bool isSha;`
`275`		`- if (ObjectId.TryParse(commitish, out ObjectId objectId) && repository.Lookup(objectId) != null)`
	`276`	`+ if (repository.Lookup($"{commitSha}:{pathSha}") != null)`
`276`	`277`	`{`
`277`		`- isSha = true;`
	`278`	`+ return (commitSha, pathSha, true);`
`278`	`279`	`}`
`279`		`- else if (repository.Lookup(commitish) != null)`
`280`		`- {`
`281`		`- isSha = false;`
`282`		`- }`
`283`		`- else`
	`280`	`+ }`
	`281`	`+`
	`282`	`+ foreach (var (commitish, path) in objectish)`
	`283`	`+ {`
	`284`	`+ var remoteRef = $"refs/remotes/{remoteName}/{commitish}";`
	`285`	`+ if (repository.Lookup(remoteRef) == null)`
`284`	`286`	`{`
`285`	`287`	`continue;`
`286`	`288`	`}`
`287`	`289`
`288`		`- if (repository.Lookup($"{commitish}:{path}") == null)`
	`290`	`+ if (repository.Lookup($"{remoteRef}:{path}") == null)`
`289`	`291`	`{`
`290`	`292`	`// Resolved commitish but not path`
`291`		`- return (commitish, null, isSha);`
	`293`	`+ return (remoteRef, null, false);`
`292`	`294`	`}`
`293`	`295`
`294`		`- return (commitish, path, isSha);`
	`296`	`+ return (remoteRef, path, false);`
`295`	`297`	`}`
`296`	`298`
`297`	`299`	`return (null, null, false);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public interface IGitHubContextService`
`14`	`14`	`Uri ToRepositoryUrl(GitHubContext context);`
`15`	`15`	`bool TryOpenFile(string repositoryDir, GitHubContext context);`
`16`	`16`	`Task<bool> TryAnnotateFile(string repositoryDir, string currentBranch, GitHubContext context);`
`17`		`- (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context);`
	`17`	`+ (string commitish, string path, bool isSha) ResolveBlob(string repositoryDir, GitHubContext context, string remoteName = "origin");`
`18`	`18`	`bool HasChangesInWorkingDirectory(string repositoryDir, string commitish, string path);`
`19`	`19`	`}`
`20`	`20`	`}`