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
|
# 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."""
from __future__ import absolute_import
import os
import stat
from dulwich.objects import (
Blob,
Tree,
ZERO_SHA,
)
from .... import (
conflicts as _mod_conflicts,
)
from ....delta import TreeDelta
from ..mapping import (
default_mapping,
GitFileIdMap,
)
from ..tree import (
changes_between_git_tree_and_working_copy,
tree_delta_from_git_changes,
)
from ..workingtree import (
FLAG_STAGEMASK,
)
from ....tests import (
TestCase,
TestCaseWithTransport,
)
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'))
class TreeDeltaFromGitChangesTests(TestCase):
def test_empty(self):
delta = TreeDelta()
changes = []
self.assertEqual(
delta,
tree_delta_from_git_changes(changes, default_mapping,
(GitFileIdMap({}, default_mapping),
GitFileIdMap({}, default_mapping))))
def test_missing(self):
delta = TreeDelta()
delta.removed.append(('a', b'a-id', 'file'))
changes = [((b'a', b'a'), (stat.S_IFREG | 0o755, 0), (b'a' * 40, b'a' * 40))]
self.assertEqual(
delta,
tree_delta_from_git_changes(changes, default_mapping,
(GitFileIdMap({u'a': b'a-id'}, default_mapping),
GitFileIdMap({u'a': b'a-id'}, default_mapping))))
class ChangesBetweenGitTreeAndWorkingCopyTests(TestCaseWithTransport):
def setUp(self):
super(ChangesBetweenGitTreeAndWorkingCopyTests, self).setUp()
self.wt = self.make_branch_and_tree('.', format='git')
def expectDelta(self, expected_changes,
expected_extras=None, want_unversioned=False):
store = self.wt.branch.repository._git.object_store
try:
tree_id = 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(
store, tree_id, self.wt, want_unversioned=want_unversioned)
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(
[((None, b''), (None, stat.S_IFDIR), (None, 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(
[((None, b''), (None, stat.S_IFDIR), (None, t.id)),
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, a.id))])
def test_added_unknown_file(self):
self.build_tree(['a'])
t = Tree()
self.expectDelta(
[((None, b''), (None, stat.S_IFDIR), (None, 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(
[((None, b''), (None, stat.S_IFDIR), (None, t.id)),
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, 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(
[((None, b''), (None, stat.S_IFDIR), (None, t.id)),
((None, b'a'), (None, 0), (None, 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(
[((b'', b''), (stat.S_IFDIR, stat.S_IFDIR), (oldt.id, newt.id)),
((b'a', b'a'), (stat.S_IFREG|0o644, 0), (a.id, 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([
((b'', b''),
(stat.S_IFDIR, stat.S_IFDIR),
(oldt.id, newt.id)),
((b'a', b'a'), (stat.S_IFREG | 0o644, stat.S_IFDIR), (olda.id, newa.id))
], want_unversioned=False)
self.expectDelta([
((b'', b''),
(stat.S_IFDIR, stat.S_IFDIR),
(oldt.id, newt.id)),
((b'a', b'a'), (stat.S_IFREG | 0o644, stat.S_IFDIR), (olda.id, 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([
((None, b''),
(None, stat.S_IFDIR),
(None, newt.id)),
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, newa.id))
], [b'a'], want_unversioned=True)
|