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
|
# Copyright (C) 2010-2018 Jelmer Vernooij <jelmer@jelmer.uk>
# Copyright (C) 2011 Canonical Ltd.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for Git working trees."""
import os
import stat
from dulwich import __version__ as dulwich_version
from dulwich.diff_tree import RenameDetector, tree_changes
from dulwich.index import IndexEntry
from dulwich.object_store import (
OverlayObjectStore,
)
from dulwich.objects import (
S_IFGITLINK,
Blob,
Tree,
ZERO_SHA,
)
from ... import (
conflicts as _mod_conflicts,
workingtree as _mod_workingtree,
)
from ...delta import TreeDelta
from ...bzr.inventorytree import InventoryTreeChange as TreeChange
from ..mapping import (
default_mapping,
)
from ..tree import (
tree_delta_from_git_changes,
)
from ..workingtree import (
FLAG_STAGEMASK,
)
from ...tests import (
TestCase,
TestCaseWithTransport,
)
def changes_between_git_tree_and_working_copy(source_store, from_tree_sha, target,
want_unchanged=False,
want_unversioned=False,
rename_detector=None,
include_trees=True):
"""Determine the changes between a git tree and a working tree with index.
"""
to_tree_sha, extras = target.git_snapshot(want_unversioned=want_unversioned)
store = OverlayObjectStore([source_store, target.store])
return tree_changes(
store, from_tree_sha, to_tree_sha, include_trees=include_trees,
rename_detector=rename_detector,
want_unchanged=want_unchanged, change_type_same=True), extras
class GitWorkingTreeTests(TestCaseWithTransport):
def setUp(self):
super(GitWorkingTreeTests, self).setUp()
self.tree = self.make_branch_and_tree('.', format="git")
def test_conflict_list(self):
self.assertIsInstance(
self.tree.conflicts(),
_mod_conflicts.ConflictList)
def test_add_conflict(self):
self.build_tree(['conflicted'])
self.tree.add(['conflicted'])
with self.tree.lock_tree_write():
self.tree.index[b'conflicted'] = self.tree.index[b'conflicted'][:9] + \
(FLAG_STAGEMASK, )
self.tree._index_dirty = True
conflicts = self.tree.conflicts()
self.assertEqual(1, len(conflicts))
def test_revert_empty(self):
self.build_tree(['a'])
self.tree.add(['a'])
self.assertTrue(self.tree.is_versioned('a'))
self.tree.revert(['a'])
self.assertFalse(self.tree.is_versioned('a'))
def test_is_ignored_directory(self):
self.assertFalse(self.tree.is_ignored('a'))
self.build_tree(['a/'])
self.assertFalse(self.tree.is_ignored('a'))
self.build_tree_contents([('.gitignore', 'a\n')])
self.tree._ignoremanager = None
self.assertTrue(self.tree.is_ignored('a'))
self.build_tree_contents([('.gitignore', 'a/\n')])
self.tree._ignoremanager = None
self.assertTrue(self.tree.is_ignored('a'))
def test_add_submodule_dir(self):
subtree = self.make_branch_and_tree('asub', format='git')
subtree.commit('Empty commit')
self.tree.add(['asub'])
with self.tree.lock_read():
entry = self.tree.index[b'asub']
self.assertEqual(entry.mode, S_IFGITLINK)
self.assertEqual([], list(subtree.unknowns()))
def test_add_submodule_file(self):
os.mkdir('.git/modules')
subbranch = self.make_branch('.git/modules/asub', format='git-bare')
os.mkdir('asub')
with open('asub/.git', 'w') as f:
f.write('gitdir: ../.git/modules/asub\n')
subtree = _mod_workingtree.WorkingTree.open('asub')
subtree.commit('Empty commit')
self.tree.add(['asub'])
with self.tree.lock_read():
entry = self.tree.index[b'asub']
self.assertEqual(entry.mode, S_IFGITLINK)
self.assertEqual([], list(subtree.unknowns()))
class GitWorkingTreeFileTests(TestCaseWithTransport):
def setUp(self):
super(GitWorkingTreeFileTests, self).setUp()
self.tree = self.make_branch_and_tree('actual', format="git")
self.build_tree_contents(
[('linked/',), ('linked/.git', 'gitdir: ../actual/.git')])
self.wt = _mod_workingtree.WorkingTree.open('linked')
def test_add(self):
self.build_tree(['linked/somefile'])
self.wt.add(["somefile"])
self.wt.commit("Add somefile")
class TreeDeltaFromGitChangesTests(TestCase):
def test_empty(self):
delta = TreeDelta()
changes = []
self.assertEqual(
delta,
tree_delta_from_git_changes(changes, (default_mapping, default_mapping)))
def test_missing(self):
delta = TreeDelta()
delta.removed.append(
TreeChange(
b'git:a', ('a', 'a'), False, (True, True),
(b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', None),
(True, False)))
changes = [
('remove',
(b'a', stat.S_IFREG | 0o755, b'a' * 40),
(b'a', 0, b'a' * 40))]
self.assertEqual(
delta,
tree_delta_from_git_changes(changes, (default_mapping, default_mapping)))
class ChangesBetweenGitTreeAndWorkingCopyTests(TestCaseWithTransport):
def setUp(self):
super(ChangesBetweenGitTreeAndWorkingCopyTests, self).setUp()
self.wt = self.make_branch_and_tree('.', format='git')
self.store = self.wt.branch.repository._git.object_store
def expectDelta(self, expected_changes,
expected_extras=None, want_unversioned=False,
tree_id=None, rename_detector=None):
if tree_id is None:
try:
tree_id = self.store[self.wt.branch.repository._git.head()].tree
except KeyError:
tree_id = None
with self.wt.lock_read():
changes, extras = changes_between_git_tree_and_working_copy(
self.store, tree_id, self.wt, want_unversioned=want_unversioned,
rename_detector=rename_detector)
self.assertEqual(expected_changes, list(changes))
if expected_extras is None:
expected_extras = set()
self.assertEqual(set(expected_extras), set(extras))
def test_empty(self):
self.expectDelta(
[('add', (None, None, None), (b'', stat.S_IFDIR, Tree().id))])
def test_added_file(self):
self.build_tree(['a'])
self.wt.add(['a'])
a = Blob.from_string(b'contents of a\n')
t = Tree()
t.add(b"a", stat.S_IFREG | 0o644, a.id)
self.expectDelta(
[('add', (None, None, None), (b'', stat.S_IFDIR, t.id)),
('add', (None, None, None), (b'a', stat.S_IFREG | 0o644, a.id))])
def test_renamed_file(self):
self.build_tree(['a'])
self.wt.add(['a'])
self.wt.rename_one('a', 'b')
a = Blob.from_string(b'contents of a\n')
self.store.add_object(a)
oldt = Tree()
oldt.add(b"a", stat.S_IFREG | 0o644, a.id)
self.store.add_object(oldt)
newt = Tree()
newt.add(b"b", stat.S_IFREG | 0o644, a.id)
self.store.add_object(newt)
self.expectDelta(
[('modify', (b'', stat.S_IFDIR, oldt.id), (b'', stat.S_IFDIR, newt.id)),
('delete', (b'a', stat.S_IFREG | 0o644, a.id), (None, None, None)),
('add', (None, None, None), (b'b', stat.S_IFREG | 0o644, a.id)),
],
tree_id=oldt.id)
if dulwich_version >= (0, 19, 15):
self.expectDelta(
[('modify', (b'', stat.S_IFDIR, oldt.id), (b'', stat.S_IFDIR, newt.id)),
('rename', (b'a', stat.S_IFREG | 0o644, a.id), (b'b', stat.S_IFREG | 0o644, a.id))],
tree_id=oldt.id, rename_detector=RenameDetector(self.store))
def test_copied_file(self):
self.build_tree(['a'])
self.wt.add(['a'])
self.wt.copy_one('a', 'b')
a = Blob.from_string(b'contents of a\n')
self.store.add_object(a)
oldt = Tree()
oldt.add(b"a", stat.S_IFREG | 0o644, a.id)
self.store.add_object(oldt)
newt = Tree()
newt.add(b"a", stat.S_IFREG | 0o644, a.id)
newt.add(b"b", stat.S_IFREG | 0o644, a.id)
self.store.add_object(newt)
self.expectDelta(
[('modify', (b'', stat.S_IFDIR, oldt.id), (b'', stat.S_IFDIR, newt.id)),
('add', (None, None, None), (b'b', stat.S_IFREG | 0o644, a.id)),
],
tree_id=oldt.id)
if dulwich_version >= (0, 19, 15):
self.expectDelta(
[('modify', (b'', stat.S_IFDIR, oldt.id), (b'', stat.S_IFDIR, newt.id)),
('copy', (b'a', stat.S_IFREG | 0o644, a.id), (b'b', stat.S_IFREG | 0o644, a.id))],
tree_id=oldt.id, rename_detector=RenameDetector(self.store, find_copies_harder=True))
self.expectDelta(
[('modify', (b'', stat.S_IFDIR, oldt.id), (b'', stat.S_IFDIR, newt.id)),
('add', (None, None, None), (b'b', stat.S_IFREG | 0o644, a.id)),
],
tree_id=oldt.id, rename_detector=RenameDetector(self.store, find_copies_harder=False))
def test_added_unknown_file(self):
self.build_tree(['a'])
t = Tree()
self.expectDelta(
[('add', (None, None, None), (b'', stat.S_IFDIR, t.id))])
a = Blob.from_string(b'contents of a\n')
t = Tree()
t.add(b"a", stat.S_IFREG | 0o644, a.id)
self.expectDelta(
[('add', (None, None, None), (b'', stat.S_IFDIR, t.id)),
('add', (None, None, None), (b'a', stat.S_IFREG | 0o644, a.id))],
[b'a'],
want_unversioned=True)
def test_missing_added_file(self):
self.build_tree(['a'])
self.wt.add(['a'])
os.unlink('a')
a = Blob.from_string(b'contents of a\n')
t = Tree()
t.add(b"a", 0, ZERO_SHA)
self.expectDelta(
[('add', (None, None, None), (b'', stat.S_IFDIR, t.id)),
('add', (None, None, None), (b'a', 0, ZERO_SHA))],
[])
def test_missing_versioned_file(self):
self.build_tree(['a'])
self.wt.add(['a'])
self.wt.commit('')
os.unlink('a')
a = Blob.from_string(b'contents of a\n')
oldt = Tree()
oldt.add(b"a", stat.S_IFREG | 0o644, a.id)
newt = Tree()
newt.add(b"a", 0, ZERO_SHA)
self.expectDelta(
[('modify',
(b'', stat.S_IFDIR, oldt.id),
(b'', stat.S_IFDIR, newt.id)),
('modify',
(b'a', stat.S_IFREG | 0o644, a.id),
(b'a', 0, ZERO_SHA))])
def test_versioned_replace_by_dir(self):
self.build_tree(['a'])
self.wt.add(['a'])
self.wt.commit('')
os.unlink('a')
os.mkdir('a')
olda = Blob.from_string(b'contents of a\n')
oldt = Tree()
oldt.add(b"a", stat.S_IFREG | 0o644, olda.id)
newt = Tree()
newa = Tree()
newt.add(b"a", stat.S_IFDIR, newa.id)
self.expectDelta([
('modify',
(b'', stat.S_IFDIR, oldt.id),
(b'', stat.S_IFDIR, newt.id)),
('modify',
(b'a', stat.S_IFREG | 0o644, olda.id),
(b'a', stat.S_IFDIR, newa.id))
], want_unversioned=False)
self.expectDelta([
('modify',
(b'', stat.S_IFDIR, oldt.id),
(b'', stat.S_IFDIR, newt.id)),
('modify',
(b'a', stat.S_IFREG | 0o644, olda.id),
(b'a', stat.S_IFDIR, newa.id)),
], want_unversioned=True)
def test_extra(self):
self.build_tree(['a'])
newa = Blob.from_string(b'contents of a\n')
newt = Tree()
newt.add(b"a", stat.S_IFREG | 0o644, newa.id)
self.expectDelta([
('add',
(None, None, None),
(b'', stat.S_IFDIR, newt.id)),
('add',
(None, None, None),
(b'a', stat.S_IFREG | 0o644, newa.id)),
], [b'a'], want_unversioned=True)
def test_submodule(self):
self.subtree = self.make_branch_and_tree('a', format="git")
a = Blob.from_string(b'irrelevant\n')
self.build_tree_contents([('a/.git/HEAD', a.id)])
with self.wt.lock_tree_write():
(index, index_path) = self.wt._lookup_index(b'a')
index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
self.wt._index_dirty = True
t = Tree()
t.add(b"a", S_IFGITLINK, a.id)
self.store.add_object(t)
self.expectDelta([], tree_id=t.id)
def test_submodule_not_checked_out(self):
a = Blob.from_string(b'irrelevant\n')
with self.wt.lock_tree_write():
(index, index_path) = self.wt._lookup_index(b'a')
index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
self.wt._index_dirty = True
os.mkdir(self.wt.abspath('a'))
t = Tree()
t.add(b"a", S_IFGITLINK, a.id)
self.store.add_object(t)
self.expectDelta([], tree_id=t.id)
|