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
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
|
package object
import (
"os"
"sort"
"srcd.works/go-git.v4/plumbing"
"srcd.works/go-git.v4/plumbing/format/packfile"
"srcd.works/go-git.v4/plumbing/storer"
"srcd.works/go-git.v4/storage/filesystem"
"srcd.works/go-git.v4/storage/memory"
"srcd.works/go-git.v4/utils/merkletrie"
"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
)
type DiffTreeSuite struct {
fixtures.Suite
Storer storer.EncodedObjectStorer
Fixture *fixtures.Fixture
cache map[string]storer.EncodedObjectStorer
}
func (s *DiffTreeSuite) SetUpSuite(c *C) {
s.Suite.SetUpSuite(c)
s.Fixture = fixtures.Basic().One()
sto, err := filesystem.NewStorage(s.Fixture.DotGit())
c.Assert(err, IsNil)
s.Storer = sto
s.cache = make(map[string]storer.EncodedObjectStorer)
}
func (s *DiffTreeSuite) commitFromStorer(c *C, sto storer.EncodedObjectStorer,
h plumbing.Hash) *Commit {
commit, err := GetCommit(sto, h)
c.Assert(err, IsNil)
return commit
}
func (s *DiffTreeSuite) storageFromPackfile(f *fixtures.Fixture) storer.EncodedObjectStorer {
sto, ok := s.cache[f.URL]
if ok {
return sto
}
sto = memory.NewStorage()
pf := f.Packfile()
defer pf.Close()
n := packfile.NewScanner(pf)
d, err := packfile.NewDecoder(n, sto)
if err != nil {
panic(err)
}
_, err = d.Decode()
if err != nil {
panic(err)
}
s.cache[f.URL] = sto
return sto
}
var _ = Suite(&DiffTreeSuite{})
type expectChange struct {
Action merkletrie.Action
Name string
}
func assertChanges(a Changes, c *C) {
for _, changes := range a {
action, err := changes.Action()
c.Assert(err, IsNil)
switch action {
case merkletrie.Insert:
c.Assert(changes.From.Tree, IsNil)
c.Assert(changes.To.Tree, NotNil)
case merkletrie.Delete:
c.Assert(changes.From.Tree, NotNil)
c.Assert(changes.To.Tree, IsNil)
case merkletrie.Modify:
c.Assert(changes.From.Tree, NotNil)
c.Assert(changes.To.Tree, NotNil)
default:
c.Fatalf("unknown action: %d", action)
}
}
}
func equalChanges(a Changes, b []expectChange, c *C) bool {
if len(a) != len(b) {
return false
}
sort.Sort(a)
for i, va := range a {
vb := b[i]
action, err := va.Action()
c.Assert(err, IsNil)
if action != vb.Action || va.name() != vb.Name {
return false
}
}
return true
}
func (s *DiffTreeSuite) TestDiffTree(c *C) {
for i, t := range []struct {
repository string // the repo name as in localRepos
commit1 string // the commit of the first tree
commit2 string // the commit of the second tree
expected []expectChange // the expected list of []changeExpect
}{
{
"https://github.com/dezfowler/LiteMock.git",
"",
"",
[]expectChange{},
},
{
"https://github.com/dezfowler/LiteMock.git",
"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
[]expectChange{},
},
{
"https://github.com/dezfowler/LiteMock.git",
"",
"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
[]expectChange{
{Action: merkletrie.Insert, Name: "README"},
},
},
{
"https://github.com/dezfowler/LiteMock.git",
"b7965eaa2c4f245d07191fe0bcfe86da032d672a",
"",
[]expectChange{
{Action: merkletrie.Delete, Name: "README"},
},
},
{
"https://github.com/githubtraining/example-branches.git",
"",
"f0eb272cc8f77803478c6748103a1450aa1abd37",
[]expectChange{
{Action: merkletrie.Insert, Name: "README.md"},
},
},
{
"https://github.com/githubtraining/example-branches.git",
"f0eb272cc8f77803478c6748103a1450aa1abd37",
"",
[]expectChange{
{Action: merkletrie.Delete, Name: "README.md"},
},
},
{
"https://github.com/githubtraining/example-branches.git",
"f0eb272cc8f77803478c6748103a1450aa1abd37",
"f0eb272cc8f77803478c6748103a1450aa1abd37",
[]expectChange{},
},
{
"https://github.com/github/gem-builder.git",
"",
"9608eed92b3839b06ebf72d5043da547de10ce85",
[]expectChange{
{Action: merkletrie.Insert, Name: "README"},
{Action: merkletrie.Insert, Name: "gem_builder.rb"},
{Action: merkletrie.Insert, Name: "gem_eval.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"9608eed92b3839b06ebf72d5043da547de10ce85",
"",
[]expectChange{
{Action: merkletrie.Delete, Name: "README"},
{Action: merkletrie.Delete, Name: "gem_builder.rb"},
{Action: merkletrie.Delete, Name: "gem_eval.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"9608eed92b3839b06ebf72d5043da547de10ce85",
"9608eed92b3839b06ebf72d5043da547de10ce85",
[]expectChange{},
},
{
"https://github.com/toqueteos/ts3.git",
"",
"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
[]expectChange{
{Action: merkletrie.Insert, Name: "README.markdown"},
{Action: merkletrie.Insert, Name: "examples/bot.go"},
{Action: merkletrie.Insert, Name: "examples/raw_shell.go"},
{Action: merkletrie.Insert, Name: "helpers.go"},
{Action: merkletrie.Insert, Name: "ts3.go"},
},
},
{
"https://github.com/toqueteos/ts3.git",
"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
"",
[]expectChange{
{Action: merkletrie.Delete, Name: "README.markdown"},
{Action: merkletrie.Delete, Name: "examples/bot.go"},
{Action: merkletrie.Delete, Name: "examples/raw_shell.go"},
{Action: merkletrie.Delete, Name: "helpers.go"},
{Action: merkletrie.Delete, Name: "ts3.go"},
},
},
{
"https://github.com/toqueteos/ts3.git",
"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
"764e914b75d6d6df1fc5d832aa9840f590abf1bb",
[]expectChange{},
},
{
"https://github.com/github/gem-builder.git",
"9608eed92b3839b06ebf72d5043da547de10ce85",
"6c41e05a17e19805879689414026eb4e279f7de0",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"6c41e05a17e19805879689414026eb4e279f7de0",
"89be3aac2f178719c12953cc9eaa23441f8d9371",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
{Action: merkletrie.Insert, Name: "gem_eval_test.rb"},
{Action: merkletrie.Insert, Name: "security.rb"},
{Action: merkletrie.Insert, Name: "security_test.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"89be3aac2f178719c12953cc9eaa23441f8d9371",
"597240b7da22d03ad555328f15abc480b820acc0",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"597240b7da22d03ad555328f15abc480b820acc0",
"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
{Action: merkletrie.Modify, Name: "gem_eval_test.rb"},
{Action: merkletrie.Insert, Name: "lazy_dir.rb"},
{Action: merkletrie.Insert, Name: "lazy_dir_test.rb"},
{Action: merkletrie.Modify, Name: "security.rb"},
{Action: merkletrie.Modify, Name: "security_test.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
"597240b7da22d03ad555328f15abc480b820acc0",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
{Action: merkletrie.Modify, Name: "gem_eval_test.rb"},
{Action: merkletrie.Delete, Name: "lazy_dir.rb"},
{Action: merkletrie.Delete, Name: "lazy_dir_test.rb"},
{Action: merkletrie.Modify, Name: "security.rb"},
{Action: merkletrie.Modify, Name: "security_test.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"0260380e375d2dd0e1a8fcab15f91ce56dbe778e",
"ca9fd470bacb6262eb4ca23ee48bb2f43711c1ff",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
{Action: merkletrie.Modify, Name: "security.rb"},
{Action: merkletrie.Modify, Name: "security_test.rb"},
},
},
{
"https://github.com/github/gem-builder.git",
"fe3c86745f887c23a0d38c85cfd87ca957312f86",
"b7e3f636febf7a0cd3ab473b6d30081786d2c5b6",
[]expectChange{
{Action: merkletrie.Modify, Name: "gem_eval.rb"},
{Action: merkletrie.Modify, Name: "gem_eval_test.rb"},
{Action: merkletrie.Insert, Name: "git_mock"},
{Action: merkletrie.Modify, Name: "lazy_dir.rb"},
{Action: merkletrie.Modify, Name: "lazy_dir_test.rb"},
{Action: merkletrie.Modify, Name: "security.rb"},
},
},
{
"https://github.com/rumpkernel/rumprun-xen.git",
"1831e47b0c6db750714cd0e4be97b5af17fb1eb0",
"51d8515578ea0c88cc8fc1a057903675cf1fc16c",
[]expectChange{
{Action: merkletrie.Modify, Name: "Makefile"},
{Action: merkletrie.Modify, Name: "netbsd_init.c"},
{Action: merkletrie.Modify, Name: "rumphyper_stubs.c"},
{Action: merkletrie.Delete, Name: "sysproxy.c"},
},
},
{
"https://github.com/rumpkernel/rumprun-xen.git",
"1831e47b0c6db750714cd0e4be97b5af17fb1eb0",
"e13e678f7ee9badd01b120889e0ec5fdc8ae3802",
[]expectChange{
{Action: merkletrie.Modify, Name: "app-tools/rumprun"},
},
},
} {
f := fixtures.ByURL(t.repository).One()
sto := s.storageFromPackfile(f)
var tree1, tree2 *Tree
var err error
if t.commit1 != "" {
tree1, err = s.commitFromStorer(c, sto,
plumbing.NewHash(t.commit1)).Tree()
c.Assert(err, IsNil,
Commentf("subtest %d: unable to retrieve tree from commit %s and repo %s: %s", i, t.commit1, t.repository, err))
}
if t.commit2 != "" {
tree2, err = s.commitFromStorer(c, sto,
plumbing.NewHash(t.commit2)).Tree()
c.Assert(err, IsNil,
Commentf("subtest %d: unable to retrieve tree from commit %s and repo %s", i, t.commit2, t.repository, err))
}
obtained, err := DiffTree(tree1, tree2)
c.Assert(err, IsNil,
Commentf("subtest %d: unable to calculate difftree: %s", i, err))
obtainedFromMethod, err := tree1.Diff(tree2)
c.Assert(err, IsNil,
Commentf("subtest %d: unable to calculate difftree: %s. Result calling Diff method from Tree object returns an error", i, err))
c.Assert(obtained, DeepEquals, obtainedFromMethod)
c.Assert(equalChanges(obtained, t.expected, c), Equals, true,
Commentf("subtest:%d\nrepo=%s\ncommit1=%s\ncommit2=%s\nexpected=%s\nobtained=%s",
i, t.repository, t.commit1, t.commit2, t.expected, obtained))
assertChanges(obtained, c)
}
}
func (s *DiffTreeSuite) TestIssue279(c *C) {
// HashEqual should ignore files if the only change is from a 100664
// mode to a 100644 or vice versa.
from := &treeNoder{
hash: plumbing.NewHash("d08e895238bac36d8220586fdc28c27e1a7a76d3"),
mode: os.FileMode(0100664),
}
to := &treeNoder{
hash: plumbing.NewHash("d08e895238bac36d8220586fdc28c27e1a7a76d3"),
mode: os.FileMode(0100644),
}
c.Assert(hashEqual(from, to), Equals, true)
c.Assert(hashEqual(to, from), Equals, true)
// but should detect if the contents of the file also changed.
to = &treeNoder{
hash: plumbing.NewHash("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
mode: os.FileMode(0100644),
}
c.Assert(hashEqual(from, to), Equals, false)
c.Assert(hashEqual(to, from), Equals, false)
}
|