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
|
diff --git a/range_diff.go b/range_diff.go
new file mode 100644
index 0000000..0df9b3e
--- /dev/null
+++ b/range_diff.go
@@ -0,0 +1,219 @@
+package git
+
+import (
+ "fmt"
+ "math"
+
+ "github.com/sergi/go-diff/diffmatchpatch"
+)
+
+var COST_MAX = 65536
+var RANGE_DIFF_CREATION_FACTOR_DEFAULT = 60
+
+type PatchRange struct {
+ *Patch
+ Matching int
+ Diff string
+ DiffSize int
+ Shown bool
+}
+
+func NewPatchRange(patch *Patch) *PatchRange {
+ diff := patch.CalcDiff()
+ return &PatchRange{
+ Patch: patch,
+ Matching: -1,
+ Diff: diff,
+ DiffSize: len(diff),
+ Shown: false,
+ }
+}
+
+func output(a []*PatchRange, b []*PatchRange) string {
+ out := ""
+ for i, patchA := range a {
+ if patchA.Matching == -1 {
+ out += outputPairHeader(patchA, nil, i+1, -1)
+ }
+ }
+
+ for j, patchB := range b {
+ if patchB.Matching == -1 {
+ out += outputPairHeader(nil, patchB, -1, j+1)
+ continue
+ }
+ patchA := a[patchB.Matching]
+ if patchB.ContentSha == patchA.ContentSha {
+ out += outputPairHeader(patchA, patchB, patchB.Matching+1, patchA.Matching+1)
+ }
+ }
+ return out
+}
+
+func outputPairHeader(a *PatchRange, b *PatchRange, aIndex, bIndex int) string {
+ if a == nil {
+ return fmt.Sprintf("-: ------- > %d: %s %s\n", bIndex, truncateSha(b.CommitSha), b.Title)
+ }
+ if b == nil {
+ return fmt.Sprintf("%d: %s < -: ------- %s\n", aIndex, truncateSha(a.CommitSha), a.Title)
+ }
+ return fmt.Sprintf("%d: %s = %d: %s %s\n", aIndex, truncateSha(a.CommitSha), bIndex, truncateSha(b.CommitSha), a.Title)
+}
+
+func RangeDiff(a []*Patch, b []*Patch) string {
+ aPatches := []*PatchRange{}
+ for _, patch := range a {
+ aPatches = append(aPatches, NewPatchRange(patch))
+ }
+ bPatches := []*PatchRange{}
+ for _, patch := range b {
+ bPatches = append(bPatches, NewPatchRange(patch))
+ }
+ findExactMatches(aPatches, bPatches)
+ getCorrespondences(aPatches, bPatches, RANGE_DIFF_CREATION_FACTOR_DEFAULT)
+ return output(aPatches, bPatches)
+}
+
+func findExactMatches(a []*PatchRange, b []*PatchRange) {
+ for i, patchA := range a {
+ for j, patchB := range b {
+ if patchA.ContentSha == patchB.ContentSha {
+ patchA.Matching = j
+ patchB.Matching = i
+ }
+ }
+ }
+}
+
+func createMatrix(rows, cols int) [][]int {
+ mat := make([][]int, rows)
+ for i := range mat {
+ mat[i] = make([]int, cols)
+ }
+ return mat
+}
+
+func diffsize(a *PatchRange, b *PatchRange) int {
+ dmp := diffmatchpatch.New()
+ diffs := dmp.DiffMain(a.Diff, b.Diff, false)
+ return len(dmp.DiffPrettyText(diffs))
+}
+
+func getCorrespondences(a []*PatchRange, b []*PatchRange, creationFactor int) {
+ n := len(a) + len(b)
+ fmt.Println("rows", len(a), "cols", len(b))
+ cost := createMatrix(n, n)
+
+ for i, patchA := range a {
+ var c int
+ for j, patchB := range b {
+ if patchA.Matching == j {
+ c = 0
+ } else if patchA.Matching == -1 && patchB.Matching == -1 {
+ c = diffsize(patchA, patchB)
+ } else {
+ c = COST_MAX
+ }
+ cost[i][j] = c
+ }
+ }
+
+ for j, patchB := range b {
+ creationCost := (patchB.DiffSize * creationFactor) / 100
+ if patchB.Matching >= 0 {
+ creationCost = math.MaxInt32
+ }
+ for i := len(a); i < n; i++ {
+ cost[i][j] = creationCost
+ }
+ }
+
+ for i := len(a); i < n; i++ {
+ for j := len(b); j < n; j++ {
+ cost[i][j] = 0
+ }
+ }
+
+ assignment := computeAssignment(cost, n, n)
+ for i, j := range assignment {
+ if i < len(a) && j < len(b) {
+ a[i].Matching = j
+ b[j].Matching = i
+ }
+ }
+
+ fmt.Println("cost", cost, "assignment", assignment)
+}
+
+// computeAssignment assigns patches using the Hungarian algorithm.
+func computeAssignment(costMatrix [][]int, m, n int) []int {
+ u := make([]int, m+1) // potential for workers
+ v := make([]int, n+1) // potential for jobs
+ p := make([]int, n+1) // job assignment
+ way := make([]int, n+1)
+
+ for i := 1; i <= m; i++ {
+ links := make([]int, n+1)
+ minV := make([]int, n+1)
+ used := make([]bool, n+1)
+ for j := 0; j <= n; j++ {
+ minV[j] = math.MaxInt32
+ used[j] = false
+ }
+
+ j0 := 0
+ p[0] = i
+
+ for {
+ used[j0] = true
+ i0 := p[j0]
+ delta := math.MaxInt32
+ j1 := 0
+
+ for j := 1; j <= n; j++ {
+ if !used[j] {
+ cur := costMatrix[i0-1][j-1] - u[i0] - v[j]
+ if cur < minV[j] {
+ minV[j] = cur
+ links[j] = j0
+ }
+ if minV[j] < delta {
+ delta = minV[j]
+ j1 = j
+ }
+ }
+ }
+
+ for j := 0; j <= n; j++ {
+ if used[j] {
+ u[p[j]] += delta
+ v[j] -= delta
+ } else {
+ minV[j] -= delta
+ }
+ }
+
+ j0 = j1
+ if p[j0] == 0 {
+ break
+ }
+ }
+
+ for {
+ j1 := way[j0]
+ p[j0] = p[j1]
+ j0 = j1
+ if j0 == 0 {
+ break
+ }
+ }
+ }
+
+ assignment := make([]int, m)
+ for j := 1; j <= n; j++ {
+ if p[j] > 0 {
+ assignment[p[j]-1] = j - 1
+ }
+ }
+ return assignment
+}
|