← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/__init__.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
29
29
    errors,
30
30
    tests,
31
31
    transform,
32
 
    transport,
33
32
    )
34
33
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
35
34
from bzrlib.tests.per_workingtree import (
100
99
class TestCaseWithTree(TestCaseWithControlDir):
101
100
 
102
101
    def make_branch_and_tree(self, relpath):
103
 
        bzrdir_format = self.workingtree_format.get_controldir_for_branch()
104
 
        made_control = self.make_bzrdir(relpath, format=bzrdir_format)
 
102
        made_control = self.make_bzrdir(relpath, format=
 
103
            self.workingtree_format._matchingbzrdir)
105
104
        made_control.create_repository()
106
 
        b = made_control.create_branch()
107
 
        if getattr(self, 'repo_is_remote', False):
108
 
            # If the repo is remote, then we just create a local lightweight
109
 
            # checkout
110
 
            # XXX: This duplicates a lot of Branch.create_checkout, but we know
111
 
            #      we want a) lightweight, and b) a specific WT format. We also
112
 
            #      know that nothing should already exist, etc.
113
 
            t = transport.get_transport(relpath)
114
 
            t.ensure_base()
115
 
            wt_dir = bzrdir_format.initialize_on_transport(t)
116
 
            branch_ref = wt_dir.set_branch_reference(b)
117
 
            wt = wt_dir.create_workingtree(None, from_branch=branch_ref)
118
 
        else:
119
 
            wt = self.workingtree_format.initialize(made_control)
120
 
        return wt
 
105
        made_control.create_branch()
 
106
        return self.workingtree_format.initialize(made_control)
121
107
 
122
108
    def workingtree_to_test_tree(self, tree):
123
109
        return self._workingtree_to_test_tree(self, tree)
396
382
        'get_file_with_stat',
397
383
        'get_root_id',
398
384
        'get_symlink_target',
399
 
        'ids',
400
385
        'inv',
401
386
        'iter_search_rules',
402
387
        'is_executable',