← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

(jam) Merge 2.4 into trunk, including bugs #825027 and #837293

Show diffs side-by-side

added added

removed removed

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