~bzr-pqm/bzr/bzr.dev

4988.10.3 by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS
1
# Copyright (C) 2007-2010 Canonical Ltd
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
2
# Authors:  Robert Collins <robert.collins@canonical.com>
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
4183.7.1 by Sabin Iacob
update FSF mailing address
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
17
18
"""Tests for WorkingTreeFormat4"""
19
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
20
import os
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
21
import time
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
22
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
23
from bzrlib import (
24
    bzrdir,
25
    dirstate,
26
    errors,
1551.15.6 by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168)
27
    inventory,
2466.4.1 by John Arbash Meinel
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
28
    osutils,
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
29
    workingtree_4,
30
    )
31
from bzrlib.lockdir import LockDir
32
from bzrlib.tests import TestCaseWithTransport, TestSkipped
33
from bzrlib.tree import InterTree
34
35
36
class TestWorkingTreeFormat4(TestCaseWithTransport):
37
    """Tests specific to WorkingTreeFormat4."""
38
39
    def test_disk_layout(self):
40
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
41
        control.create_repository()
42
        control.create_branch()
43
        tree = workingtree_4.WorkingTreeFormat4().initialize(control)
44
        # we want:
45
        # format 'Bazaar Working Tree format 4'
46
        # stat-cache = ??
47
        t = control.get_workingtree_transport(None)
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
48
        self.assertEqualDiff('Bazaar Working Tree Format 4 (bzr 0.15)\n',
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
49
                             t.get('format').read())
50
        self.assertFalse(t.has('inventory.basis'))
51
        # no last-revision file means 'None' or 'NULLREVISION'
52
        self.assertFalse(t.has('last-revision'))
53
        state = dirstate.DirState.on_file(t.local_abspath('dirstate'))
54
        state.lock_read()
55
        try:
56
            self.assertEqual([], state.get_parent_ids())
57
        finally:
58
            state.unlock()
59
60
    def test_uses_lockdir(self):
61
        """WorkingTreeFormat4 uses its own LockDir:
2255.10.1 by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache,
62
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
63
            - lock is a directory
64
            - when the WorkingTree is locked, LockDir can see that
65
        """
66
        # this test could be factored into a subclass of tests common to both
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
67
        # format 3 and 4, but for now its not much of an issue as there is only
68
        # one in common.
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
69
        t = self.get_transport()
70
        tree = self.make_workingtree()
71
        self.assertIsDirectory('.bzr', t)
72
        self.assertIsDirectory('.bzr/checkout', t)
73
        self.assertIsDirectory('.bzr/checkout/lock', t)
74
        our_lock = LockDir(t, '.bzr/checkout/lock')
75
        self.assertEquals(our_lock.peek(), None)
76
        tree.lock_write()
77
        self.assertTrue(our_lock.peek())
78
        tree.unlock()
79
        self.assertEquals(our_lock.peek(), None)
80
81
    def make_workingtree(self, relpath=''):
82
        url = self.get_url(relpath)
83
        if relpath:
84
            self.build_tree([relpath + '/'])
85
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
86
        repo = dir.create_repository()
87
        branch = dir.create_branch()
88
        try:
89
            return workingtree_4.WorkingTreeFormat4().initialize(dir)
90
        except errors.NotLocalUrl:
91
            raise TestSkipped('Not a local URL')
92
93
    def test_dirstate_stores_all_parent_inventories(self):
94
        tree = self.make_workingtree()
95
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
96
        # We're going to build in tree a working tree
97
        # with three parent trees, with some files in common.
98
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
99
        # We really don't want to do commit or merge in the new dirstate-based
100
        # tree, because that might not work yet.  So instead we build
101
        # revisions elsewhere and pull them across, doing by hand part of the
102
        # work that merge would do.
103
104
        subtree = self.make_branch_and_tree('subdir')
105
        # writelock the tree so its repository doesn't get readlocked by
106
        # the revision tree locks. This works around the bug where we dont
107
        # permit lock upgrading.
108
        subtree.lock_write()
109
        self.addCleanup(subtree.unlock)
110
        self.build_tree(['subdir/file-a',])
111
        subtree.add(['file-a'], ['id-a'])
112
        rev1 = subtree.commit('commit in subdir')
113
114
        subtree2 = subtree.bzrdir.sprout('subdir2').open_workingtree()
115
        self.build_tree(['subdir2/file-b'])
116
        subtree2.add(['file-b'], ['id-b'])
117
        rev2 = subtree2.commit('commit in subdir2')
118
119
        subtree.flush()
3462.1.7 by John Arbash Meinel
fix a test that assumed WT4.set_parent_trees() wouldn't filter the list.
120
        subtree3 = subtree.bzrdir.sprout('subdir3').open_workingtree()
