From 05421db4040cb58bcb62116127c777393f3585a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav@github.com>
Date: Wed, 17 Feb 2021 17:56:26 +0100
Subject: [PATCH] pr status: fix checking branch protection rules on the base
 branch

Instead of checking branch protection rules on the main branch of the
repository, branch protection rules for a specific PR should be checked
on its base branch, since not all PRs are based on the main branch.

Additionally, do not display "Up to date" if the actual merge status
reported from the server was "UNKNOWN" or "DIRTY", since in those cases
"Up to date" could be false information.
---
 api/queries_pr.go           | 30 ++++++++++++++++++------------
 pkg/cmd/pr/status/status.go | 25 ++++++++++++-------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/api/queries_pr.go b/api/queries_pr.go
index 59cf044603b..0ddd29ec3d0 100644
--- a/api/queries_pr.go
+++ b/api/queries_pr.go
@@ -16,11 +16,10 @@ import (
 )
 
 type PullRequestsPayload struct {
-	ViewerCreated    PullRequestAndTotalCount
-	ReviewRequested  PullRequestAndTotalCount
-	CurrentPR        *PullRequest
-	DefaultBranch    string
-	StrictProtection bool
+	ViewerCreated   PullRequestAndTotalCount
+	ReviewRequested PullRequestAndTotalCount
+	CurrentPR       *PullRequest
+	DefaultBranch   string
 }
 
 type PullRequestAndTotalCount struct {
@@ -57,6 +56,12 @@ type PullRequest struct {
 	IsDraft             bool
 	MaintainerCanModify bool
 
+	BaseRef struct {
+		BranchProtectionRule struct {
+			RequiresStrictStatusChecks bool
+		}
+	}
+
 	ReviewDecision string
 
 	Commits struct {
@@ -283,10 +288,7 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 	type response struct {
 		Repository struct {
 			DefaultBranchRef struct {
-				Name                 string
-				BranchProtectionRule struct {
-					RequiresStrictStatusChecks bool
-				}
+				Name string
 			}
 			PullRequests edges
 			PullRequest  *PullRequest
@@ -342,6 +344,11 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 		headRepositoryOwner {
 			login
 		}
+		baseRef {
+			branchProtectionRule {
+				requiresStrictStatusChecks
+			}
+		}
 		isCrossRepository
 		isDraft
 		%s
@@ -467,9 +474,8 @@ func PullRequests(client *Client, repo ghrepo.Interface, currentPRNumber int, cu
 			PullRequests: reviewRequested,
 			TotalCount:   resp.ReviewRequested.TotalCount,
 		},
-		CurrentPR:        currentPR,
-		DefaultBranch:    resp.Repository.DefaultBranchRef.Name,
-		StrictProtection: resp.Repository.DefaultBranchRef.BranchProtectionRule.RequiresStrictStatusChecks,
+		CurrentPR:     currentPR,
+		DefaultBranch: resp.Repository.DefaultBranchRef.Name,
 	}
 
 	return &payload, nil
diff --git a/pkg/cmd/pr/status/status.go b/pkg/cmd/pr/status/status.go
index 5a210941a93..74b2f4e8af8 100644
--- a/pkg/cmd/pr/status/status.go
+++ b/pkg/cmd/pr/status/status.go
@@ -114,7 +114,7 @@ func statusRun(opts *StatusOptions) error {
 		currentPR = nil
 	}
 	if currentPR != nil {
-		printPrs(opts.IO, 1, prPayload.StrictProtection, *currentPR)
+		printPrs(opts.IO, 1, *currentPR)
 	} else if currentPRHeadRef == "" {
 		shared.PrintMessage(opts.IO, "  There is no current branch")
 	} else {
@@ -124,7 +124,7 @@ func statusRun(opts *StatusOptions) error {
 
 	shared.PrintHeader(opts.IO, "Created by you")
 	if prPayload.ViewerCreated.TotalCount > 0 {
-		printPrs(opts.IO, prPayload.ViewerCreated.TotalCount, prPayload.StrictProtection, prPayload.ViewerCreated.PullRequests...)
+		printPrs(opts.IO, prPayload.ViewerCreated.TotalCount, prPayload.ViewerCreated.PullRequests...)
 	} else {
 		shared.PrintMessage(opts.IO, "  You have no open pull requests")
 	}
@@ -132,7 +132,7 @@ func statusRun(opts *StatusOptions) error {
 
 	shared.PrintHeader(opts.IO, "Requesting a code review from you")
 	if prPayload.ReviewRequested.TotalCount > 0 {
-		printPrs(opts.IO, prPayload.ReviewRequested.TotalCount, prPayload.StrictProtection, prPayload.ReviewRequested.PullRequests...)
+		printPrs(opts.IO, prPayload.ReviewRequested.TotalCount, prPayload.ReviewRequested.PullRequests...)
 	} else {
 		shared.PrintMessage(opts.IO, "  You have no pull requests to review")
 	}
@@ -178,7 +178,7 @@ func prSelectorForCurrentBranch(baseRepo ghrepo.Interface, prHeadRef string, rem
 	return
 }
 
-func printPrs(io *iostreams.IOStreams, totalCount int, strictProtection bool, prs ...api.PullRequest) {
+func printPrs(io *iostreams.IOStreams, totalCount int, prs ...api.PullRequest) {
 	w := io.Out
 	cs := io.ColorScheme()
 
@@ -228,15 +228,14 @@ func printPrs(io *iostreams.IOStreams, totalCount int, strictProtection bool, pr
 				fmt.Fprint(w, cs.Green("✓ Approved"))
 			}
 
-			// only check if the "up to date" setting is checked in repo settings
-			if strictProtection {
-				// add padding between reviews & merge status
-				fmt.Fprint(w, " ")
-
-				if pr.MergeStateStatus == "BEHIND" {
-					fmt.Fprint(w, cs.Yellow("- Not up to date"))
-				} else {
-					fmt.Fprint(w, cs.Green("✓ Up to date"))
+			if pr.BaseRef.BranchProtectionRule.RequiresStrictStatusChecks {
+				switch pr.MergeStateStatus {
+				case "BEHIND":
+					fmt.Fprintf(w, " %s", cs.Yellow("- Not up to date"))
+				case "UNKNOWN", "DIRTY":
+					// do not print anything
+				default:
+					fmt.Fprintf(w, " %s", cs.Green("✓ Up to date"))
 				}
 			}