← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
315
315
            return token
316
316
        elif response[0] == 'LockContention':
317
317
            raise errors.LockContention('(remote lock)')
 
318
        elif response[0] == 'UnlockableTransport':
 
319
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
318
320
        else:
319
321
            assert False, 'unexpected response code %s' % (response,)
320
322
 
674
676
            raise errors.LockContention('(remote lock)')
675
677
        elif response[0] == 'TokenMismatch':
676
678
            raise errors.TokenMismatch(tokens, '(remote tokens)')
 
679
        elif response[0] == 'UnlockableTransport':
 
680
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
677
681
        else:
678
682
            assert False, 'unexpected response code %r' % (response,)
679
683
            
844
848
        self._ensure_real()
845
849
        return self._real_branch.set_last_revision_info(revno, revision_id)
846
850
 
 
851
    def generate_revision_history(self, revision_id, last_rev=None,
 
852
                                  other_branch=None):
 
853
        self._ensure_real()
 
854
        return self._real_branch.generate_revision_history(
 
855
            revision_id, last_rev=last_rev, other_branch=other_branch)
 
856
 
847
857
 
848
858
class RemoteWorkingTree(object):
849
859