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
|
# Copyright (C) 2007 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 interface conformance of inventories of working trees."""
import os
from bzrlib import inventory, tests
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
class TestRevert(TestCaseWithWorkingTree):
def test_dangling_id(self):
wt = self.make_branch_and_tree('b1')
wt.lock_tree_write()
self.addCleanup(wt.unlock)
self.assertEqual(len(wt.all_file_ids()), 1)
with open('b1/a', 'wb') as f: f.write('a test\n')
wt.add('a')
self.assertEqual(len(wt.all_file_ids()), 2)
wt.flush() # workaround revert doing wt._write_inventory for now.
os.unlink('b1/a')
wt.revert()
self.assertEqual(len(wt.all_file_ids()), 1)
class TestApplyInventoryDelta(TestCaseWithWorkingTree):
def setUp(self):
super(TestApplyInventoryDelta, self).setUp()
if not self.bzrdir_format.repository_format.supports_full_versioned_files:
raise tests.TestNotApplicable(
"format does not support inventory deltas")
def test_add(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
self.addCleanup(wt.unlock)
root_id = wt.get_root_id()
wt.apply_inventory_delta([(None, 'bar/foo', 'foo-id',
inventory.InventoryFile('foo-id', 'foo', parent_id='bar-id')),
(None, 'bar', 'bar-id', inventory.InventoryDirectory('bar-id',
'bar', parent_id=root_id))])
self.assertEqual('bar/foo', wt.id2path('foo-id'))
self.assertEqual('bar', wt.id2path('bar-id'))
def test_remove(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
self.addCleanup(wt.unlock)
self.build_tree(['foo/', 'foo/bar'])
wt.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
wt.apply_inventory_delta([('foo', None, 'foo-id', None),
('foo/bar', None, 'bar-id', None)])
self.assertIs(None, wt.path2id('foo'))
def test_rename_dir_with_children(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
root_id = wt.get_root_id()
self.addCleanup(wt.unlock)
self.build_tree(['foo/', 'foo/bar'])
wt.add(['foo', 'foo/bar'],
['foo-id', 'bar-id'])
wt.apply_inventory_delta([('foo', 'baz', 'foo-id',
inventory.InventoryDirectory('foo-id', 'baz', root_id))])
# foo/bar should have been followed the rename of its parent to baz/bar
self.assertEqual('baz', wt.id2path('foo-id'))
self.assertEqual('baz/bar', wt.id2path('bar-id'))
def test_rename_dir_with_children_with_children(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
root_id = wt.get_root_id()
self.addCleanup(wt.unlock)
self.build_tree(['foo/', 'foo/bar/', 'foo/bar/baz'])
wt.add(['foo', 'foo/bar', 'foo/bar/baz'],
['foo-id', 'bar-id', 'baz-id'])
wt.apply_inventory_delta([('foo', 'quux', 'foo-id',
inventory.InventoryDirectory('foo-id', 'quux', root_id))])
# foo/bar/baz should have been followed the rename of its parent's
# parent to quux/bar/baz
self.assertEqual('quux/bar/baz', wt.id2path('baz-id'))
def test_rename_file(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
self.addCleanup(wt.unlock)
self.build_tree(['foo/', 'foo/bar', 'baz/'])
wt.add(['foo', 'foo/bar', 'baz'],
['foo-id', 'bar-id', 'baz-id'])
wt.apply_inventory_delta([('foo/bar', 'baz/bar', 'bar-id',
inventory.InventoryFile('bar-id', 'bar', 'baz-id'))])
self.assertEqual('baz/bar', wt.id2path('bar-id'))
def test_rename_swap(self):
"""Test the swap-names edge case.
foo and bar should swap names, but retain their children. If this
works, any simpler rename ought to work.
"""
wt = self.make_branch_and_tree('.')
wt.lock_write()
root_id = wt.get_root_id()
self.addCleanup(wt.unlock)
self.build_tree(['foo/', 'foo/bar', 'baz/', 'baz/qux'])
wt.add(['foo', 'foo/bar', 'baz', 'baz/qux'],
['foo-id', 'bar-id', 'baz-id', 'qux-id'])
wt.apply_inventory_delta([('foo', 'baz', 'foo-id',
inventory.InventoryDirectory('foo-id', 'baz', root_id)),
('baz', 'foo', 'baz-id',
inventory.InventoryDirectory('baz-id', 'foo', root_id))])
self.assertEqual('baz/bar', wt.id2path('bar-id'))
self.assertEqual('foo/qux', wt.id2path('qux-id'))
def test_child_rename_ordering(self):
"""Test the rename-parent, move child edge case.
(A naive implementation may move the parent first, and then be
unable to find the child.)
"""
wt = self.make_branch_and_tree('.')
root_id = wt.get_root_id()
self.build_tree(['dir/', 'dir/child', 'other/'])
wt.add(['dir', 'dir/child', 'other'],
['dir-id', 'child-id', 'other-id'])
# this delta moves dir-id to dir2 and reparents
# child-id to a parent of other-id
wt.apply_inventory_delta([('dir', 'dir2', 'dir-id',
inventory.InventoryDirectory('dir-id', 'dir2', root_id)),
('dir/child', 'other/child', 'child-id',
inventory.InventoryFile('child-id', 'child', 'other-id'))])
self.assertEqual('dir2', wt.id2path('dir-id'))
self.assertEqual('other/child', wt.id2path('child-id'))
def test_replace_root(self):
wt = self.make_branch_and_tree('.')
wt.lock_write()
self.addCleanup(wt.unlock)
root_id = wt.get_root_id()
wt.apply_inventory_delta([('', None, root_id, None),
(None, '', 'root-id',
inventory.InventoryDirectory('root-id', '', None))])
class TestTreeReference(TestCaseWithWorkingTree):
def test_tree_reference_matches_inv(self):
base = self.make_branch_and_tree('base')
if base.branch.repository._format.supports_full_versioned_files:
raise tests.TestNotApplicable(
"format does not support inventory deltas")
if not base.supports_tree_reference():
raise tests.TestNotApplicable("wt doesn't support nested trees")
# We add it as a directory, but it becomes a tree-reference
base.add(['subdir'], ['subdir-id'], ['directory'])
subdir = self.make_branch_and_tree('base/subdir')
self.addCleanup(base.lock_read().unlock)
# Note: we aren't strict about ie.kind being 'directory' here, what we
# are strict about is that wt.inventory should match
# wt.current_dirstate()'s idea about what files are where.
ie = base.inventory['subdir-id']
self.assertEqual('directory', ie.kind)
path, ie = base.iter_entries_by_dir(['subdir-id']).next()
self.assertEqual('subdir', path)
self.assertEqual('tree-reference', ie.kind)
|
