/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_clean_tree.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-18 14:09:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120118140919-rlvdrhpc0nq1lbwi
Change set/remove to require a lock for the branch config files.

This means that tests (or any plugin for that matter) do not requires an
explicit lock on the branch anymore to change a single option. This also
means the optimisation becomes "opt-in" and as such won't be as
spectacular as it may be and/or harder to get right (nothing fails
anymore).

This reduces the diff by ~300 lines.

Code/tests that were updating more than one config option is still taking
a lock to at least avoid some IOs and demonstrate the benefits through
the decreased number of hpss calls.

The duplication between BranchStack and BranchOnlyStack will be removed
once the same sharing is in place for local config files, at which point
the Stack class itself may be able to host the changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
import os
20
20
import shutil
21
21
import sys
 
22
import types
22
23
 
23
24
from bzrlib import tests, ui
24
 
from bzrlib.controldir import (
25
 
    ControlDir,
 
25
from bzrlib.bzrdir import (
 
26
    BzrDir,
26
27
    )
27
28
from bzrlib.clean_tree import (
28
29
    clean_tree,
42
43
        if has_symlinks() is False:
43
44
            return
44
45
        os.mkdir('branch')
45
 
        ControlDir.create_standalone_workingtree('branch')
 
46
        BzrDir.create_standalone_workingtree('branch')
46
47
        os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
47
48
        os.mkdir('no-die-please')
48
49
        self.assertPathExists('branch/die-please')
55
56
    def test_iter_deletable(self):
56
57
        """Files are selected for deletion appropriately"""
57
58
        os.mkdir('branch')
58
 
        tree = ControlDir.create_standalone_workingtree('branch')
 
59
        tree = BzrDir.create_standalone_workingtree('branch')
59
60
        transport = tree.bzrdir.root_transport
60
61
        transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
61
62
        transport.put_bytes('file.BASE', 'contents')
121
122
        stderr = tests.StringIOWrapper()
122
123
        ui.ui_factory = tests.TestUIFactory(stdout=stdout, stderr=stderr)
123
124
 
124
 
        ControlDir.create_standalone_workingtree('.')
 
125
        BzrDir.create_standalone_workingtree('.')
125
126
        self.build_tree(['0foo', '1bar', '2baz', 'subdir0/'])
126
127
        clean_tree('.', unknown=True, no_prompt=True)
127
128
        self.assertContainsRe(stderr.getvalue(),