121
        rev3 = subtree3.commit('merge from subdir2')
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
122
123
        repo = tree.branch.repository
3462.1.7 by John Arbash Meinel
fix a test that assumed WT4.set_parent_trees() wouldn't filter the list.
124
        repo.fetch(subtree.branch.repository, rev1)
125
        repo.fetch(subtree2.branch.repository, rev2)
126
        repo.fetch(subtree3.branch.repository, rev3)
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
127
        # will also pull the others...
128
129
        # create repository based revision trees
3462.1.7 by John Arbash Meinel
fix a test that assumed WT4.set_parent_trees() wouldn't filter the list.
130
        rev1_revtree = repo.revision_tree(rev1)
131
        rev2_revtree = repo.revision_tree(rev2)
132
        rev3_revtree = repo.revision_tree(rev3)
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
133
        # tree doesn't contain a text merge yet but we'll just
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
134
        # set the parents as if a merge had taken place.
135
        # this should cause the tree data to be folded into the
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
136
        # dirstate.
137
        tree.set_parent_trees([
138
            (rev1, rev1_revtree),
139
            (rev2, rev2_revtree),
140
            (rev3, rev3_revtree), ])
141
142
        # create tree-sourced revision trees
143
        rev1_tree = tree.revision_tree(rev1)
144
        rev1_tree.lock_read()
145
        self.addCleanup(rev1_tree.unlock)
146
        rev2_tree = tree.revision_tree(rev2)
147
        rev2_tree.lock_read()
148
        self.addCleanup(rev2_tree.unlock)
149
        rev3_tree = tree.revision_tree(rev3)
150
        rev3_tree.lock_read()
151
        self.addCleanup(rev3_tree.unlock)
152
153
        # now we should be able to get them back out
154
        self.assertTreesEqual(rev1_revtree, rev1_tree)
155
        self.assertTreesEqual(rev2_revtree, rev2_tree)
156
        self.assertTreesEqual(rev3_revtree, rev3_tree)
157
158
    def test_dirstate_doesnt_read_parents_from_repo_when_setting(self):
159
        """Setting parent trees on a dirstate working tree takes
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
160
        the trees it's given and doesn't need to read them from the
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
161
        repository.
162
        """
163
        tree = self.make_workingtree()
164
165
        subtree = self.make_branch_and_tree('subdir')
166
        rev1 = subtree.commit('commit in subdir')
167
        rev1_tree = subtree.basis_tree()
168
        rev1_tree.lock_read()
169
        self.addCleanup(rev1_tree.unlock)
170
171
        tree.branch.pull(subtree.branch)
172
173
        # break the repository's legs to make sure it only uses the trees
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
174
        # it's given; any calls to forbidden methods will raise an
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
175
        # AssertionError
176
        repo = tree.branch.repository
177
        repo.get_revision = self.fail
178
        repo.get_inventory = self.fail
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
179
        repo._get_inventory_xml = self.fail
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
180
        # try to set the parent trees.
181
        tree.set_parent_trees([(rev1, rev1_tree)])
