← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/message.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/message.py
134
134
 
135
135
    def _args_received(self, args):
136
136
        self.expecting = 'body'
137
 
        self.request_handler.dispatch_command(args[0], args[1:])
 
137
        self.request_handler.args_received(args)
138
138
        if self.request_handler.finished_reading:
139
139
            self._response_sent = True
140
140
            self.responder.send_response(self.request_handler.response)
283
283
                    self._protocol_decoder._get_in_buffer()[:10],
284
284
                    self._protocol_decoder.state_accept.__name__)
285
285
            raise errors.ConnectionReset(
286
 
                "please check connectivity and permissions")
 
286
                "Unexpected end of message. "
 
287
                "Please check connectivity and permissions, and report a bug "
 
288
                "if problems persist.")
287
289
        self._protocol_decoder.accept_bytes(bytes)
288
290
 
289
291
    def protocol_error(self, exception):
328
330
        while not self.finished_reading:
329
331
            while self._bytes_parts:
330
332
                bytes_part = self._bytes_parts.popleft()
331
 
                if 'hpss' in debug.debug_flags:
 
333
                if 'hpssdetail' in debug.debug_flags:
332
334
                    mutter('              %d byte part read', len(bytes_part))
333
335
                yield bytes_part
334
336
            self._read_more()
351
353
        raise errors.LockContention('(remote lock)')
352
354
    elif error_name == 'LockFailed':
353
355
        raise errors.LockFailed(*error_args[:2])
 
356
    elif error_name == 'FileExists':
 
357
        raise errors.FileExists(error_args[0])
 
358
    elif error_name == 'NoSuchFile':
 
359
        raise errors.NoSuchFile(error_args[0])
354
360
    else:
355
361
        raise errors.ErrorFromSmartServer(error_tuple)