-
Notifications
You must be signed in to change notification settings - Fork 3
Expand file tree
/
Copy pathdiff.go
More file actions
122 lines (105 loc) · 2.33 KB
/
diff.go
File metadata and controls
122 lines (105 loc) · 2.33 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
package diffence
import (
"encoding/hex"
"fmt"
"strings"
"unicode"
)
const (
pathSep = " b/"
)
// List is an interface for adding items to a list
type List interface {
Push(string)
}
// DiffItem is a diff struct for an inidividual file
type DiffItem struct {
raw string
fPath string
commit string
}
// GetHashKey returns the hash key identifier for the diff
func (d *DiffItem) GetHashKey() string {
if d.commit != "" {
return fmt.Sprintf("%s:%s", d.commit, d.fPath)
}
return d.fPath
}
// SplitDiffHashKey splits a DiffItem's hash key
func SplitDiffHashKey(s string) (string, string) {
parts := strings.Split(s, ":")
if len(parts) > 1 {
return parts[0], parts[1]
}
return "", s
}
// Diff is a list of split diffs
type Diff struct {
ignorer Matcher
Items []DiffItem
Error error
commitTmp string
}
// Push a diff on to the list
func (d *Diff) Push(s string) {
var commitHeader, commit string
if beginsWithHash(s) {
commitHeader, s = split(s, "\n")
commit = extractHash(commitHeader)
d.commitTmp = commit
}
// add commit to diffs within each diff which do not
// have the commit on the line directly above them
if d.commitTmp != "" && commit == "" {
commit = d.commitTmp
}
fPath, err := extractFilePath(s)
if err != nil {
d.Error = err
return
}
if d.ignorer != nil && d.ignorer.Match(fPath) {
return
}
d.Items = append(d.Items, DiffItem{
raw: s,
fPath: fPath,
commit: commit,
})
}
// split out logic from scan.go
func beginsWithHash(s string) bool {
if len(s) < 1 {
return false
}
hashEnd := strings.IndexFunc(s, unicode.IsSpace)
if hashEnd < 1 {
return false
}
commitHash := s[:hashEnd]
_, e := hex.DecodeString(commitHash)
return e == nil
}
func split(s, sep string) (string, string) {
// Empty string should just return empty
if len(s) == 0 {
return s, s
}
slice := strings.SplitN(s, sep, 2)
// Incase no separator was present
if len(slice) == 1 {
return slice[0], ""
}
return slice[0], slice[1]
}
func extractFilePath(in string) (string, error) {
pathBIndex := strings.Index(in, pathSep)
newLineIndex := strings.Index(in, "\n")
if pathBIndex >= 0 && newLineIndex > pathBIndex {
return in[pathBIndex+len(pathSep) : newLineIndex], nil
}
return "", fmt.Errorf("Not valid diff content:\n%s", in)
}
func extractHash(in string) string {
return strings.Fields(in)[0]
}