/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-12 05:26:46 UTC
  • mfrom: (2904 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2906.
  • Revision ID: andrew.bennetts@canonical.com-20071012052646-wl95idld3ijjy714
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
421
421
            raise errors.LockContention('(remote lock)')
422
422
        elif response[0] == 'UnlockableTransport':
423
423
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
 
424
        elif response[0] == 'LockFailed':
 
425
            raise errors.LockFailed(response[1], response[2])
424
426
        else:
425
427
            raise errors.UnexpectedSmartServerResponse(response)
426
428
 
1000
1002
            raise errors.UnlockableTransport(self.bzrdir.root_transport)
1001
1003
        elif response[0] == 'ReadOnlyError':
1002
1004
            raise errors.ReadOnlyError(self)
 
1005
        elif response[0] == 'LockFailed':
 
1006
            raise errors.LockFailed(response[1], response[2])
1003
1007
        else:
1004
1008
            raise errors.UnexpectedSmartServerResponse(response)
1005
1009