← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
669
669
 
670
670
    def _path_for_remote_call(self, client):
671
671
        """Return the path to be used for this bzrdir in a remote call."""
672
 
        return urlutils.split_segment_parameters_raw(
673
 
            client.remote_path_from_transport(self.root_transport))[0]
 
672
        return client.remote_path_from_transport(self.root_transport)
674
673
 
675
674
    def get_branch_transport(self, branch_format, name=None):
676
675
        self._ensure_real()
1506
1505
        # We need to accumulate additional repositories here, to pass them in
1507
1506
        # on various RPC's.
1508
1507
        #
 
1508
        # Make the check before we lock: this raises an exception.
 
1509
        self._check_fallback_repository(repository)
1509
1510
        if self.is_locked():
1510
1511
            # We will call fallback.unlock() when we transition to the unlocked
1511
1512
            # state, so always add a lock here. If a caller passes us a locked
1512
1513
            # repository, they are responsible for unlocking it later.
1513
1514
            repository.lock_read()
1514
 
        self._check_fallback_repository(repository)
1515
1515
        self._fallback_repositories.append(repository)
1516
1516
        # If self._real_repository was parameterised already (e.g. because a
1517
1517
        # _real_branch had its get_stacked_on_url method called), then the