/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/plugins/weave_fmt/repository.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/plugins/weave_fmt/repository.py
352
352
 
353
353
    supports_funky_characters = False
354
354
 
355
 
    _matchingbzrdir = weave_bzrdir.BzrDirFormat4()
 
355
    _matchingcontroldir = weave_bzrdir.BzrDirFormat4()
356
356
 
357
357
    def get_format_description(self):
358
358
        """See RepositoryFormat.get_format_description()."""
400
400
    """
401
401
 
402
402
    _versionedfile_class = weave.WeaveFile
403
 
    _matchingbzrdir = weave_bzrdir.BzrDirFormat5()
 
403
    _matchingcontroldir = weave_bzrdir.BzrDirFormat5()
404
404
    supports_funky_characters = False
405
405
 
406
406
    @property
413
413
 
414
414
    def network_name(self):
415
415
        """The network name for this format is the control dirs disk label."""
416
 
        return self._matchingbzrdir.get_format_string()
 
416
        return self._matchingcontroldir.get_format_string()
417
417
 
418
418
    def _get_inventories(self, repo_transport, repo, name='inventory'):
419
419
        mapper = versionedfile.ConstantMapper(name)
447
447
    """
448
448
 
449
449
    _versionedfile_class = weave.WeaveFile
450
 
    _matchingbzrdir = weave_bzrdir.BzrDirFormat6()
 
450
    _matchingcontroldir = weave_bzrdir.BzrDirFormat6()
451
451
    supports_funky_characters = False
452
452
    @property
453
453
    def _serializer(self):
459
459
 
460
460
    def network_name(self):
461
461
        """The network name for this format is the control dirs disk label."""
462
 
        return self._matchingbzrdir.get_format_string()
 
462
        return self._matchingcontroldir.get_format_string()
463
463
 
464
464
    def _get_inventories(self, repo_transport, repo, name='inventory'):
465
465
        mapper = versionedfile.ConstantMapper(name)