/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 breezy/tests/per_intertree/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-08-09 23:17:39 UTC
  • mfrom: (6746.2.1 trunk)
  • Revision ID: jelmer@jelmer.uk-20170809231739-zaxynffd6oeo6ehe
Merge lp:~jelmer/brz/matchingbzrdir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/__init__.py
72
72
    def make_to_branch_and_tree(self, relpath):
73
73
        """Make a to_workingtree_format branch and tree."""
74
74
        made_control = self.make_controldir(relpath,
75
 
            format=self.workingtree_format_to._matchingbzrdir)
 
75
            format=self.workingtree_format_to._matchingcontroldir)
76
76
        made_control.create_repository()
77
77
        made_control.create_branch()
78
78
        return self.workingtree_format_to.initialize(made_control)
95
95
        scenario = (label, {
96
96
            "transport_server": transport_server,
97
97
            "transport_readonly_server": transport_readonly_server,
98
 
            "bzrdir_format":workingtree_format._matchingbzrdir,
 
98
            "bzrdir_format":workingtree_format._matchingcontroldir,
99
99
            "workingtree_format":workingtree_format,
100
100
            "intertree_class":intertree_class,
101
101
            "workingtree_format_to":workingtree_format_to,
137
137
            # XXX: we shouldn't use an Intertree object to detect inventories
138
138
            # -- vila 20090311
139
139
            chk_tree_format = WorkingTreeFormat4()
140
 
            chk_tree_format._get_matchingbzrdir = \
 
140
            chk_tree_format._get_matchingcontroldir = \
141
141
                lambda:breezy.controldir.format_registry.make_controldir('2a')
142
142
            test_intertree_permutations.append(
143
143
                (InterTree.__name__ + "(CHKInventory)",