/
git.go
300 lines (275 loc) · 7.37 KB
/
git.go
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
// Copyright (c) 2019, The Gide Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package vcs
import (
"bufio"
"bytes"
"fmt"
"log"
"path/filepath"
"strconv"
"strings"
"github.com/Masterminds/vcs"
)
type GitRepo struct {
vcs.GitRepo
}
func (gr *GitRepo) Files() (Files, error) {
f := make(Files, 1000)
out, err := gr.RunFromDir("git", "ls-files", "-o") // other -- untracked
if err != nil {
return nil, err
}
scan := bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Untracked
}
out, err = gr.RunFromDir("git", "ls-files", "-c") // cached = all in repo
if err != nil {
return nil, err
}
scan = bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Stored
}
out, err = gr.RunFromDir("git", "ls-files", "-m") // modified
if err != nil {
return nil, err
}
scan = bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Modified
}
out, err = gr.RunFromDir("git", "ls-files", "-d") // deleted
if err != nil {
return nil, err
}
scan = bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Deleted
}
out, err = gr.RunFromDir("git", "ls-files", "-u") // unmerged
if err != nil {
return nil, err
}
scan = bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Conflicted
}
out, err = gr.RunFromDir("git", "diff", "--name-only", "--diff-filter=A", "HEAD") // deleted
if err != nil {
return nil, err
}
scan = bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
fn := filepath.FromSlash(string(scan.Bytes()))
f[fn] = Added
}
return f, nil
}
func (gr *GitRepo) CharToStat(stat byte) FileStatus {
switch stat {
case 'M':
return Modified
case 'A':
return Added
case 'D':
return Deleted
case 'U':
return Conflicted
case '?', '!':
return Untracked
}
return Untracked
}
// Status returns status of given file -- returns Untracked on any error
func (gr *GitRepo) Status(fname string) (FileStatus, string) {
out, err := gr.RunFromDir("git", "status", "--porcelain", RelPath(gr, fname))
if err != nil {
return Untracked, err.Error()
}
ostr := string(out)
if ostr == "" {
return Stored, ""
}
sf := strings.Fields(ostr)
if len(sf) < 2 {
return Stored, ostr
}
stat := sf[0][0]
return gr.CharToStat(stat), ostr
}
// Add adds the file to the repo
func (gr *GitRepo) Add(fname string) error {
out, err := gr.RunFromDir("git", "add", RelPath(gr, fname))
if err != nil {
log.Println(string(out))
return err
}
return nil
}
// Move moves updates the repo with the rename
func (gr *GitRepo) Move(oldpath, newpath string) error {
out, err := gr.RunFromDir("git", "mv", RelPath(gr, oldpath), RelPath(gr, newpath))
// if err != nil {
// log.Println(string(out))
// fmt.Printf("%s\n", out)
// return err
// }
out, err = gr.RunFromDir("git", "add", RelPath(gr, newpath))
if err != nil {
log.Println(string(out))
return err
}
return nil
}
// Delete removes the file from the repo -- uses "force" option to ensure deletion
func (gr *GitRepo) Delete(fname string) error {
out, err := gr.RunFromDir("git", "rm", "-f", RelPath(gr, fname))
if err != nil {
log.Println(string(out))
fmt.Printf("%s\n", out)
return err
}
return nil
}
// Delete removes the file from the repo
func (gr *GitRepo) DeleteRemote(fname string) error {
out, err := gr.RunFromDir("git", "rm", "--cached", RelPath(gr, fname))
if err != nil {
log.Println(string(out))
return err
}
return nil
}
// CommitFile commits single file to repo staging
func (gr *GitRepo) CommitFile(fname string, message string) error {
out, err := gr.RunFromDir("git", "commit", RelPath(gr, fname), "-m", message)
if err != nil {
log.Println(string(out))
return err
}
return nil
}
// RevertFile reverts a single file to last commit of master
func (gr *GitRepo) RevertFile(fname string) error {
out, err := gr.RunFromDir("git", "checkout", RelPath(gr, fname))
if err != nil {
log.Println(string(out))
return err
}
return nil
}
// FileContents returns the contents of given file, as a []byte array
// at given revision specifier (if empty, defaults to current HEAD).
// -1, -2 etc also work as universal ways of specifying prior revisions.
func (gr *GitRepo) FileContents(fname string, rev string) ([]byte, error) {
if rev == "" {
rev = "HEAD:"
} else if rev[0] == '-' {
rsp, err := strconv.Atoi(rev)
if err == nil && rsp < 0 {
rev = fmt.Sprintf("HEAD~%d:", -rsp)
}
} else {
rev += ":"
}
fspec := rev + RelPath(gr, fname)
out, err := gr.RunFromDir("git", "show", fspec)
if err != nil {
log.Println(string(out))
return nil, err
}
return out, nil
}
// FieldsThroughDelim gets the concatenated byte through to point where
// field ends with given delimiter, starting at given index
func FieldsThroughDelim(flds [][]byte, delim byte, idx int) (int, string) {
ln := len(flds)
for i := idx; i < ln; i++ {
fld := flds[i]
fsz := len(fld)
if fld[fsz-1] == delim {
str := string(bytes.Join(flds[idx:i+1], []byte(" ")))
return i + 1, str[:len(str)-1]
}
}
return ln, string(bytes.Join(flds[idx:ln], []byte(" ")))
}
// Log returns the log history of commits for given filename
// (or all files if empty). If since is non-empty, it should be
// a date-like expression that the VCS will understand, such as
// 1/1/2020, yesterday, last year, etc
func (gr *GitRepo) Log(fname string, since string) (Log, error) {
args := []string{"log", "--all"}
if since != "" {
args = append(args, `--since="`+since+`"`)
}
args = append(args, `--pretty=format:%h %ad} %an} %ae} %s`)
if fname != "" {
args = append(args, fname)
}
out, err := gr.RunFromDir("git", args...)
if err != nil {
return nil, err
}
var lg Log
scan := bufio.NewScanner(bytes.NewReader(out))
for scan.Scan() {
ln := scan.Bytes()
flds := bytes.Fields(ln)
if len(flds) < 4 {
continue
}
rev := string(flds[0])
ni, date := FieldsThroughDelim(flds, '}', 1)
ni, author := FieldsThroughDelim(flds, '}', ni)
ni, email := FieldsThroughDelim(flds, '}', ni)
msg := string(bytes.Join(flds[ni:], []byte(" ")))
lg.Add(rev, date, author, email, msg)
}
return lg, nil
}
// CommitDesc returns the full textual description of the given commit,
// if rev is empty, defaults to current HEAD, -1, -2 etc also work as universal
// ways of specifying prior revisions.
// Optionally includes diffs for the changes (otherwise just a list of files
// with modification status).
func (gr *GitRepo) CommitDesc(rev string, diffs bool) ([]byte, error) {
if rev == "" {
rev = "HEAD"
} else if rev[0] == '-' {
rsp, err := strconv.Atoi(rev)
if err == nil && rsp < 0 {
rev = fmt.Sprintf("HEAD~%d", -rsp)
}
}
var out []byte
var err error
if diffs {
out, err = gr.RunFromDir("git", "show", rev)
} else {
out, err = gr.RunFromDir("git", "show", "--name-status", rev)
}
if err != nil {
log.Println(string(out))
return nil, err
}
return out, nil
}
// Blame returns an annotated report about the file, showing which revision last
// modified each line.
func (gr *GitRepo) Blame(fname string) ([]byte, error) {
out, err := gr.RunFromDir("git", "blame", fname)
if err != nil {
log.Println(string(out))
return nil, err
}
return out, nil
}