/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/bzr/vf_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/vf_repository.py
1204
1204
        # The old API returned a list, should this actually be a set?
1205
1205
        return list(parent_map)
1206
1206
 
1207
 
    def __init__(self, _format, a_bzrdir, control_files):
 
1207
    def __init__(self, _format, a_controldir, control_files):
1208
1208
        """Instantiate a VersionedFileRepository.
1209
1209
 
1210
1210
        :param _format: The format of the repository on disk.
1214
1214
        # In the future we will have a single api for all stores for
1215
1215
        # getting file texts, inventories and revisions, then
1216
1216
        # this construct will accept instances of those things.
1217
 
        super(VersionedFileRepository, self).__init__(_format, a_bzrdir,
 
1217
        super(VersionedFileRepository, self).__init__(_format, a_controldir,
1218
1218
            control_files)
1219
1219
        self._transport = control_files._transport
1220
1220
        self.base = self._transport.base
2004
2004
                                     VersionedFileRepository):
2005
2005
    """Repositories in a meta-dir, that work via versioned file objects."""
2006
2006
 
2007
 
    def __init__(self, _format, a_bzrdir, control_files):
2008
 
        super(MetaDirVersionedFileRepository, self).__init__(_format, a_bzrdir,
 
2007
    def __init__(self, _format, a_controldir, control_files):
 
2008
        super(MetaDirVersionedFileRepository, self).__init__(_format, a_controldir,
2009
2009
            control_files)
2010
2010
 
2011
2011
 
2755
2755
            return True
2756
2756
        # Only use this code path for local source and target.  IDS does far
2757
2757
        # too much IO (both bandwidth and roundtrips) over a network.
2758
 
        if not source.bzrdir.transport.base.startswith('file:///'):
 
2758
        if not source.controldir.transport.base.startswith('file:///'):
2759
2759
            return False
2760
 
        if not target.bzrdir.transport.base.startswith('file:///'):
 
2760
        if not target.controldir.transport.base.startswith('file:///'):
2761
2761
            return False
2762
2762
        return True
2763
2763