← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: mbp at sourcefrog
  • Date: 2007-02-13 13:18:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070213131837-7p45uhe445mwk4c4
Make Branch._transport be the branch's control file transport

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
979
979
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
980
980
        else:
981
981
            self.bzrdir = a_bzrdir
982
 
        self._transport = self.bzrdir.transport.clone('..')
983
 
        self._base = self._transport.base
 
982
        # self._transport used to point to the directory containing the
 
983
        # control directory, but was not used - now it's just the transport
 
984
        # for the branch control files.  mbp 20070212
 
985
        self._base = self.bzrdir.transport.clone('..').base
984
986
        self._format = _format
985
987
        if _control_files is None:
986
988
            raise ValueError('BzrBranch _control_files is None')
987
989
        self.control_files = _control_files
 
990
        self._transport = _control_files._transport
988
991
        if deprecated_passed(init):
989
992
            warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
990
993
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1019
1022
    __repr__ = __str__
1020
1023
 
1021
1024
    def _get_base(self):
 
1025
        """Returns the directory containing the control directory."""
1022
1026
        return self._base
1023
1027
 
1024
1028
    base = property(_get_base, doc="The URL for the root of this branch.")