Merge pull request cli#3086 from g14a/feature/diffstat-pr

Feature/diffstat pr
areese · Mar 8, 2021 · eddd8f0 · eddd8f0
2 parents b8937e4 + 1d8dd2f
commit eddd8f0
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 10 deletions.
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -39,6 +39,8 @@ type PullRequest struct {
 	HeadRefName      string
 	Body             string
 	Mergeable        string
+	Additions        int
+	Deletions        int
 	MergeStateStatus string
 
 	Author struct {
@@ -571,6 +573,8 @@ func PullRequestByNumber(client *Client, repo ghrepo.Interface, number int) (*Pu
 				closed
 				body
 				mergeable
+				additions
+				deletions
 				author {
 				  login
 				}
@@ -672,6 +676,8 @@ func PullRequestForBranch(client *Client, repo ghrepo.Interface, baseBranch, hea
 					state
 					body
 					mergeable
+					additions
+					deletions
 					author {
 						login
 					}

diff --git a/pkg/cmd/pr/view/fixtures/prView.json b/pkg/cmd/pr/view/fixtures/prView.json
@@ -14,6 +14,8 @@
             "headRepositoryOwner": {
               "login": "hubot"
             },
+            "additions": 100,
+            "deletions": 10,
             "commits": {
               "totalCount": 12
             },
@@ -34,6 +36,8 @@
             "author": {
               "login": "nobody"
             },
+            "additions": 100,
+            "deletions": 10,
             "headRepositoryOwner": {
               "login": "OWNER"
             },

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreview.json b/pkg/cmd/pr/view/fixtures/prViewPreview.json
@@ -10,6 +10,8 @@
         "author": {
           "login": "nobody"
         },
+        "additions": 100,
+        "deletions": 10,
         "assignees": {
           "nodes": [],
           "totalcount": 0

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewClosedState.json b/pkg/cmd/pr/view/fixtures/prViewPreviewClosedState.json
@@ -10,6 +10,8 @@
         "author": {
           "login": "nobody"
         },
+        "additions": 100,
+        "deletions": 10,
         "commits": {
           "totalCount": 12
         },

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewDraftState.json b/pkg/cmd/pr/view/fixtures/prViewPreviewDraftState.json
@@ -13,6 +13,8 @@
         "commits": {
           "totalCount": 12
         },
+        "additions": 100,
+        "deletions": 10,
         "baseRefName": "master",
         "headRefName": "blueberries",
         "headRepositoryOwner": {

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewDraftStatebyBranch.json b/pkg/cmd/pr/view/fixtures/prViewPreviewDraftStatebyBranch.json
@@ -14,6 +14,8 @@
             "headRepositoryOwner": {
               "login": "hubot"
             },
+            "additions": 100,
+            "deletions": 10,
             "commits": {
               "totalCount": 12
             },
@@ -37,6 +39,8 @@
             "headRepositoryOwner": {
               "login": "OWNER"
             },
+            "additions": 100,
+            "deletions": 10,
             "commits": {
               "totalCount": 8
             },

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewMergedState.json b/pkg/cmd/pr/view/fixtures/prViewPreviewMergedState.json
@@ -13,6 +13,8 @@
         "commits": {
           "totalCount": 12
         },
+        "additions": 100,
+        "deletions": 10,
         "baseRefName": "master",
         "headRefName": "blueberries",
         "headRepositoryOwner": {

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewSingleComment.json b/pkg/cmd/pr/view/fixtures/prViewPreviewSingleComment.json
@@ -10,6 +10,8 @@
         "author": {
           "login": "nobody"
         },
+        "additions": 100,
+        "deletions": 10,
         "assignees": {
           "nodes": [],
           "totalcount": 0

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewWithMetadataByBranch.json b/pkg/cmd/pr/view/fixtures/prViewPreviewWithMetadataByBranch.json
@@ -12,6 +12,8 @@
             "url": "https://github.com/OWNER/REPO/pull/12",
             "headRefName": "blueberries",
             "baseRefName": "master",
+            "additions": 100,
+            "deletions": 10,
             "headRepositoryOwner": {
               "login": "hubot"
             },
@@ -49,6 +51,8 @@
             "author": {
               "login": "nobody"
             },
+            "additions": 100,
+            "deletions": 10,
             "assignees": {
               "nodes": [
                 {

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewWithMetadataByNumber.json b/pkg/cmd/pr/view/fixtures/prViewPreviewWithMetadataByNumber.json
@@ -10,6 +10,8 @@
         "author": {
           "login": "nobody"
         },
+        "additions": 100,
+        "deletions": 10,
         "reviewRequests": {
             "nodes": [
                 {

diff --git a/pkg/cmd/pr/view/fixtures/prViewPreviewWithReviewersByNumber.json b/pkg/cmd/pr/view/fixtures/prViewPreviewWithReviewersByNumber.json
@@ -10,6 +10,8 @@
         "author": {
           "login": "nobody"
         },
+        "additions": 100,
+        "deletions": 10,
         "reviewRequests": {
           "nodes": [
             {

diff --git a/pkg/cmd/pr/view/fixtures/prView_EmptyBody.json b/pkg/cmd/pr/view/fixtures/prView_EmptyBody.json
@@ -14,6 +14,8 @@
             "headRepositoryOwner": {
               "login": "hubot"
             },
+            "additions": 100,
+            "deletions": 10,
             "commits": {
               "totalCount": 12
             },
@@ -30,6 +32,8 @@
             "url": "https://github.com/OWNER/REPO/pull/10",
             "baseRefName": "master",
             "headRefName": "blueberries",
+            "additions": 100,
+            "deletions": 10,
             "author": {
               "login": "nobody"
             },

diff --git a/pkg/cmd/pr/view/view.go b/pkg/cmd/pr/view/view.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 
@@ -137,6 +138,8 @@ func printRawPrPreview(io *iostreams.IOStreams, pr *api.PullRequest) error {
 	fmt.Fprintf(out, "milestone:\t%s\n", pr.Milestone.Title)
 	fmt.Fprintf(out, "number:\t%d\n", pr.Number)
 	fmt.Fprintf(out, "url:\t%s\n", pr.URL)
+	fmt.Fprintf(out, "additions:\t%s\n", cs.Green(strconv.Itoa(pr.Additions)))
+	fmt.Fprintf(out, "deletions:\t%s\n", cs.Red(strconv.Itoa(pr.Deletions)))
 
 	fmt.Fprintln(out, "--")
 	fmt.Fprintln(out, pr.Body)
@@ -151,12 +154,14 @@ func printHumanPrPreview(opts *ViewOptions, pr *api.PullRequest) error {
 	// Header (Title and State)
 	fmt.Fprintln(out, cs.Bold(pr.Title))
 	fmt.Fprintf(out,
-		"%s • %s wants to merge %s into %s from %s\n",
+		"%s • %s wants to merge %s into %s from %s • %s %s \n",
 		shared.StateTitleWithColor(cs, *pr),
 		pr.Author.Login,
 		utils.Pluralize(pr.Commits.TotalCount, "commit"),
 		pr.BaseRefName,
 		pr.HeadRefName,
+		cs.Green("+"+strconv.Itoa(pr.Additions)),
+		cs.Red("-"+strconv.Itoa(pr.Deletions)),
 	)
 
 	// Reactions

diff --git a/pkg/cmd/pr/view/view_test.go b/pkg/cmd/pr/view/view_test.go
@@ -185,6 +185,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`projects:\t\n`,
 				`milestone:\t\n`,
 				`url:\thttps://github.com/OWNER/REPO/pull/12\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`number:\t12\n`,
 				`blueberries taste good`,
 			},
@@ -221,6 +223,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`assignees:\t\n`,
 				`projects:\t\n`,
 				`milestone:\t\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`reviewers:\tDEF \(Commented\), def \(Changes requested\), ghost \(Approved\), hubot \(Commented\), xyz \(Approved\), 123 \(Requested\), Team 1 \(Requested\), abc \(Requested\)\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
@@ -241,6 +245,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`labels:\tone, two, three, four, five\n`,
 				`projects:\tProject 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\)\n`,
 				`milestone:\tuluru\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`blueberries taste good`,
 			},
 		},
@@ -260,6 +266,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`labels:\t\n`,
 				`projects:\t\n`,
 				`milestone:\t\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
 		},
@@ -279,6 +287,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`labels:\t\n`,
 				`projects:\t\n`,
 				`milestone:\t\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 			},
 		},
 		"Closed PR": {
@@ -296,6 +306,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`reviewers:\t\n`,
 				`projects:\t\n`,
 				`milestone:\t\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
 		},
@@ -314,6 +326,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`reviewers:\t\n`,
 				`projects:\t\n`,
 				`milestone:\t\n`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
 		},
@@ -333,6 +347,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`reviewers:`,
 				`projects:`,
 				`milestone:`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
 		},
@@ -352,6 +368,8 @@ func TestPRView_Preview_nontty(t *testing.T) {
 				`reviewers:`,
 				`projects:`,
 				`milestone:`,
+				`additions:\t100\n`,
+				`deletions:\t10\n`,
 				`\*\*blueberries taste good\*\*`,
 			},
 		},
@@ -395,7 +413,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Open.*nobody wants to merge 12 commits into master from blueberries`,
+				`Open.*nobody wants to merge 12 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`,
 			},
@@ -409,7 +427,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Open.*nobody wants to merge 12 commits into master from blueberries`,
+				`Open.*nobody wants to merge 12 commits into master from blueberries.+100.-10`,
 				`Reviewers:.*1 \(.*Requested.*\)\n`,
 				`Assignees:.*marseilles, monaco\n`,
 				`Labels:.*one, two, three, four, five\n`,
@@ -442,7 +460,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are a good fruit`,
-				`Open.*nobody wants to merge 8 commits into master from blueberries`,
+				`Open.*nobody wants to merge 8 commits into master from blueberries.+100.-10`,
 				`Assignees:.*marseilles, monaco\n`,
 				`Labels:.*one, two, three, four, five\n`,
 				`Projects:.*Project 1 \(column A\), Project 2 \(column B\), Project 3 \(column C\)\n`,
@@ -460,7 +478,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are a good fruit`,
-				`Open.*nobody wants to merge 8 commits into master from blueberries`,
+				`Open.*nobody wants to merge 8 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/10`,
 			},
@@ -474,7 +492,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are a good fruit`,
-				`Open.*nobody wants to merge 8 commits into master from blueberries`,
+				`Open.*nobody wants to merge 8 commits into master from blueberries.+100.-10`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/10`,
 			},
 		},
@@ -487,7 +505,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Closed.*nobody wants to merge 12 commits into master from blueberries`,
+				`Closed.*nobody wants to merge 12 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`,
 			},
@@ -501,7 +519,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Merged.*nobody wants to merge 12 commits into master from blueberries`,
+				`Merged.*nobody wants to merge 12 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`,
 			},
@@ -515,7 +533,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are from a fork`,
-				`Draft.*nobody wants to merge 12 commits into master from blueberries`,
+				`Draft.*nobody wants to merge 12 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`,
 			},
@@ -529,7 +547,7 @@ func TestPRView_Preview(t *testing.T) {
 			},
 			expectedOutputs: []string{
 				`Blueberries are a good fruit`,
-				`Draft.*nobody wants to merge 8 commits into master from blueberries`,
+				`Draft.*nobody wants to merge 8 commits into master from blueberries.+100.-10`,
 				`blueberries taste good`,
 				`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/10`,
 			},