/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: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

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._matchingcontroldir)
 
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)
89
89
    """
90
90
    result = []
91
91
    for (label, intertree_class,
92
 
        workingtree_format,
93
 
        workingtree_format_to,
94
 
        mutable_trees_to_test_trees) in formats:
 
92
         workingtree_format,
 
93
         workingtree_format_to,
 
94
         mutable_trees_to_test_trees) in formats:
95
95
        scenario = (label, {
96
96
            "transport_server": transport_server,
97
97
            "transport_readonly_server": transport_readonly_server,
115
115
    test_case.addCleanup(preview.finalize)
116
116
    return source, preview.get_preview_tree()
117
117
 
 
118
 
118
119
def mutable_trees_to_revision_trees(test_case, source, target):
119
120
    """Convert both trees to repository based revision trees."""
120
121
    return (revision_tree_from_workingtree(test_case, source),
121
 
        revision_tree_from_workingtree(test_case, target))
 
122
            revision_tree_from_workingtree(test_case, target))
122
123
 
123
124
 
124
125
def load_tests(loader, standard_tests, pattern):
138
139
            # -- vila 20090311
139
140
            chk_tree_format = WorkingTreeFormat4()
140
141
            chk_tree_format._get_matchingcontroldir = \
141
 
                lambda:breezy.controldir.format_registry.make_controldir('2a')
 
142
                lambda: breezy.controldir.format_registry.make_controldir('2a')
142
143
            test_intertree_permutations.append(
143
144
                (InterTree.__name__ + "(CHKInventory)",
144
145
                 InterTree,
162
163
                 optimiser._matching_from_tree_format,
163
164
                 optimiser._matching_to_tree_format,
164
165
                 optimiser.make_source_parent_tree_python_dirstate))
165
 
        elif (optimiser._matching_from_tree_format is not None and 
 
166
        elif (optimiser._matching_from_tree_format is not None and
166
167
              optimiser._matching_to_tree_format is not None):
167
168
            test_intertree_permutations.append(
168
169
                (optimiser.__name__,