From 5cf47f0645290398e7c330ad32bc38aede2ac35f Mon Sep 17 00:00:00 2001
From: Philippe Miossec <pmiossec@gmail.com>
Date: Fri, 1 Mar 2019 13:03:58 +0100
Subject: [PATCH] Being able to navigate to a PR page of an AppVeyor build

---
 GitUI/GitUI.csproj                            |   1 +
 GitUI/Properties/Images.Designer.cs           |  10 +++++++
 GitUI/Properties/Images.resx                  |   3 +++
 GitUI/Resources/Icons/PullRequest.png         | Bin 0 -> 695 bytes
 .../RevisionGridControl.Designer.cs           |  14 +++++++++-
 .../RevisionGrid/RevisionGridControl.cs       |  12 +++++++++
 .../AppVeyorIntegration/AppVeyorAdapter.cs    |  25 +++++++++++++++++-
 .../BuildServerIntegration/BuildInfo.cs       |   1 +
 8 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 GitUI/Resources/Icons/PullRequest.png

diff --git a/GitUI/GitUI.csproj b/GitUI/GitUI.csproj
index 2a8c32747d2..1402bce7cc6 100644
--- 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
index dc6654b8332..06e025c6404 100644
--- a/GitUI/Properties/Images.Designer.cs
+++ b/GitUI/Properties/Images.Designer.cs
@@ -1480,6 +1480,16 @@ public class Images {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap PullRequest {
+            get {
+                object obj = ResourceManager.GetObject("PullRequest", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/GitUI/Properties/Images.resx b/GitUI/Properties/Images.resx
index c6e2453051d..28cdd2400ce 100644
--- 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>
\ No newline at end of file
diff --git a/GitUI/Resources/Icons/PullRequest.png b/GitUI/Resources/Icons/PullRequest.png
new file mode 100644
index 0000000000000000000000000000000000000000..33ec10881aca2a8e61e68d48e3d9d7c33ce55794
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yIfPK~z|U?bl6+PEi;K@E=K&2#YCS#R$#946#uxu)v0`kD7&0
zY-TYV#lnJOBMVbl&7MeMC1$dd1}iiR@)^eX7-<+EV{y*ZozuPV-1qgC&HJy@?LOyu
z{?Gs1bIv`_p+0EE%31=a)*<-{+(L6L!P5%ti?A<}591PU=lHco`}|sx7hxN|VJvB9
zbCSQw^lz$1@;Uf|&)9`oSc7{p$)1AbW4MM3ID>;&Sc`xIk?c@nUx-ok79`JWqd1M}
z)d)BhgWGfZp5Qqil}Mg#y=W>*nC^lX@wqm!H)9E&p#z`FjR$N*cUk9o!WwvwEm2?#
z`h?MRWCVURaio2?i0k;8^!<_lRdcaDL-0LAaxU>pMPzruGJHrxoG2>*4ky9=1%6o(
z={D?6I4<WA6#WT*CGS5A{Q9vOLpgovI+>A2Q1mCP1`n}SnCGfd4*?WU(WI!yVf0UE
z2xtgs2xtiS?*j6$9FI*r$wsid3XXQ6c*$}M3rBrLG~uam`W?qQp$K^?95(AqB%h79
zQS_0>u^;auZ(F6{j;QunVsFE5TrDA>Gjen$_6^bAQz`glbXuL$HxS!oI3GC{=kyKY
zZq|@4!om1#N$gERy_i>c<Ru{#v02O&?j035T7+t7082B;dxTMSl@PEh`aZydXq$;E
z(Y|*wg7JFrM<f}F?{`$F?-PvQFGg@*xM_{yhLT0l4&1~m;aYZ7K}}bHDcC7oN?r@|
d-X-Uj^cTpHu1X3d(Nq8c002ovPDHLkV1lR`FbV(w

literal 0
HcmV?d00001

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs
index 98657b3b659..5f63820f801 100644
--- a/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs
+++ b/GitUI/UserControls/RevisionGrid/RevisionGridControl.Designer.cs
@@ -63,6 +63,7 @@ private void InitializeComponent()
             this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.runScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openBuildReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openPullRequestPageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.getHelpOnHowToUseTheseFeaturesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.editCommitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -140,7 +141,9 @@ private void InitializeComponent()
             this.navigateToolStripMenuItem,
             this.viewToolStripMenuItem,
             this.runScriptToolStripMenuItem,
-            this.openBuildReportToolStripMenuItem});
+            this.openBuildReportToolStripMenuItem,
+            this.openPullRequestPageStripMenuItem
+            });
             this.mainContextMenu.Name = "CreateTag";
             this.mainContextMenu.Size = new System.Drawing.Size(265, 620);
             this.mainContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuOpening);
@@ -437,6 +440,14 @@ private void InitializeComponent()
             this.openBuildReportToolStripMenuItem.Text = "Open build report in the browser";
             this.openBuildReportToolStripMenuItem.Click += new System.EventHandler(this.openBuildReportToolStripMenuItem_Click);
             // 
+            // openBuildReportToolStripMenuItem
+            // 
+            this.openPullRequestPageStripMenuItem.Image = global::GitUI.Properties.Images.PullRequest;
+            this.openPullRequestPageStripMenuItem.Name = "openPullRequestPageStripMenuItem";
+            this.openPullRequestPageStripMenuItem.Size = new System.Drawing.Size(301, 26);
+            this.openPullRequestPageStripMenuItem.Text = "Open pull request page in the browser";
+            this.openPullRequestPageStripMenuItem.Click += new System.EventHandler(this.openPullRequestPageStripMenuItem_Click);
+            // 
             // toolStripSeparator9
             // 
             this.toolStripSeparator9.Name = "toolStripSeparator9";
@@ -537,6 +548,7 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem selectAsBaseToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem getHelpOnHowToUseTheseFeaturesToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem openBuildReportToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem openPullRequestPageStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem editCommitToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem rebaseWithAdvOptionsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem createTagToolStripMenuItem;
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
index 467582fd993..054856fd77c 100644
--- 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
index fed3ee6b7a7..c07c7bc1622 100644
--- 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
index c90f08aeac6..c28ec6bcda3 100644
--- 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; }
     }
 }
\ No newline at end of file