182
183
    def test_dirstate_doesnt_read_from_repo_when_returning_cache_tree(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
184
        """Getting parent trees from a dirstate tree does not read from the
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
185
        repos inventory store. This is an important part of the dirstate
186
        performance optimisation work.
187
        """
188
        tree = self.make_workingtree()
189
190
        subtree = self.make_branch_and_tree('subdir')
191
        # writelock the tree so its repository doesn't get readlocked by
192
        # the revision tree locks. This works around the bug where we dont
193
        # permit lock upgrading.
194
        subtree.lock_write()
195
        self.addCleanup(subtree.unlock)
196
        rev1 = subtree.commit('commit in subdir')
197
        rev1_tree = subtree.basis_tree()
198
        rev1_tree.lock_read()
199
        rev1_tree.inventory
200
        self.addCleanup(rev1_tree.unlock)
201
        rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
202
        rev2_tree = subtree.basis_tree()
203
        rev2_tree.lock_read()
204
        rev2_tree.inventory
205
        self.addCleanup(rev2_tree.unlock)
206
207
        tree.branch.pull(subtree.branch)
208
209
        # break the repository's legs to make sure it only uses the trees
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
210
        # it's given; any calls to forbidden methods will raise an
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
211
        # AssertionError
212
        repo = tree.branch.repository
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
213
        # dont uncomment this: the revision object must be accessed to
214
        # answer 'get_parent_ids' for the revision tree- dirstate does not
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
215
        # cache the parents of a parent tree at this point.
216
        #repo.get_revision = self.fail
217
        repo.get_inventory = self.fail
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
218
        repo._get_inventory_xml = self.fail
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
219
        # set the parent trees.
220
        tree.set_parent_trees([(rev1, rev1_tree), (rev2, rev2_tree)])
221
        # read the first tree
222
        result_rev1_tree = tree.revision_tree(rev1)
223
        # read the second
224
        result_rev2_tree = tree.revision_tree(rev2)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
225
        # compare - there should be no differences between the handed and
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
226
        # returned trees
227
        self.assertTreesEqual(rev1_tree, result_rev1_tree)
228
        self.assertTreesEqual(rev2_tree, result_rev2_tree)
229
230
    def test_dirstate_doesnt_cache_non_parent_trees(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
231
        """Getting parent trees from a dirstate tree does not read from the
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
232
        repos inventory store. This is an important part of the dirstate
233
        performance optimisation work.
234
        """
235
        tree = self.make_workingtree()
236
237
        # make a tree that we can try for, which is able to be returned but
238
        # must not be
239
        subtree = self.make_branch_and_tree('subdir')
240
        rev1 = subtree.commit('commit in subdir')
241
        tree.branch.pull(subtree.branch)
242
        # check it fails
243
        self.assertRaises(errors.NoSuchRevision, tree.revision_tree, rev1)
244
245
    def test_no_dirstate_outside_lock(self):
246
        # temporary test until the code is mature enough to test from outside.
247
        """Getting a dirstate object fails if there is no lock."""
248
        def lock_and_call_current_dirstate(tree, lock_method):
249
            getattr(tree, lock_method)()
250
            tree.current_dirstate()
251
            tree.unlock()
252
        tree = self.make_workingtree()
253
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
254
        lock_and_call_current_dirstate(tree, 'lock_read')
255
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
256
        lock_and_call_current_dirstate(tree, 'lock_write')
257
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
258
        lock_and_call_current_dirstate(tree, 'lock_tree_write')
259
        self.assertRaises(errors.ObjectNotLocked, tree.current_dirstate)
260
261
    def test_new_dirstate_on_new_lock(self):
262
        # until we have detection for when a dirstate can be reused, we
263
        # want to reparse dirstate on every new lock.
264
        known_dirstates = set()
265
        def lock_and_compare_all_current_dirstate(tree, lock_method):
266
            getattr(tree, lock_method)()
267
            state = tree.current_dirstate()
268
            self.assertFalse(state in known_dirstates)
269
            known_dirstates.add(state)
270
            tree.unlock()
271
        tree = self.make_workingtree()
272
        # lock twice with each type to prevent silly per-lock-type bugs.
273
        # each lock and compare looks for a unique state object.
274
        lock_and_compare_all_current_dirstate(tree, 'lock_read')
275
        lock_and_compare_all_current_dirstate(tree, 'lock_read')
276
        lock_and_compare_all_current_dirstate(tree, 'lock_tree_write')
277
        lock_and_compare_all_current_dirstate(tree, 'lock_tree_write')
278
        lock_and_compare_all_current_dirstate(tree, 'lock_write')
279
        lock_and_compare_all_current_dirstate(tree, 'lock_write')
280
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
281
    def test_constructing_invalid_interdirstate_raises(self):
282
        tree = self.make_workingtree()
283
        rev_id = tree.commit('first post')
284
        rev_id2 = tree.commit('second post')
285
        rev_tree = tree.branch.repository.revision_tree(rev_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
286
        # Exception is not a great thing to raise, but this test is
287
        # very short, and code is used to sanity check other tests, so
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
288
        # a full error object is YAGNI.
289
        self.assertRaises(
290
            Exception, workingtree_4.InterDirStateTree, rev_tree, tree)
291
        self.assertRaises(
292
            Exception, workingtree_4.InterDirStateTree, tree, rev_tree)
293
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
294
    def test_revtree_to_revtree_not_interdirstate(self):
295
        # we should not get a dirstate optimiser for two repository sourced
296
        # revtrees. we can't prove a negative, so we dont do exhaustive tests
297
        # of all formats; though that could be written in the future it doesn't
298
        # seem well worth it.
299
        tree = self.make_workingtree()
300
        rev_id = tree.commit('first post')
301
        rev_id2 = tree.commit('second post')
302
        rev_tree = tree.branch.repository.revision_tree(rev_id)
303
        rev_tree2 = tree.branch.repository.revision_tree(rev_id2)
304
        optimiser = InterTree.get(rev_tree, rev_tree2)
305
        self.assertIsInstance(optimiser, InterTree)
306
        self.assertFalse(isinstance(optimiser, workingtree_4.InterDirStateTree))
307
        optimiser = InterTree.get(rev_tree2, rev_tree)
308
        self.assertIsInstance(optimiser, InterTree)
309
        self.assertFalse(isinstance(optimiser, workingtree_4.InterDirStateTree))
310
311
    def test_revtree_not_in_dirstate_to_dirstate_not_interdirstate(self):
312
        # we should not get a dirstate optimiser when the revision id for of
313
        # the source is not in the dirstate of the target.
314
        tree = self.make_workingtree()
315
        rev_id = tree.commit('first post')
316
        rev_id2 = tree.commit('second post')
317
        rev_tree = tree.branch.repository.revision_tree(rev_id)
318
        tree.lock_read()
319
        optimiser = InterTree.get(rev_tree, tree)
320
        self.assertIsInstance(optimiser, InterTree)
321
        self.assertFalse(isinstance(optimiser, workingtree_4.InterDirStateTree))
322
        optimiser = InterTree.get(tree, rev_tree)
323
        self.assertIsInstance(optimiser, InterTree)
324
        self.assertFalse(isinstance(optimiser, workingtree_4.InterDirStateTree))
325
        tree.unlock()
326
327
    def test_empty_basis_to_dirstate_tree(self):
328
        # we should get a InterDirStateTree for doing
329
        # 'changes_from' from the first basis dirstate revision tree to a
330
        # WorkingTree4.
331
        tree = self.make_workingtree()
332
        tree.lock_read()
333
        basis_tree = tree.basis_tree()
334
        basis_tree.lock_read()
335
        optimiser = InterTree.get(basis_tree, tree)
336
        tree.unlock()
337
        basis_tree.unlock()
338
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
339
340
    def test_nonempty_basis_to_dirstate_tree(self):
341
        # we should get a InterDirStateTree for doing
342
        # 'changes_from' from a non-null basis dirstate revision tree to a
343
        # WorkingTree4.
344
        tree = self.make_workingtree()
345
        tree.commit('first post')
346
        tree.lock_read()
347
        basis_tree = tree.basis_tree()
348
        basis_tree.lock_read()
349
        optimiser = InterTree.get(basis_tree, tree)
350
        tree.unlock()
351
        basis_tree.unlock()
352
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
353
354
    def test_empty_basis_revtree_to_dirstate_tree(self):
355
        # we should get a InterDirStateTree for doing
356
        # 'changes_from' from an empty repository based rev tree to a
357
        # WorkingTree4.
358
        tree = self.make_workingtree()
359
        tree.lock_read()
360
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
361
        basis_tree.lock_read()
362
        optimiser = InterTree.get(basis_tree, tree)
363
        tree.unlock()
364
        basis_tree.unlock()
365
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
366
367
    def test_nonempty_basis_revtree_to_dirstate_tree(self):
368
        # we should get a InterDirStateTree for doing
369
        # 'changes_from' from a non-null repository based rev tree to a
370
        # WorkingTree4.
371
        tree = self.make_workingtree()
372
        tree.commit('first post')
373
        tree.lock_read()
374
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
375
        basis_tree.lock_read()
376
        optimiser = InterTree.get(basis_tree, tree)
377
        tree.unlock()
378
        basis_tree.unlock()
379
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
380
381
    def test_tree_to_basis_in_other_tree(self):
382
        # we should get a InterDirStateTree when
383
        # the source revid is in the dirstate object of the target and
384
        # the dirstates are different. This is largely covered by testing
385
        # with repository revtrees, so is just for extra confidence.
386
        tree = self.make_workingtree('a')
387
        tree.commit('first post')
388
        tree2 = self.make_workingtree('b')
389
        tree2.pull(tree.branch)
390
        basis_tree = tree.basis_tree()
391
        tree2.lock_read()
392
        basis_tree.lock_read()
393
        optimiser = InterTree.get(basis_tree, tree2)
394
        tree2.unlock()
395
        basis_tree.unlock()
396
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
397
398
    def test_merged_revtree_to_tree(self):
399
        # we should get a InterDirStateTree when
400
        # the source tree is a merged tree present in the dirstate of target.
401
        tree = self.make_workingtree('a')
402
        tree.commit('first post')
403
        tree.commit('tree 1 commit 2')
404
        tree2 = self.make_workingtree('b')
405
        tree2.pull(tree.branch)
406
        tree2.commit('tree 2 commit 2')
407
        tree.merge_from_branch(tree2.branch)
408
        second_parent_tree = tree.revision_tree(tree.get_parent_ids()[1])
409
        second_parent_tree.lock_read()
410
        tree.lock_read()
411
        optimiser = InterTree.get(second_parent_tree, tree)
412
        tree.unlock()
413
        second_parent_tree.unlock()
414
        self.assertIsInstance(optimiser, workingtree_4.InterDirStateTree)
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
415
416
    def test_id2path(self):
417
        tree = self.make_workingtree('tree')
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
418
        self.build_tree(['tree/a', 'tree/b'])
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
419
        tree.add(['a'], ['a-id'])
420
        self.assertEqual(u'a', tree.id2path('a-id'))
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
421
        self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
422
        tree.commit('a')
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
423
        tree.add(['b'], ['b-id'])
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
424
2321.1.2 by Robert Collins
Skip new tests that depend on unicode file paths.
425
        try:
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
426
            new_path = u'b\u03bcrry'
427
            tree.rename_one('a', new_path)
2321.1.2 by Robert Collins
Skip new tests that depend on unicode file paths.
428
        except UnicodeEncodeError:
429
            # support running the test on non-unicode platforms
430
            new_path = 'c'
2825.6.1 by Robert Collins
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
431
            tree.rename_one('a', new_path)
2321.1.2 by Robert Collins
Skip new tests that depend on unicode file paths.
432
        self.assertEqual(new_path, tree.id2path('a-id'))
2255.2.144 by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a
433
        tree.commit(u'b\xb5rry')
434
        tree.unversion(['a-id'])
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
435
        self.assertRaises(errors.NoSuchId, tree.id2path, 'a-id')
2255.2.147 by John Arbash Meinel
Move fast id => path lookups down into DirState
436
        self.assertEqual('b', tree.id2path('b-id'))
2255.11.5 by Martin Pool
Tree.id2path should raise NoSuchId, not return None.
437
        self.assertRaises(errors.NoSuchId, tree.id2path, 'c-id')
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
438
439
    def test_unique_root_id_per_tree(self):
440
        # each time you initialize a new tree, it gets a different root id
2255.2.207 by Robert Collins
Reinstate format change for test_workingtree_4
441
        format_name = 'dirstate-with-subtree'
2255.2.166 by Martin Pool
(broken) Add Tree.get_root_id() & test
442
        tree1 = self.make_branch_and_tree('tree1',
443
            format=format_name)
444
        tree2 = self.make_branch_and_tree('tree2',
445
            format=format_name)
446
        self.assertNotEqual(tree1.get_root_id(), tree2.get_root_id())
447
        # when you branch, it inherits the same root id
448
        rev1 = tree1.commit('first post')
449
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
450
        self.assertEqual(tree3.get_root_id(), tree1.get_root_id())
451
2255.11.2 by Martin Pool
Add more dirstate root-id-changing tests
452
    def test_set_root_id(self):
453
        # similar to some code that fails in the dirstate-plus-subtree branch
454
        # -- setting the root id while adding a parent seems to scramble the
455
        # dirstate invariants. -- mbp 20070303
456
        def validate():
457
            wt.lock_read()
458
            try:
459
                wt.current_dirstate()._validate()
460
            finally:
461
                wt.unlock()
462
        wt = self.make_workingtree('tree')
463
        wt.set_root_id('TREE-ROOTID')
464
        validate()
465
        wt.commit('somenthing')
466
        validate()
467
        # now switch and commit again
468
        wt.set_root_id('tree-rootid')
469
        validate()
470
        wt.commit('again')
471
        validate()
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
472
1551.15.6 by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168)
473
    def test_default_root_id(self):
474
        tree = self.make_branch_and_tree('tag', format='dirstate-tags')
475
        self.assertEqual(inventory.ROOT_ID, tree.get_root_id())
476
        tree = self.make_branch_and_tree('subtree',
477
                                         format='dirstate-with-subtree')
478
        self.assertNotEqual(inventory.ROOT_ID, tree.get_root_id())
479
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
480
    def test_non_subtree_with_nested_trees(self):
481
        # prior to dirstate, st/diff/commit ignored nested trees.
482
        # dirstate, as opposed to dirstate-with-subtree, should
483
        # behave the same way.
484
        tree = self.make_branch_and_tree('.', format='dirstate')
485
        self.assertFalse(tree.supports_tree_reference())
486
        self.build_tree(['dir/'])
487
        # for testing easily.
488
        tree.set_root_id('root')
489
        tree.add(['dir'], ['dir-id'])
490
        subtree = self.make_branch_and_tree('dir')
491
        # the most primitive operation: kind
492
        self.assertEqual('directory', tree.kind('dir-id'))
4570.2.8 by Robert Collins
Adjust WorkingTree4 specific test to deal with iter_changes reporting required directories.
493
        # a diff against the basis should give us a directory and the root (as
494
        # the root is new too).
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
495
        tree.lock_read()
496
        expected = [('dir-id',
497
            (None, u'dir'),
498
            True,
499
            (False, True),
500
            (None, 'root'),
501
            (None, u'dir'),
502
            (None, 'directory'),
4570.2.8 by Robert Collins
Adjust WorkingTree4 specific test to deal with iter_changes reporting required directories.
503
            (None, False)),
504
            ('root', (None, u''), True, (False, True), (None, None),
505
            (None, u''), (None, 'directory'), (None, 0))]
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
506
        self.assertEqual(expected, list(tree.iter_changes(tree.basis_tree(),
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
507
            specific_files=['dir'])))
508
        tree.unlock()
509
        # do a commit, we want to trigger the dirstate fast-path too
510
        tree.commit('first post')
511
        # change the path for the subdir, which will trigger getting all
512
        # its data:
513
        os.rename('dir', 'also-dir')
514
        # now the diff will use the fast path
515
        tree.lock_read()
516
        expected = [('dir-id',
517
            (u'dir', u'dir'),
518
            True,
519
            (True, True),
520
            ('root', 'root'),
521
            ('dir', 'dir'),
522
            ('directory', None),
523
            (False, False))]
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
524
        self.assertEqual(expected, list(tree.iter_changes(tree.basis_tree())))
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
525
        tree.unlock()
526
527
    def test_with_subtree_supports_tree_references(self):
528
        # dirstate-with-subtree should support tree-references.
529
        tree = self.make_branch_and_tree('.', format='dirstate-with-subtree')
530
        self.assertTrue(tree.supports_tree_reference())
531
        # having checked this is on, the tree interface, and intertree
532
        # interface tests, will proceed to test the subtree support of
533
        # workingtree_4.
2466.4.1 by John Arbash Meinel
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
534
535
    def test_iter_changes_ignores_unversioned_dirs(self):
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
536
        """iter_changes should not descend into unversioned directories."""
2466.4.1 by John Arbash Meinel
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
537
        tree = self.make_branch_and_tree('.', format='dirstate')
538
        # We have an unversioned directory at the root, a versioned one with
539
        # other versioned files and an unversioned directory, and another
540
        # versioned dir with nothing but an unversioned directory.
541
        self.build_tree(['unversioned/',
542
                         'unversioned/a',
543
                         'unversioned/b/',
544
                         'versioned/',
545
                         'versioned/unversioned/',
546
                         'versioned/unversioned/a',
547
                         'versioned/unversioned/b/',
548
                         'versioned2/',
549
                         'versioned2/a',
550
                         'versioned2/unversioned/',
551
                         'versioned2/unversioned/a',
552
                         'versioned2/unversioned/b/',
553
                        ])
554
        tree.add(['versioned', 'versioned2', 'versioned2/a'])
555
        tree.commit('one', rev_id='rev-1')
556
        # Trap osutils._walkdirs_utf8 to spy on what dirs have been accessed.
557
        returned = []
558
        def walkdirs_spy(*args, **kwargs):
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
559
            for val in orig(*args, **kwargs):
2466.4.1 by John Arbash Meinel
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
560
                returned.append(val[0][0])
561
                yield val
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
562
        orig = self.overrideAttr(osutils, '_walkdirs_utf8', walkdirs_spy)
2466.4.1 by John Arbash Meinel
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
563
564
        basis = tree.basis_tree()
565
        tree.lock_read()
566
        self.addCleanup(tree.unlock)
567
        basis.lock_read()
568
        self.addCleanup(basis.unlock)
2466.4.2 by John Arbash Meinel
Clean up the (failing) test so that the last thing
569
        changes = [c[1] for c in
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
570
                   tree.iter_changes(basis, want_unversioned=True)]
2466.4.2 by John Arbash Meinel
Clean up the (failing) test so that the last thing
571
        self.assertEqual([(None, 'unversioned'),
572
                          (None, 'versioned/unversioned'),
573
                          (None, 'versioned2/unversioned'),
574
                         ], changes)
575
        self.assertEqual(['', 'versioned', 'versioned2'], returned)
576
        del returned[:] # reset
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
577
        changes = [c[1] for c in tree.iter_changes(basis)]
2466.4.2 by John Arbash Meinel
Clean up the (failing) test so that the last thing
578
        self.assertEqual([], changes)
579
        self.assertEqual(['', 'versioned', 'versioned2'], returned)
3207.2.1 by jameinel
Add a test that _iter_changes raises a clearer error when we encounter an invalid rename.
580
4496.2.1 by Ian Clatworthy
(igc) Improve paths are not versioned reporting (Benoît PIERRE)
581
    def test_iter_changes_unversioned_error(self):
582
        """ Check if a PathsNotVersionedError is correctly raised and the
583
            paths list contains all unversioned entries only.
584
        """
585
        tree = self.make_branch_and_tree('tree')
586
        self.build_tree_contents([('tree/bar', '')])
587
        tree.add(['bar'], ['bar-id'])
588
        tree.lock_read()
589
        self.addCleanup(tree.unlock)
590
        tree_iter_changes = lambda files: [
591
            c for c in tree.iter_changes(tree.basis_tree(), specific_files=files,
592
                                         require_versioned=True)
593
        ]
594
        e = self.assertRaises(errors.PathsNotVersionedError,
595
                              tree_iter_changes, ['bar', 'foo'])
596
        self.assertEqual(e.paths, ['foo'])
597
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
598
    def get_tree_with_cachable_file_foo(self):
599
        tree = self.make_branch_and_tree('.')
600
        self.build_tree(['foo'])
601
        tree.add(['foo'], ['foo-id'])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
602
        # a 4 second old timestamp is always hashable - sucks to delay
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
603
        # the test suite, but not testing this is worse.
604
        time.sleep(4)
3207.2.1 by jameinel
Add a test that _iter_changes raises a clearer error when we encounter an invalid rename.
605
        return tree
606
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
607
    def test_commit_updates_hash_cache(self):
608
        tree = self.get_tree_with_cachable_file_foo()
609
        revid = tree.commit('a commit')
610
        # tree's dirstate should now have a valid stat entry for foo.
611
        tree.lock_read()
4100.2.3 by Aaron Bentley
Avoid autodetecting tree references in _comparison_data.
612
        self.addCleanup(tree.unlock)
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
613
        entry = tree._get_entry(path='foo')
614
        expected_sha1 = osutils.sha_file_by_name('foo')
615
        self.assertEqual(expected_sha1, entry[1][0][1])
616
617
    def test_observed_sha1_cachable(self):
618
        tree = self.get_tree_with_cachable_file_foo()
619
        expected_sha1 = osutils.sha_file_by_name('foo')
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
620
        statvalue = os.lstat("foo")
3207.2.1 by jameinel
Add a test that _iter_changes raises a clearer error when we encounter an invalid rename.
621
        tree.lock_write()
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
622
        try:
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
623
            tree._observed_sha1("foo-id", "foo", (expected_sha1, statvalue))
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
624
            self.assertEqual(expected_sha1,
625
                tree._get_entry(path="foo")[1][0][1])
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
626
        finally:
627
            tree.unlock()
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
628
        tree = tree.bzrdir.open_workingtree()
629
        tree.lock_read()
3207.2.1 by jameinel
Add a test that _iter_changes raises a clearer error when we encounter an invalid rename.
630
        self.addCleanup(tree.unlock)
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
631
        self.assertEqual(expected_sha1, tree._get_entry(path="foo")[1][0][1])
632
633
    def test_observed_sha1_new_file(self):
634
        tree = self.make_branch_and_tree('.')
635
        self.build_tree(['foo'])
636
        tree.add(['foo'], ['foo-id'])
3207.2.2 by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
637
        tree.lock_read()
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
638
        try:
639
            current_sha1 = tree._get_entry(path="foo")[1][0][1]
640
        finally:
641
            tree.unlock()
642
        tree.lock_write()
643
        try:
644
            tree._observed_sha1("foo-id", "foo",
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
645
                (osutils.sha_file_by_name('foo'), os.lstat("foo")))
3709.3.1 by Robert Collins
First cut - make it work - at updating the tree stat cache during commit.
646
            # Must not have changed
647
            self.assertEqual(current_sha1,
648
                tree._get_entry(path="foo")[1][0][1])
649
        finally:
650
            tree.unlock()
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
651
652
    def test_get_file_with_stat_id_only(self):
653
        # Explicit test to ensure we get a lstat value from WT4 trees.
654
        tree = self.make_branch_and_tree('.')
655
        self.build_tree(['foo'])
656
        tree.add(['foo'], ['foo-id'])
657
        tree.lock_read()
658
        self.addCleanup(tree.unlock)
659
        file_obj, statvalue = tree.get_file_with_stat('foo-id')
660
        expected = os.lstat('foo')
4807.2.2 by John Arbash Meinel
Move all the stat comparison and platform checkning code to assertEqualStat.
661
        self.assertEqualStat(expected, statvalue)
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
662
        self.assertEqual(["contents of foo\n"], file_obj.readlines())
663
664
665
class TestCorruptDirstate(TestCaseWithTransport):
666
    """Tests for how we handle when the dirstate has been corrupted."""
667
668
    def create_wt4(self):
669
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
670
        control.create_repository()
671
        control.create_branch()
672
        tree = workingtree_4.WorkingTreeFormat4().initialize(control)
673
        return tree
674
675
    def test_invalid_rename(self):
676
        tree = self.create_wt4()
677
        # Create a corrupted dirstate
678
        tree.lock_write()
679
        try:
4285.2.1 by Vincent Ladeuil
Cleanup test imports and use features to better track skipped tests.
680
            # We need a parent, or we always compare with NULL
681
            tree.commit('init')
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
682
            state = tree.current_dirstate()
683
            state._read_dirblocks_if_needed()
684
            # Now add in an invalid entry, a rename with a dangling pointer
685
            state._dirblocks[1][1].append((('', 'foo', 'foo-id'),
686
                                            [('f', '', 0, False, ''),
687
                                             ('r', 'bar', 0 , False, '')]))
688
            self.assertListRaises(errors.CorruptDirstate,
689
                                  tree.iter_changes, tree.basis_tree())
690
        finally:
691
            tree.unlock()
692
693
    def get_simple_dirblocks(self, state):
694
        """Extract the simple information from the DirState.
695
696
        This returns the dirblocks, only with the sha1sum and stat details
697
        filtered out.
698
        """
699
        simple_blocks = []
700
        for block in state._dirblocks:
701
            simple_block = (block[0], [])
702
            for entry in block[1]:
703
                # Include the key for each entry, and for each parent include
704
                # just the minikind, so we know if it was
705
                # present/absent/renamed/etc
706
                simple_block[1].append((entry[0], [i[0] for i in entry[1]]))
707
            simple_blocks.append(simple_block)
708
        return simple_blocks
709
710
    def test_update_basis_with_invalid_delta(self):
711
        """When given an invalid delta, it should abort, and not be saved."""
712
        self.build_tree(['dir/', 'dir/file'])
713
        tree = self.create_wt4()
714
        tree.lock_write()
715
        self.addCleanup(tree.unlock)
716
        tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
717
        first_revision_id = tree.commit('init')
718
719
        root_id = tree.path2id('')
720
        state = tree.current_dirstate()
721
        state._read_dirblocks_if_needed()
722
        self.assertEqual([
723
            ('', [(('', '', root_id), ['d', 'd'])]),
724
            ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
725
            ('dir', [(('dir', 'file', 'file-id'), ['f', 'f'])]),
726
        ],  self.get_simple_dirblocks(state))
727
728
        tree.remove(['dir/file'])
729
        self.assertEqual([
730
            ('', [(('', '', root_id), ['d', 'd'])]),
731
            ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
732
            ('dir', [(('dir', 'file', 'file-id'), ['a', 'f'])]),
733
        ],  self.get_simple_dirblocks(state))
734
        # Make sure the removal is written to disk
735
        tree.flush()
736
737
        # self.assertRaises(Exception, tree.update_basis_by_delta,
738
        new_dir = inventory.InventoryDirectory('dir-id', 'new-dir', root_id)
739
        new_dir.revision = 'new-revision-id'
740
        new_file = inventory.InventoryFile('file-id', 'new-file', root_id)
741
        new_file.revision = 'new-revision-id'
742
        self.assertRaises(errors.InconsistentDelta,
743
            tree.update_basis_by_delta, 'new-revision-id',
744
            [('dir', 'new-dir', 'dir-id', new_dir),
745
             ('dir/file', 'new-dir/new-file', 'file-id', new_file),
746
            ])
747
        del state
748
749
        # Now when we re-read the file it should not have been modified
750
        tree.unlock()
751
        tree.lock_read()
752
        self.assertEqual(first_revision_id, tree.last_revision())
753
        state = tree.current_dirstate()
754
        state._read_dirblocks_if_needed()
755
        self.assertEqual([
756
            ('', [(('', '', root_id), ['d', 'd'])]),
757
            ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
758
            ('dir', [(('dir', 'file', 'file-id'), ['a', 'f'])]),
759
        ],  self.get_simple_dirblocks(state))
4634.156.1 by Vincent Ladeuil
Don't traceback when unversioning a directory.
760
761
762
class TestInventoryCoherency(TestCaseWithTransport):
763
764
    def test_inventory_is_synced_when_unversioning_a_dir(self):
765
        """Unversioning the root of a subtree unversions the entire subtree."""
766
        tree = self.make_branch_and_tree('.')
767
        self.build_tree(['a/', 'a/b', 'c/'])
768
        tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
769
        # within a lock unversion should take effect
770
        tree.lock_write()
771
        self.addCleanup(tree.unlock)
772
        # Force access to the in memory inventory to trigger bug #494221: try
773
        # maintaining the in-memory inventory
774
        inv = tree.inventory
4634.156.2 by Vincent Ladeuil
Ensure the entries are removed from the inventory
775
        self.assertTrue(inv.has_id('a-id'))
776
        self.assertTrue(inv.has_id('b-id'))
4634.156.1 by Vincent Ladeuil
Don't traceback when unversioning a directory.
777
        tree.unversion(['a-id', 'b-id'])
4634.156.2 by Vincent Ladeuil
Ensure the entries are removed from the inventory
778
        self.assertFalse(inv.has_id('a-id'))
779
        self.assertFalse(inv.has_id('b-id'))