cli#2720 | Add patch flag to pull-request diff command

m4ver1k · m4ver1k · commit e0897fd8e8ba · 2021-10-07T23:09:21.000+05:30
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -267,15 +267,19 @@ func (pr *PullRequest) DisplayableReviews() PullRequestReviews {
 	return PullRequestReviews{Nodes: published, TotalCount: len(published)}
 }
 
-func (c Client) PullRequestDiff(baseRepo ghrepo.Interface, prNumber int) (io.ReadCloser, error) {
+func (c Client) PullRequestDiff(baseRepo ghrepo.Interface, prNumber int, patch bool) (io.ReadCloser, error) {
 	url := fmt.Sprintf("%srepos/%s/pulls/%d",
 		ghinstance.RESTPrefix(baseRepo.RepoHost()), ghrepo.FullName(baseRepo), prNumber)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	req.Header.Set("Accept", "application/vnd.github.v3.diff; charset=utf-8")
+	if patch {
+		req.Header.Set("Accept", "application/vnd.github.v3.patch")
+	} else {
+		req.Header.Set("Accept", "application/vnd.github.v3.diff; charset=utf-8")
+	}
 
 	resp, err := c.http.Do(req)
 	if err != nil {
diff --git a/pkg/cmd/pr/diff/diff.go b/pkg/cmd/pr/diff/diff.go
@@ -25,6 +25,7 @@ type DiffOptions struct {
 
 	SelectorArg string
 	UseColor    string
+	Patch       bool
 }
 
 func NewCmdDiff(f *cmdutil.Factory, runF func(*DiffOptions) error) *cobra.Command {
@@ -70,6 +71,7 @@ func NewCmdDiff(f *cmdutil.Factory, runF func(*DiffOptions) error) *cobra.Comman
 	}
 
 	cmd.Flags().StringVar(&opts.UseColor, "color", "auto", "Use color in diff output: {always|never|auto}")
+	cmd.Flags().BoolVar(&opts.Patch, "patch", false, "Display diff in patch format")
 
 	return cmd
 }
@@ -90,7 +92,7 @@ func diffRun(opts *DiffOptions) error {
 	}
 	apiClient := api.NewClientFromHTTP(httpClient)
 
-	diff, err := apiClient.PullRequestDiff(baseRepo, pr.Number)
+	diff, err := apiClient.PullRequestDiff(baseRepo, pr.Number, opts.Patch)
 	if err != nil {
 		return fmt.Errorf("could not find pull request diff: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ type DiffOptions struct {`
`25`	`25`
`26`	`26`	`SelectorArg string`
`27`	`27`	`UseColor string`
	`28`	`+ Patch bool`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`func NewCmdDiff(f cmdutil.Factory, runF func(DiffOptions) error) *cobra.Command {`
`@@ -70,6 +71,7 @@ func NewCmdDiff(f cmdutil.Factory, runF func(DiffOptions) error) *cobra.Comman`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`cmd.Flags().StringVar(&opts.UseColor, "color", "auto", "Use color in diff output: {always\|never\|auto}")`
	`74`	`+ cmd.Flags().BoolVar(&opts.Patch, "patch", false, "Display diff in patch format")`
`73`	`75`
`74`	`76`	`return cmd`
`75`	`77`	`}`
`@@ -90,7 +92,7 @@ func diffRun(opts *DiffOptions) error {`
`90`	`92`	`}`
`91`	`93`	`apiClient := api.NewClientFromHTTP(httpClient)`
`92`	`94`
`93`		`- diff, err := apiClient.PullRequestDiff(baseRepo, pr.Number)`
	`95`	`+ diff, err := apiClient.PullRequestDiff(baseRepo, pr.Number, opts.Patch)`
`94`	`96`	`if err != nil {`
`95`	`97`	`return fmt.Errorf("could not find pull request diff: %w", err)`
`96`	`98`	`}`