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
|
package diff
import (
"bytes"
"fmt"
"io"
"path/filepath"
"time"
)
// PrintMultiFileDiff prints a multi-file diff in unified diff format.
func PrintMultiFileDiff(ds []*FileDiff) ([]byte, error) {
var buf bytes.Buffer
for _, d := range ds {
diff, err := PrintFileDiff(d)
if err != nil {
return nil, err
}
if _, err := buf.Write(diff); err != nil {
return nil, err
}
}
return buf.Bytes(), nil
}
// PrintFileDiff prints a FileDiff in unified diff format.
//
// TODO(sqs): handle escaping whitespace/etc. chars in filenames
func PrintFileDiff(d *FileDiff) ([]byte, error) {
var buf bytes.Buffer
for _, xheader := range d.Extended {
if _, err := fmt.Fprintln(&buf, xheader); err != nil {
return nil, err
}
}
// FileDiff is added/deleted file
// No further hunks printing needed
if d.NewName == "" {
_, err := fmt.Fprintf(&buf, onlyInMessage, filepath.Dir(d.OrigName), filepath.Base(d.OrigName))
if err != nil {
return nil, err
}
return buf.Bytes(), nil
}
if d.Hunks == nil {
return buf.Bytes(), nil
}
if err := printFileHeader(&buf, "--- ", d.OrigName, d.OrigTime); err != nil {
return nil, err
}
if err := printFileHeader(&buf, "+++ ", d.NewName, d.NewTime); err != nil {
return nil, err
}
ph, err := PrintHunks(d.Hunks)
if err != nil {
return nil, err
}
if _, err := buf.Write(ph); err != nil {
return nil, err
}
return buf.Bytes(), nil
}
func printFileHeader(w io.Writer, prefix string, filename string, timestamp *time.Time) error {
if _, err := fmt.Fprint(w, prefix, filename); err != nil {
return err
}
if timestamp != nil {
if _, err := fmt.Fprint(w, "\t", timestamp.Format(diffTimeFormatLayout)); err != nil {
return err
}
}
if _, err := fmt.Fprintln(w); err != nil {
return err
}
return nil
}
// PrintHunks prints diff hunks in unified diff format.
func PrintHunks(hunks []*Hunk) ([]byte, error) {
var buf bytes.Buffer
for _, hunk := range hunks {
_, err := fmt.Fprintf(&buf,
"@@ -%d,%d +%d,%d @@", hunk.OrigStartLine, hunk.OrigLines, hunk.NewStartLine, hunk.NewLines,
)
if err != nil {
return nil, err
}
if hunk.Section != "" {
_, err := fmt.Fprint(&buf, " ", hunk.Section)
if err != nil {
return nil, err
}
}
if _, err := fmt.Fprintln(&buf); err != nil {
return nil, err
}
if hunk.OrigNoNewlineAt == 0 {
if _, err := buf.Write(hunk.Body); err != nil {
return nil, err
}
} else {
if _, err := buf.Write(hunk.Body[:hunk.OrigNoNewlineAt]); err != nil {
return nil, err
}
if err := printNoNewlineMessage(&buf); err != nil {
return nil, err
}
if _, err := buf.Write(hunk.Body[hunk.OrigNoNewlineAt:]); err != nil {
return nil, err
}
}
if !bytes.HasSuffix(hunk.Body, []byte{'\n'}) {
if _, err := fmt.Fprintln(&buf); err != nil {
return nil, err
}
if err := printNoNewlineMessage(&buf); err != nil {
return nil, err
}
}
}
return buf.Bytes(), nil
}
func printNoNewlineMessage(w io.Writer) error {
if _, err := w.Write([]byte(noNewlineMessage)); err != nil {
return err
}
if _, err := fmt.Fprintln(w); err != nil {
return err
}
return nil
}
|
