← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: John Arbash Meinel
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1505
1505
        # We need to accumulate additional repositories here, to pass them in
1506
1506
        # on various RPC's.
1507
1507
        #
 
1508
        # Make the check before we lock: this raises an exception.
 
1509
        self._check_fallback_repository(repository)
1508
1510
        if self.is_locked():
1509
1511
            # We will call fallback.unlock() when we transition to the unlocked
1510
1512
            # state, so always add a lock here. If a caller passes us a locked
1511
1513
            # repository, they are responsible for unlocking it later.
1512
1514
            repository.lock_read()
1513
 
        self._check_fallback_repository(repository)
1514
1515
        self._fallback_repositories.append(repository)
1515
1516
        # If self._real_repository was parameterised already (e.g. because a
1516
1517
        # _real_branch had its get_stacked_on_url method called), then the