/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/smart/repository.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
392
392
        if token == '':
393
393
            token = None
394
394
        try:
395
 
            token = repository.lock_write(token=token).repository_token
 
395
            token = repository.lock_write(token=token)
396
396
        except errors.LockContention, e:
397
397
            return FailedSmartServerResponse(('LockContention',))
398
398
        except errors.UnlockableTransport: