← Back to branch summary

~ubuntu-branches/debian/experimental/bzr/experimental

« back to all changes in this revision

Viewing changes to bzrlib/smart/request.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-03-31 12:03:48 UTC
  • mfrom: (1.1.65 upstream) (9.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20110331120348-udzyazjjzx8ywahr
Tags: 2.4.0~beta1-1
https://launchpad.net/bugs/207253
* New upstream release.
 + Drop patches merged upstream: 01_test_locale, 04_cpu_count,
 05_kfreebsd_tests, 06_format_gc_chk_sha1_record
 + Fixes directory modes in zip files. LP: #207253

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
446
446
        return ('TokenMismatch', err.given_token, err.lock_token)
447
447
    elif isinstance(err, errors.LockContention):
448
448
        return ('LockContention',)
 
449
    elif isinstance(err, MemoryError):
 
450
        # GZ 2011-02-24: Copy bzrlib.trace -Dmem_dump functionality here?
 
451
        return ('MemoryError',)
449
452
    # Unserialisable error.  Log it, and return a generic error
450
453
    trace.log_exception_quietly()
451
 
    return ('error', str(err))
 
454
    return ('error', trace._qualified_exception_name(err.__class__, True),
 
455
        str(err))
452
456
 
453
457
 
454
458
class HelloRequest(SmartServerRequest):
501
505
    'Branch.set_tags_bytes', 'bzrlib.smart.branch',
502
506
    'SmartServerBranchSetTagsBytes')
503
507
request_handlers.register_lazy(
 
508
    'Branch.heads_to_fetch', 'bzrlib.smart.branch',
 
509
    'SmartServerBranchHeadsToFetch')
 
510
request_handlers.register_lazy(
504
511
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
505
512
request_handlers.register_lazy(
506
513
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')