/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/test_inv.py

  • Committer: Jelmer Vernooij
  • Date: 2017-08-05 01:03:53 UTC
  • mto: This revision was merged to the branch mainline in revision 6748.
  • Revision ID: jelmer@jelmer.uk-20170805010353-xf2he3legaw577sa
Rename matchingbzrdir to matchingcontroldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_inv.py
64
64
                'apply_delta':apply_inventory_Repository_add_inventory_by_delta,
65
65
                'format':format}))
66
66
    for format in workingtree.format_registry._get_all():
67
 
        repo_fmt = format._matchingbzrdir.repository_format
 
67
        repo_fmt = format._matchingcontroldir.repository_format
68
68
        if not repo_fmt.supports_full_versioned_files:
69
69
            continue
70
70
        scenarios.append(
107
107
    :param delta: The inventory delta to apply:
108
108
    :return: An inventory resulting from the application.
109
109
    """
110
 
    control = self.make_controldir('tree', format=self.format._matchingbzrdir)
 
110
    control = self.make_controldir('tree', format=self.format._matchingcontroldir)
111
111
    control.create_repository()
112
112
    control.create_branch()
113
113
    tree = self.format.initialize(control)
198
198
    :param delta: The inventory delta to apply:
199
199
    :return: An inventory resulting from the application.
200
200
    """
201
 
    control = test.make_controldir('tree', format=test.format._matchingbzrdir)
 
201
    control = test.make_controldir('tree', format=test.format._matchingcontroldir)
202
202
    control.create_repository()
203
203
    control.create_branch()
204
204
    tree = test.format.initialize(control)
245
245
    :return: An inventory resulting from the application.
246
246
    """
247
247
    format = self.format()
248
 
    control = self.make_controldir('tree', format=format._matchingbzrdir)
 
248
    control = self.make_controldir('tree', format=format._matchingcontroldir)
249
249
    repo = format.initialize(control)
250
250
    repo.lock_write()
251
251
    try: