bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.358.2
by Jelmer Vernooij
Refresh copyright headers, add my email. |
1 |
# Copyright (C) 2010-2018 Jelmer Vernooij <jelmer@jelmer.uk>
|
|
0.262.1
by Jelmer Vernooij
Fix WorkingTree.conflicts(). |
2 |
# Copyright (C) 2011 Canonical Ltd.
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
|
0.358.1
by Jelmer Vernooij
Fix FSF address. |
16 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
0.262.1
by Jelmer Vernooij
Fix WorkingTree.conflicts(). |
17 |
|
18 |
"""Tests for Git working trees."""
|
|
19 |
||
|
0.358.3
by Jelmer Vernooij
Enable absolute import. |
20 |
from __future__ import absolute_import |
21 |
||
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
22 |
import os |
23 |
import stat |
|
24 |
||
25 |
from dulwich.objects import ( |
|
26 |
Blob, |
|
27 |
Tree, |
|
28 |
ZERO_SHA, |
|
29 |
)
|
|
30 |
||
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
31 |
from .... import ( |
32 |
conflicts as _mod_conflicts, |
|
33 |
)
|
|
34 |
from ....delta import TreeDelta |
|
35 |
from ..mapping import ( |
|
36 |
default_mapping, |
|
37 |
GitFileIdMap, |
|
38 |
)
|
|
|
6973.1.1
by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree. |
39 |
from ..tree import ( |
40 |
changes_between_git_tree_and_working_copy, |
|
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
41 |
tree_delta_from_git_changes, |
|
6973.1.1
by Jelmer Vernooij
Make InterIndexGitTree suitable for use with MemoryGitTree. |
42 |
)
|
|
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
43 |
from ..workingtree import ( |
44 |
FLAG_STAGEMASK, |
|
|
0.262.1
by Jelmer Vernooij
Fix WorkingTree.conflicts(). |
45 |
)
|
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
46 |
from ....tests import ( |
47 |
TestCase, |
|
48 |
TestCaseWithTransport, |
|
49 |
)
|
|
|
0.262.1
by Jelmer Vernooij
Fix WorkingTree.conflicts(). |
50 |
|
51 |
||
52 |
class GitWorkingTreeTests(TestCaseWithTransport): |
|
53 |
||
54 |
def setUp(self): |
|
55 |
super(GitWorkingTreeTests, self).setUp() |
|
56 |
self.tree = self.make_branch_and_tree('.', format="git") |
|
57 |
||
|
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
58 |
def test_conflict_list(self): |
|
0.369.2
by Jelmer Vernooij
Fix tests. |
59 |
self.assertIsInstance( |
60 |
self.tree.conflicts(), |
|
61 |
_mod_conflicts.ConflictList) |
|
|
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
62 |
|
63 |
def test_add_conflict(self): |
|
64 |
self.build_tree(['conflicted']) |
|
65 |
self.tree.add(['conflicted']) |
|
66 |
with self.tree.lock_tree_write(): |
|
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
67 |
self.tree.index[b'conflicted'] = self.tree.index[b'conflicted'][:9] + (FLAG_STAGEMASK, ) |
|
0.415.3
by Jelmer Vernooij
Open index on demand. |
68 |
self.tree._index_dirty = True |
|
0.369.1
by Jelmer Vernooij
Implement conflict handling. |
69 |
conflicts = self.tree.conflicts() |
70 |
self.assertEqual(1, len(conflicts)) |
|
|
0.385.1
by Jelmer Vernooij
Use specific_files argument to Tree.iter_entries_by_dir. |
71 |
|
72 |
def test_revert_empty(self): |
|
73 |
self.build_tree(['a']) |
|
74 |
self.tree.add(['a']) |
|
75 |
self.assertTrue(self.tree.is_versioned('a')) |
|
76 |
self.tree.revert(['a']) |
|
77 |
self.assertFalse(self.tree.is_versioned('a')) |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
78 |
|
79 |
||
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
80 |
class TreeDeltaFromGitChangesTests(TestCase): |
81 |
||
82 |
def test_empty(self): |
|
83 |
delta = TreeDelta() |
|
84 |
changes = [] |
|
85 |
self.assertEqual( |
|
86 |
delta, |
|
87 |
tree_delta_from_git_changes(changes, default_mapping, |
|
88 |
(GitFileIdMap({}, default_mapping), |
|
89 |
GitFileIdMap({}, default_mapping)))) |
|
90 |
||
91 |
def test_missing(self): |
|
92 |
delta = TreeDelta() |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
93 |
delta.removed.append(('a', b'a-id', 'file')) |
|
7018.3.1
by Jelmer Vernooij
Fix git cache handling. |
94 |
changes = [((b'a', b'a'), (stat.S_IFREG | 0o755, 0), (b'a' * 40, b'a' * 40))] |
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
95 |
self.assertEqual( |
96 |
delta, |
|
97 |
tree_delta_from_git_changes(changes, default_mapping, |
|
|
7018.3.2
by Jelmer Vernooij
Fix some git tests. |
98 |
(GitFileIdMap({u'a': b'a-id'}, default_mapping), |
99 |
GitFileIdMap({u'a': b'a-id'}, default_mapping)))) |
|
|
6977.1.2
by Jelmer Vernooij
Deal with missing files properly in 'bzr st'. |
100 |
|
101 |
||
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
102 |
class ChangesBetweenGitTreeAndWorkingCopyTests(TestCaseWithTransport): |
103 |
||
104 |
def setUp(self): |
|
105 |
super(ChangesBetweenGitTreeAndWorkingCopyTests, self).setUp() |
|
106 |
self.wt = self.make_branch_and_tree('.', format='git') |
|
107 |
||
108 |
def expectDelta(self, expected_changes, |
|
109 |
expected_extras=None, want_unversioned=False): |
|
110 |
store = self.wt.branch.repository._git.object_store |
|
111 |
try: |
|
112 |
tree_id = store[self.wt.branch.repository._git.head()].tree |
|
113 |
except KeyError: |
|
114 |
tree_id = None |
|
|
0.415.3
by Jelmer Vernooij
Open index on demand. |
115 |
with self.wt.lock_read(): |
116 |
changes, extras = changes_between_git_tree_and_working_copy( |
|
117 |
store, tree_id, self.wt, want_unversioned=want_unversioned) |
|
118 |
self.assertEqual(expected_changes, list(changes)) |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
119 |
if expected_extras is None: |
120 |
expected_extras = set() |
|
121 |
self.assertEqual(set(expected_extras), set(extras)) |
|
122 |
||
123 |
def test_empty(self): |
|
124 |
self.expectDelta( |
|
|
7018.3.1
by Jelmer Vernooij
Fix git cache handling. |
125 |
[((None, b''), (None, stat.S_IFDIR), (None, Tree().id))]) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
126 |
|
127 |
def test_added_file(self): |
|
128 |
self.build_tree(['a']) |
|
129 |
self.wt.add(['a']) |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
130 |
a = Blob.from_string(b'contents of a\n') |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
131 |
t = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
132 |
t.add(b"a", stat.S_IFREG | 0o644, a.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
133 |
self.expectDelta( |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
134 |
[((None, b''), (None, stat.S_IFDIR), (None, t.id)), |
135 |
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, a.id))]) |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
136 |
|
137 |
def test_added_unknown_file(self): |
|
138 |
self.build_tree(['a']) |
|
139 |
t = Tree() |
|
140 |
self.expectDelta( |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
141 |
[((None, b''), (None, stat.S_IFDIR), (None, t.id))]) |
142 |
a = Blob.from_string(b'contents of a\n') |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
143 |
t = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
144 |
t.add(b"a", stat.S_IFREG | 0o644, a.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
145 |
self.expectDelta( |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
146 |
[((None, b''), (None, stat.S_IFDIR), (None, t.id)), |
147 |
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, a.id))], |
|
148 |
[b'a'], |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
149 |
want_unversioned=True) |
150 |
||
151 |
def test_missing_added_file(self): |
|
152 |
self.build_tree(['a']) |
|
153 |
self.wt.add(['a']) |
|
154 |
os.unlink('a') |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
155 |
a = Blob.from_string(b'contents of a\n') |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
156 |
t = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
157 |
t.add(b"a", 0, ZERO_SHA) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
158 |
self.expectDelta( |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
159 |
[((None, b''), (None, stat.S_IFDIR), (None, t.id)), |
160 |
((None, b'a'), (None, 0), (None, ZERO_SHA))], |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
161 |
[])
|
162 |
||
163 |
def test_missing_versioned_file(self): |
|
164 |
self.build_tree(['a']) |
|
165 |
self.wt.add(['a']) |
|
166 |
self.wt.commit('') |
|
167 |
os.unlink('a') |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
168 |
a = Blob.from_string(b'contents of a\n') |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
169 |
oldt = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
170 |
oldt.add(b"a", stat.S_IFREG | 0o644, a.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
171 |
newt = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
172 |
newt.add(b"a", 0, ZERO_SHA) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
173 |
self.expectDelta( |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
174 |
[((b'', b''), (stat.S_IFDIR, stat.S_IFDIR), (oldt.id, newt.id)), |
175 |
((b'a', b'a'), (stat.S_IFREG|0o644, 0), (a.id, ZERO_SHA))]) |
|
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
176 |
|
177 |
def test_versioned_replace_by_dir(self): |
|
178 |
self.build_tree(['a']) |
|
179 |
self.wt.add(['a']) |
|
180 |
self.wt.commit('') |
|
181 |
os.unlink('a') |
|
182 |
os.mkdir('a') |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
183 |
olda = Blob.from_string(b'contents of a\n') |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
184 |
oldt = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
185 |
oldt.add(b"a", stat.S_IFREG | 0o644, olda.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
186 |
newt = Tree() |
187 |
newa = Tree() |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
188 |
newt.add(b"a", stat.S_IFDIR, newa.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
189 |
self.expectDelta([ |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
190 |
((b'', b''), |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
191 |
(stat.S_IFDIR, stat.S_IFDIR), |
192 |
(oldt.id, newt.id)), |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
193 |
((b'a', b'a'), (stat.S_IFREG | 0o644, stat.S_IFDIR), (olda.id, newa.id)) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
194 |
], want_unversioned=False) |
195 |
self.expectDelta([ |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
196 |
((b'', b''), |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
197 |
(stat.S_IFDIR, stat.S_IFDIR), |
198 |
(oldt.id, newt.id)), |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
199 |
((b'a', b'a'), (stat.S_IFREG | 0o644, stat.S_IFDIR), (olda.id, newa.id)) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
200 |
], want_unversioned=True) |
201 |
||
202 |
def test_extra(self): |
|
203 |
self.build_tree(['a']) |
|
|
6964.2.1
by Jelmer Vernooij
Initial work to support brz-git on python3. |
204 |
newa = Blob.from_string(b'contents of a\n') |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
205 |
newt = Tree() |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
206 |
newt.add(b"a", stat.S_IFREG | 0o644, newa.id) |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
207 |
self.expectDelta([ |
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
208 |
((None, b''), |
|
0.391.7
by Jelmer Vernooij
Fix reporting of missing files in .iter_changes. |
209 |
(None, stat.S_IFDIR), |
210 |
(None, newt.id)), |
|
|
6973.13.2
by Jelmer Vernooij
Fix some more tests. |
211 |
((None, b'a'), (None, stat.S_IFREG | 0o644), (None, newa.id)) |
212 |
], [b'a'], want_unversioned=True) |