← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Jelmer Vernooij
  • Date: 2009-09-02 15:23:35 UTC
  • mfrom: (4666 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4757.
  • Revision ID: jelmer@samba.org-20090902152335-h9m8dt9p08snroln
merge bzr.dev.

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))
553
556
request_handlers.register_lazy(
554
557
    'Repository.insert_stream', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream')
555
558
request_handlers.register_lazy(
 
559
    'Repository.insert_stream_1.19', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream_1_19')
 
560
request_handlers.register_lazy(
556
561
    'Repository.insert_stream_locked', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStreamLocked')
557
562
request_handlers.register_lazy(
558
563
    'Repository.is_shared', 'bzrlib.smart.repository', 'SmartServerRepositoryIsShared')
570
575
    'Repository.get_stream', 'bzrlib.smart.repository',
571
576
    'SmartServerRepositoryGetStream')
572
577
request_handlers.register_lazy(
 
578
    'Repository.get_stream_1.19', 'bzrlib.smart.repository',
 
579
    'SmartServerRepositoryGetStream_1_19')
 
580
request_handlers.register_lazy(
573
581
    'Repository.tarball', 'bzrlib.smart.repository',
574
582
    'SmartServerRepositoryTarball')
575
583
request_handlers.register_lazy(