← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
364
364
        return ('FileExists', err.path)
365
365
    elif isinstance(err, errors.DirectoryNotEmpty):
366
366
        return ('DirectoryNotEmpty', err.path)
 
367
    elif isinstance(err, errors.IncompatibleRepositories):
 
368
        return ('IncompatibleRepositories', str(err.source), str(err.target),
 
369
            str(err.details))
367
370
    elif isinstance(err, errors.ShortReadvError):
368
371
        return ('ShortReadvError', err.path, str(err.offset), str(err.length),
369
372
                str(err.actual))
398
401
    elif isinstance(err, errors.TokenMismatch):
399
402
        return ('TokenMismatch', err.given_token, err.lock_token)
400
403
    elif isinstance(err, errors.LockContention):
401
 
        return ('LockContention', err.lock, err.msg)
 
404
        return ('LockContention',)
402
405
    # Unserialisable error.  Log it, and return a generic error
403
406
    trace.log_exception_quietly()
404
407
    return ('error', str(err))
451
454
    'Branch.get_tags_bytes', 'bzrlib.smart.branch',
452
455
    'SmartServerBranchGetTagsBytes')
453
456
request_handlers.register_lazy(
 
457
    'Branch.set_tags_bytes', 'bzrlib.smart.branch',
 
458
    'SmartServerBranchSetTagsBytes')
 
459
request_handlers.register_lazy(
454
460
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
455
461
request_handlers.register_lazy(
456
462
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')
550
556
request_handlers.register_lazy(
551
557
    'Repository.insert_stream', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream')
552
558
request_handlers.register_lazy(
 
559
    'Repository.insert_stream_1.19', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream_1_19')
 
560
request_handlers.register_lazy(
553
561
    'Repository.insert_stream_locked', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStreamLocked')
554
562
request_handlers.register_lazy(
555
563
    'Repository.is_shared', 'bzrlib.smart.repository', 'SmartServerRepositoryIsShared')
567
575
    'Repository.get_stream', 'bzrlib.smart.repository',
568
576
    'SmartServerRepositoryGetStream')
569
577
request_handlers.register_lazy(
 
578
    'Repository.get_stream_1.19', 'bzrlib.smart.repository',
 
579
    'SmartServerRepositoryGetStream_1_19')
 
580
request_handlers.register_lazy(
570
581
    'Repository.tarball', 'bzrlib.smart.repository',
571
582
    'SmartServerRepositoryTarball')
572
583
request_handlers.register_lazy(