/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: Vincent Ladeuil
  • Date: 2011-11-18 07:29:20 UTC
  • mfrom: (6277 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6278.
  • Revision ID: v.ladeuil+lp@free.fr-20111118072920-76q1ho772bkmnno2
Merge trunk to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/request.py
31
31
# of a SmartServerRequest subclass.
32
32
 
33
33
 
34
 
import tempfile
35
 
import thread
36
34
import threading
37
35
 
38
36
from bzrlib import (
48
46
from bzrlib.lazy_import import lazy_import
49
47
lazy_import(globals(), """
50
48
from bzrlib.bundle import serializer
 
49
 
 
50
import tempfile
 
51
import thread
51
52
""")
52
53
 
53
54
 
134
135
        It will return a SmartServerResponse if the command does not expect a
135
136
        body.
136
137
 
137
 
        :param *args: the arguments of the request.
 
138
        :param args: the arguments of the request.
138
139
        """
139
140
        self._check_enabled()
140
141
        return self.do(*args)
446
447
        return ('TokenMismatch', err.given_token, err.lock_token)
447
448
    elif isinstance(err, errors.LockContention):
448
449
        return ('LockContention',)
 
450
    elif isinstance(err, MemoryError):
 
451
        # GZ 2011-02-24: Copy bzrlib.trace -Dmem_dump functionality here?
 
452
        return ('MemoryError',)
449
453
    # Unserialisable error.  Log it, and return a generic error
450
454
    trace.log_exception_quietly()
451
 
    return ('error', str(err))
 
455
    return ('error', trace._qualified_exception_name(err.__class__, True),
 
456
        str(err))
452
457
 
453
458
 
454
459
class HelloRequest(SmartServerRequest):
501
506
    'Branch.set_tags_bytes', 'bzrlib.smart.branch',
502
507
    'SmartServerBranchSetTagsBytes')
503
508
request_handlers.register_lazy(
 
509
    'Branch.heads_to_fetch', 'bzrlib.smart.branch',
 
510
    'SmartServerBranchHeadsToFetch')
 
511
request_handlers.register_lazy(
504
512
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
505
513
request_handlers.register_lazy(
506
514
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')
510
518
    'bzrlib.smart.branch', 'SmartServerRequestRevisionHistory')
511
519
request_handlers.register_lazy( 'Branch.set_config_option',
512
520
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetConfigOption')
 
521
request_handlers.register_lazy( 'Branch.set_config_option_dict',
 
522
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetConfigOptionDict')
513
523
request_handlers.register_lazy( 'Branch.set_last_revision',
514
524
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetLastRevision')
515
525
request_handlers.register_lazy(
603
613
request_handlers.register_lazy(
604
614
    'Repository.has_revision', 'bzrlib.smart.repository', 'SmartServerRequestHasRevision')
605
615
request_handlers.register_lazy(
 
616
    'Repository.has_signature_for_revision_id', 'bzrlib.smart.repository',
 
617
    'SmartServerRequestHasSignatureForRevisionId')
 
618
request_handlers.register_lazy(
606
619
    'Repository.insert_stream', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream')
607
620
request_handlers.register_lazy(
608
621
    'Repository.insert_stream_1.19', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream_1_19')
613
626
request_handlers.register_lazy(
614
627
    'Repository.lock_write', 'bzrlib.smart.repository', 'SmartServerRepositoryLockWrite')
615
628
request_handlers.register_lazy(
 
629
    'Repository.make_working_trees', 'bzrlib.smart.repository', 'SmartServerRepositoryMakeWorkingTrees')
 
630
request_handlers.register_lazy(
616
631
    'Repository.set_make_working_trees', 'bzrlib.smart.repository',
617
632
    'SmartServerRepositorySetMakeWorkingTrees')
618
633
request_handlers.register_lazy(