1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
// adapted from https://github.com/cli/cli/blob/trunk/pkg/cmd/pr/diff/diff.go
package diff
import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
"strings"
"syscall"
"gitlab.com/gitlab-org/cli/pkg/iostreams"
"github.com/MakeNowJust/heredoc/v2"
gitlab "gitlab.com/gitlab-org/api/client-go"
"gitlab.com/gitlab-org/cli/commands/cmdutils"
"gitlab.com/gitlab-org/cli/commands/mr/mrutils"
"github.com/spf13/cobra"
)
type DiffOptions struct {
factory *cmdutils.Factory
IO *iostreams.IOStreams
Args []string
UseColor string
RawDiff bool
}
func NewCmdDiff(f *cmdutils.Factory, runF func(*DiffOptions) error) *cobra.Command {
opts := &DiffOptions{
factory: f,
IO: f.IO,
}
cmd := &cobra.Command{
Use: "diff [<id> | <branch>]",
Short: "View changes in a merge request.",
Example: heredoc.Doc(`
$ glab mr diff 123
$ glab mr diff branch
# Get merge request from current branch
$ glab mr diff
$ glab mr diff 123 --color=never
`),
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if repoOverride, _ := cmd.Flags().GetString("repo"); repoOverride != "" && len(args) == 0 {
return &cmdutils.FlagError{Err: errors.New("argument required when using the --repo flag.")}
}
if len(args) > 0 {
opts.Args = args
}
if !validColorFlag(opts.UseColor) {
return &cmdutils.FlagError{Err: fmt.Errorf("did not understand color: %q. Expected one of 'always', 'never', or 'auto'.", opts.UseColor)}
}
if opts.UseColor == "auto" && !opts.IO.IsaTTY {
opts.UseColor = "never"
}
if runF != nil {
return runF(opts)
}
return diffRun(opts)
},
}
cmd.Flags().StringVar(&opts.UseColor, "color", "auto", "Use color in diff output: always, never, auto.")
cmd.Flags().BoolVar(&opts.RawDiff, "raw", false, "Use raw diff format that can be piped to commands")
return cmd
}
func diffRun(opts *DiffOptions) error {
apiClient, err := opts.factory.HttpClient()
if err != nil {
return err
}
mr, baseRepo, err := mrutils.MRFromArgs(opts.factory, opts.Args, "any")
if err != nil {
return err
}
diffOut := &bytes.Buffer{}
if opts.RawDiff {
rawDiff, _, err := apiClient.MergeRequests.ShowMergeRequestRawDiffs(baseRepo.FullName(), mr.IID, nil)
if err != nil {
return fmt.Errorf("could not obtain raw diff: %w", err)
}
diffOut.Write(rawDiff)
} else {
diffs, _, err := apiClient.MergeRequests.GetMergeRequestDiffVersions(baseRepo.FullName(), mr.IID, &gitlab.GetMergeRequestDiffVersionsOptions{})
if err != nil {
return fmt.Errorf("could not find merge request diffs: %w", err)
}
if len(diffs) == 0 {
return fmt.Errorf("no merge request diffs found")
}
// diff versions are returned by the API in order of most recent first
diff := diffs[0]
// the diffs are not included in the GetMergeRequestDiffVersions so we query for the diff version
diffVersion, _, err := apiClient.MergeRequests.GetSingleMergeRequestDiffVersion(baseRepo.FullName(), mr.IID, diff.ID, &gitlab.GetSingleMergeRequestDiffVersionOptions{})
if err != nil {
return fmt.Errorf("could not find merge request diff: %w", err)
}
for _, diffLine := range diffVersion.Diffs {
// output the unified diff header
diffOut.WriteString("--- " + diffLine.OldPath + "\n")
diffOut.WriteString("+++ " + diffLine.NewPath + "\n")
diffOut.WriteString(diffLine.Diff)
}
defer diffOut.Reset()
}
err = opts.IO.StartPager()
if err != nil {
return err
}
defer opts.IO.StopPager()
if opts.UseColor == "never" {
_, err = io.Copy(opts.IO.StdOut, diffOut)
if errors.Is(err, syscall.EPIPE) {
return nil
}
return err
}
diffLines := bufio.NewScanner(diffOut)
for diffLines.Scan() {
diffLine := diffLines.Text()
switch {
case isHeaderLine(diffLine):
fmt.Fprintf(opts.IO.StdOut, "\x1b[1;38m%s\x1b[m\n", diffLine)
case isAdditionLine(diffLine):
fmt.Fprintf(opts.IO.StdOut, "\x1b[32m%s\x1b[m\n", diffLine)
case isRemovalLine(diffLine):
fmt.Fprintf(opts.IO.StdOut, "\x1b[31m%s\x1b[m\n", diffLine)
default:
fmt.Fprintln(opts.IO.StdOut, diffLine)
}
}
if err := diffLines.Err(); err != nil {
return fmt.Errorf("error reading merge request diff: %w", err)
}
return nil
}
var diffHeaderPrefixes = []string{"+++", "---", "diff", "index"}
func isHeaderLine(dl string) bool {
for _, p := range diffHeaderPrefixes {
if strings.HasPrefix(dl, p) {
return true
}
}
return false
}
func isAdditionLine(dl string) bool {
return strings.HasPrefix(dl, "+")
}
func isRemovalLine(dl string) bool {
return strings.HasPrefix(dl, "-")
}
func validColorFlag(c string) bool {
return c == "auto" || c == "always" || c == "never"
}
|
