Repository navigation
Expand file tree
/
Copy pathdiff.go
More file actions
331 lines (311 loc) · 8.6 KB
/
Copy pathdiff.go
File metadata and controls
331 lines (311 loc) · 8.6 KB
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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
package hglib
import (
"bytes"
"errors"
"fmt"
"io"
"regexp"
"strconv"
"strings"
)
const (
DIFF_OLD_MODE uint8 = 1
DIFF_NEW_MODE uint8 = 2
DIFF_DELETED_FILE_MODE uint8 = 3
DIFF_NEW_FILE_MODE uint8 = 4
DIFF_COPY_FROM uint8 = 5
DIFF_COPY_TO uint8 = 6
DIFF_RENAME_FROM uint8 = 7
DIFF_RENAME_TO uint8 = 8
DIFF_SIMILARITY_INDEX uint8 = 9
DIFF_DISSIMILARITY_INDEX uint8 = 10
DIFF_INDEX uint8 = 11
)
const (
APPEND uint8 = 1
DELETE uint8 = 2
CHANGE uint8 = 3
SAME uint8 = 4
)
var ErrInvalidFormat = errors.New("invalid diff format")
// AnnotatedLine is one line of a hunk. F1LineNum refers to the left side and
// F2LineNum to the right side; the counter that does not apply still carries
// the line position at which the other side's change happened.
type AnnotatedLine struct {
Type uint8 `json:"type"`
F1LineNum int64 `json:"f1"`
F2LineNum int64 `json:"f2"`
Line string `json:"line"`
}
// DiffItemHeaderItem is one extended header line of a file diff, such as
// "new file mode 100644".
type DiffItemHeaderItem struct {
Type uint8 `json:"type"`
Args []string `json:"args"`
}
// DiffItemPatch is one hunk.
type DiffItemPatch struct {
LStart int64 `json:"lStart"`
LLineCount int64 `json:"lLineCount"`
RStart int64 `json:"rStart"`
RLineCount int64 `json:"rLineCount"`
ContextLine string `json:"ctx"`
LineList []AnnotatedLine `json:"lines"`
}
// DiffItem is the diff of one file.
type DiffItem struct {
File1 string `json:"file1"`
File2 string `json:"file2"`
Header []*DiffItemHeaderItem `json:"header"`
PatchList []*DiffItemPatch `json:"patchList"`
}
// Diff is the diff of one changeset against its first parent.
type Diff struct {
CommitHash string `json:"commit"`
ItemList []*DiffItem `json:"item"`
}
func parseHgDiffHeaderItem(s string) *DiffItemHeaderItem {
parse := func(kind string, typ uint8) *DiffItemHeaderItem {
return &DiffItemHeaderItem{Type: typ, Args: []string{strings.TrimSpace(s[len(kind):])}}
}
switch {
case strings.HasPrefix(s, "old mode "):
return parse("old mode ", DIFF_OLD_MODE)
case strings.HasPrefix(s, "new mode "):
return parse("new mode ", DIFF_NEW_MODE)
case strings.HasPrefix(s, "deleted file mode "):
return parse("deleted file mode ", DIFF_DELETED_FILE_MODE)
case strings.HasPrefix(s, "new file mode "):
return parse("new file mode ", DIFF_NEW_FILE_MODE)
case strings.HasPrefix(s, "copy from "):
return parse("copy from ", DIFF_COPY_FROM)
case strings.HasPrefix(s, "copy to "):
return parse("copy to ", DIFF_COPY_TO)
case strings.HasPrefix(s, "rename from "):
return parse("rename from ", DIFF_RENAME_FROM)
case strings.HasPrefix(s, "rename to "):
return parse("rename to ", DIFF_RENAME_TO)
case strings.HasPrefix(s, "similarity index "):
return parse("similarity index ", DIFF_SIMILARITY_INDEX)
case strings.HasPrefix(s, "dissimilarity index "):
return parse("dissimilarity index ", DIFF_DISSIMILARITY_INDEX)
case strings.HasPrefix(s, "index "):
return &DiffItemHeaderItem{Type: DIFF_INDEX, Args: []string{strings.TrimSpace(s[len("index "):])}}
}
return nil
}
var reHgDiffHunk = regexp.MustCompile(`^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$`)
func parseHgDiff(stdout []byte) (*Diff, error) {
lr := newLineReader(bytes.NewBuffer(stdout))
res := &Diff{ItemList: make([]*DiffItem, 0)}
for {
raw, err := lr.readLine()
if errors.Is(err, io.EOF) && raw == "" {
break
}
if err != nil && !errors.Is(err, io.EOF) {
return nil, err
}
line := trimLineEnding(raw)
if line == "" {
continue
}
if !strings.HasPrefix(line, "diff --git ") {
// Binary file notices and other chatter do not start a file item.
continue
}
item, err := parseHgDiffItem(lr)
if err != nil {
return nil, err
}
res.ItemList = append(res.ItemList, item)
}
return res, nil
}
func parseHgDiffItem(lr *lineReader) (*DiffItem, error) {
item := &DiffItem{Header: make([]*DiffItemHeaderItem, 0)}
var file1, file2 string
sawFileHeader := false
// Extended headers, then "--- <left>".
for {
raw, err := lr.readLine()
if errors.Is(err, io.EOF) && raw == "" {
return item, nil
}
if err != nil && !errors.Is(err, io.EOF) {
return nil, err
}
line := trimLineEnding(raw)
if strings.HasPrefix(line, "diff --git ") {
lr.unreadLine(raw)
return item, nil
}
if strings.HasPrefix(line, "--- ") {
file1 = strings.TrimSpace(line[len("--- "):])
sawFileHeader = true
break
}
if line == "" {
continue
}
if h := parseHgDiffHeaderItem(line); h != nil {
item.Header = append(item.Header, h)
continue
}
// An unknown line means there is nothing more we understand for this
// file. Put it back; the outer loop will decide what to do with it.
lr.unreadLine(raw)
return item, nil
}
raw, err := lr.readLine()
if err != nil && !errors.Is(err, io.EOF) {
return nil, err
}
line := trimLineEnding(raw)
if !strings.HasPrefix(line, "+++ ") {
if raw != "" {
lr.unreadLine(raw)
}
if sawFileHeader {
item.File1 = file1
}
return item, nil
}
file2 = strings.TrimSpace(line[len("+++ "):])
item.File1 = file1
item.File2 = file2
for {
raw, err := lr.readLine()
if errors.Is(err, io.EOF) && raw == "" {
return item, nil
}
if err != nil && !errors.Is(err, io.EOF) {
return nil, err
}
line = trimLineEnding(raw)
if line == "" {
continue
}
m := reHgDiffHunk.FindStringSubmatch(line)
if m == nil {
lr.unreadLine(raw)
return item, nil
}
patch, err := parseHgDiffHunk(lr, m)
if err != nil {
return nil, err
}
item.PatchList = append(item.PatchList, patch)
}
}
func parseHgDiffHunk(lr *lineReader, m []string) (*DiffItemPatch, error) {
lStart, _ := strconv.ParseInt(m[1], 10, 64)
lCount := int64(1)
if m[2] != "" {
lCount, _ = strconv.ParseInt(m[2], 10, 64)
}
rStart, _ := strconv.ParseInt(m[3], 10, 64)
rCount := int64(1)
if m[4] != "" {
rCount, _ = strconv.ParseInt(m[4], 10, 64)
}
patch := &DiffItemPatch{
LStart: lStart,
LLineCount: lCount,
RStart: rStart,
RLineCount: rCount,
ContextLine: m[5],
LineList: make([]AnnotatedLine, 0),
}
f1 := lStart
f2 := rStart
for {
raw, err := lr.readLine()
if errors.Is(err, io.EOF) && raw == "" {
break
}
if err != nil && !errors.Is(err, io.EOF) {
break
}
if raw == "" {
break
}
if raw[0] == '\\' {
// "\ No newline at end of file" does not consume a line number.
continue
}
if raw[0] != ' ' && raw[0] != '+' && raw[0] != '-' {
lr.unreadLine(raw)
break
}
content := raw[1:]
switch raw[0] {
case ' ':
patch.LineList = append(patch.LineList, AnnotatedLine{
Type: SAME, F1LineNum: f1, F2LineNum: f2, Line: content,
})
f1++
f2++
case '+':
patch.LineList = append(patch.LineList, AnnotatedLine{
Type: APPEND, F1LineNum: f1, F2LineNum: f2, Line: content,
})
f2++
case '-':
patch.LineList = append(patch.LineList, AnnotatedLine{
Type: DELETE, F1LineNum: f1, F2LineNum: f2, Line: content,
})
f1++
}
}
return patch, nil
}
// GetDiff returns the diff of a changeset against its first parent. It runs
// hg diff --git; Mercurial has no on-disk format for a precomputed diff.
func (r *LocalHgRepository) GetDiff(commitId string) (*Diff, error) {
c, err := r.GetCommit(commitId)
if err != nil {
return nil, err
}
return r.GetDiffRev(c.Rev)
}
// GetDiffRev is GetDiff for a changelog revision number.
func (r *LocalHgRepository) GetDiffRev(rev int) (*Diff, error) {
cmd := hgCommand("diff", "--git", "--nodates", "-c", strconv.Itoa(rev))
cmd.Dir = r.RootPath
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
return nil, fmt.Errorf("hg diff: %s: %s", err, strings.TrimSpace(stderr.String()))
}
diff, err := parseHgDiff(stdout.Bytes())
if err != nil {
return nil, err
}
if rev >= 0 && rev < r.Changelog.Len() {
diff.CommitHash = r.Changelog.Entries[rev].Node
}
return diff, nil
}
// GetDiffBetween returns the diff between two revisions.
func (r *LocalHgRepository) GetDiffBetween(fromRev, toRev string) (*Diff, error) {
cmd := hgCommand("diff", "--git", "--nodates", "-r", fromRev, "-r", toRev)
cmd.Dir = r.RootPath
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
return nil, fmt.Errorf("hg diff: %s: %s", err, strings.TrimSpace(stderr.String()))
}
diff, err := parseHgDiff(stdout.Bytes())
if err != nil {
return nil, err
}
if c, err := r.GetCommit(toRev); err == nil {
diff.CommitHash = c.Id
}
return diff, nil
}