Being able to navigate to a PR page of an AppVeyor build

gitextensions · Mar 4, 2019 · 5cf47f0 · 5cf47f0
1 parent f63c836
commit 5cf47f0
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 2 deletions.
diff --git a/GitUI/GitUI.csproj b/GitUI/GitUI.csproj
@@ -1844,6 +1844,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Icons\DocumentTree.png" />
+    <None Include="Resources\Icons\pullRequest.png" />
     <Content Include="Translation\Czech.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/GitUI/Properties/Images.Designer.cs b/GitUI/Properties/Images.Designer.cs
diff --git a/GitUI/Properties/Images.resx b/GitUI/Properties/Images.resx
@@ -799,4 +799,7 @@
   <data name="DocumentTree" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Icons\DocumentTree.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="PullRequest" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Icons\PullRequest.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/GitUI/Resources/Icons/PullRequest.png b/GitUI/Resources/Icons/PullRequest.png
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -1656,6 +1656,8 @@ private void ContextMenuOpening(object sender, CancelEventArgs e)
 
             SetEnabled(openBuildReportToolStripMenuItem, !string.IsNullOrWhiteSpace(revision.BuildStatus?.Url));
 
+            SetEnabled(openPullRequestPageStripMenuItem, !string.IsNullOrWhiteSpace(revision.BuildStatus?.PullRequestUrl));
+
             RefreshOwnScripts();
 
             UpdateSeparators();
@@ -2427,6 +2429,16 @@ private void openBuildReportToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
 
+        private void openPullRequestPageStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var revision = GetSelectedRevisions().First();
+
+            if (!string.IsNullOrWhiteSpace(revision.BuildStatus?.PullRequestUrl))
+            {
+                Process.Start(revision.BuildStatus.PullRequestUrl);
+            }
+        }
+
         private void editCommitToolStripMenuItem_Click(object sender, EventArgs e)
         {
             LaunchRebase("e");

diff --git a/Plugins/BuildServerIntegration/AppVeyorIntegration/AppVeyorAdapter.cs b/Plugins/BuildServerIntegration/AppVeyorIntegration/AppVeyorAdapter.cs
@@ -189,6 +189,24 @@ private class Project
             public string QueryUrl;
         }
 
+        private string BuildPullRequetUrl(string repositoryType, string repositoryName, string pullRequestId)
+        {
+            switch (repositoryType)
+            {
+                case "bitBucket":
+                    return $"https://bitbucket.org/{repositoryName}/pull-requests/{pullRequestId}";
+                case "gitHub":
+                    return $"https://github.com/{repositoryName}/pull/{pullRequestId}";
+                case "gitLab":
+                    return $"https://gitlab.com/{repositoryName}/merge_requests/{pullRequestId}";
+                case "vso":
+                case "git":
+                    return null;
+            }
+
+            return null;
+        }
+
         private IEnumerable<AppVeyorBuildInfo> QueryBuildsResults(Project project)
         {
             try
@@ -203,9 +221,13 @@ private IEnumerable<AppVeyorBuildInfo> QueryBuildsResults(Project project)
                             return Enumerable.Empty<AppVeyorBuildInfo>();
                         }
 
-                        var builds = JObject.Parse(result)["builds"].Children();
+                        var content = JObject.Parse(result);
+                        var builds = content["builds"].Children();
                         var baseApiUrl = ApiBaseUrl + project.Id;
                         var baseWebUrl = WebSiteUrl + "/project/" + project.Id + "/build/";
+                        var projectData = content["project"];
+                        var repositoryName = projectData["repositoryName"];
+                        var repositoryType = projectData["repositoryType"];
 
                         var buildDetails = new List<AppVeyorBuildInfo>();
                         foreach (var b in builds)
@@ -239,6 +261,7 @@ private IEnumerable<AppVeyorBuildInfo> QueryBuildsResults(Project project)
                                     StartDate = b["started"]?.ToObject<DateTime>() ?? DateTime.MinValue,
                                     BaseWebUrl = baseWebUrl,
                                     Url = WebSiteUrl + "/project/" + project.Id + "/build/" + version,
+                                    PullRequestUrl = repositoryType != null && repositoryName != null && pullRequestId != null ? BuildPullRequetUrl(repositoryType.Value<string>(), repositoryName.Value<string>(), pullRequestId.Value<string>()) : null,
                                     BaseApiUrl = baseApiUrl,
                                     AppVeyorBuildReportUrl = baseApiUrl + "/build/" + version,
                                     PullRequestText = pullRequestId != null ? "PR#" + pullRequestId.Value<string>() : string.Empty,

diff --git a/Plugins/GitUIPluginInterfaces/BuildServerIntegration/BuildInfo.cs b/Plugins/GitUIPluginInterfaces/BuildServerIntegration/BuildInfo.cs
@@ -24,5 +24,6 @@ public enum BuildStatus
         public string Url { get; set; }
         public bool ShowInBuildReportTab { get; set; } = true;
         public string Tooltip { get; set; }
+        public string PullRequestUrl { get; set; }
     }
 }