Merge pull request cli#63 from github/branch-from-fork

mislav · web-flow · commit 624c44efda37 · 2019-11-15T09:28:00.000+01:00
Use `OWNER:BRANCH` syntax for cross-repo PRs
diff --git a/api/queries.go b/api/queries.go
@@ -17,14 +17,21 @@ type PullRequest struct {
 	State       string
 	URL         string
 	HeadRefName string
-	Reviews     struct {
+
+	IsCrossRepository   bool
+	HeadRepositoryOwner struct {
+		Login string
+	}
+
+	Reviews struct {
 		Nodes []struct {
 			State  string
 			Author struct {
 				Login string
 			}
 		}
 	}
+
 	Commits struct {
 		Nodes []struct {
 			Commit struct {
@@ -47,6 +54,13 @@ type PullRequest struct {
 	}
 }
 
+func (pr PullRequest) HeadLabel() string {
+	if pr.IsCrossRepository {
+		return fmt.Sprintf("%s:%s", pr.HeadRepositoryOwner.Login, pr.HeadRefName)
+	}
+	return pr.HeadRefName
+}
+
 type PullRequestReviewStatus struct {
 	ChangesRequested bool
 	Approved         bool
@@ -245,6 +259,11 @@ func PullRequests(client *Client, ghRepo Repo, currentBranch, currentUsername st
 		title
 		url
 		headRefName
+		headRefName
+		headRepositoryOwner {
+			login
+		}
+		isCrossRepository
 		commits(last: 1) {
 			nodes {
 				commit {
@@ -481,6 +500,10 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]
 				state
 				url
 				headRefName
+				headRepositoryOwner {
+					login
+				}
+				isCrossRepository
             }
 		  }
 		  pageInfo {
diff --git a/command/pr.go b/command/pr.go
@@ -200,10 +200,10 @@ func prList(cmd *cobra.Command, args []string) error {
 			case "MERGED":
 				prNum = utils.Magenta(prNum)
 			}
-			prBranch := utils.Cyan(truncate(branchWidth, pr.HeadRefName))
+			prBranch := utils.Cyan(truncate(branchWidth, pr.HeadLabel()))
 			fmt.Fprintf(out, "%s  %-*s  %s\n", prNum, titleWidth, truncate(titleWidth, pr.Title), prBranch)
 		} else {
-			fmt.Fprintf(out, "%d\t%s\t%s\n", pr.Number, pr.Title, pr.HeadRefName)
+			fmt.Fprintf(out, "%d\t%s\t%s\n", pr.Number, pr.Title, pr.HeadLabel())
 		}
 	}
 	return nil
@@ -250,7 +250,7 @@ func prView(cmd *cobra.Command, args []string) error {
 func printPrs(prs ...api.PullRequest) {
 	for _, pr := range prs {
 		prNumber := fmt.Sprintf("#%d", pr.Number)
-		fmt.Printf("  %s  %s %s", utils.Yellow(prNumber), truncate(50, pr.Title), utils.Cyan("["+pr.HeadRefName+"]"))
+		fmt.Printf("  %s  %s %s", utils.Yellow(prNumber), truncate(50, pr.Title), utils.Cyan("["+pr.HeadLabel()+"]"))
 
 		checks := pr.ChecksStatus()
 		reviews := pr.ReviewStatus()
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -66,7 +66,7 @@ func TestPRList(t *testing.T) {
 	}
 
 	eq(t, out.String(), `32	New feature	feature
-29	Fixed bad bug	bug-fix
+29	Fixed bad bug	hubot:bug-fix
 28	Improve documentation	docs
 `)
 }
diff --git a/test/fixtures/prList.json b/test/fixtures/prList.json
@@ -16,7 +16,11 @@
               "number": 29,
               "title": "Fixed bad bug",
               "url": "https://github.com/monalisa/hello/pull/29",
-              "headRefName": "bug-fix"
+              "headRefName": "bug-fix",
+              "isCrossRepository": true,
+              "headRepositoryOwner": {
+                "login": "hubot"
+              }
             }
           },
           {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func TestPRList(t *testing.T) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	eq(t, out.String(), `32 New feature feature
`69`		`-29 Fixed bad bug bug-fix`
	`69`	`+29 Fixed bad bug hubot:bug-fix`
`70`	`70`	`28 Improve documentation docs`
`71`	`71`	`)
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@`
`16`	`16`	`"number": 29,`
`17`	`17`	`"title": "Fixed bad bug",`
`18`	`18`	`"url": "https://github.com/monalisa/hello/pull/29",`
`19`		`- "headRefName": "bug-fix"`
	`19`	`+ "headRefName": "bug-fix",`
	`20`	`+ "isCrossRepository": true,`
	`21`	`+ "headRepositoryOwner": {`
	`22`	`+ "login": "hubot"`
	`23`	`+ }`
`20`	`24`	`}`
`21`	`25`	`},`
`22`	`26`	`{`