/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/request.py

  • Committer: Robert Collins
  • Date: 2009-07-29 04:54:33 UTC
  • mfrom: (4573 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4649.
  • Revision ID: robertc@robertcollins.net-20090729045433-fnz0tahsr4smahww
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
398
398
    elif isinstance(err, errors.TokenMismatch):
399
399
        return ('TokenMismatch', err.given_token, err.lock_token)
400
400
    elif isinstance(err, errors.LockContention):
401
 
        return ('LockContention', err.lock, err.msg)
 
401
        return ('LockContention',)
402
402
    # Unserialisable error.  Log it, and return a generic error
403
403
    trace.log_exception_quietly()
404
404
    return ('error', str(err))
451
451
    'Branch.get_tags_bytes', 'bzrlib.smart.branch',
452
452
    'SmartServerBranchGetTagsBytes')
453
453
request_handlers.register_lazy(
 
454
    'Branch.set_tags_bytes', 'bzrlib.smart.branch',
 
455
    'SmartServerBranchSetTagsBytes')
 
456
request_handlers.register_lazy(
454
457
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
455
458
request_handlers.register_lazy(
456
459
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')