/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/protocol.py

Merge bzr.dev 4032. Resolve the new streaming fetch.

XXX: We cheat a bit for CHK fetching. CHK serializers happen to still
have legacy 'read_inventory_from_string' and 'write_inventory_to_string'
functions that convert the paged representation to a single-string XML
representation.

So when converting between formats, we just go down to the
whole-inventory XML form.

At least it works for now. Even if it is grossly innefficient.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
1247
1247
                self._write_prefixed_body(part)
1248
1248
                self.flush()
1249
1249
        except Exception:
 
1250
            exc_info = sys.exc_info()
1250
1251
            # Iterating the stream failed.  Cleanly abort the request.
1251
1252
            self._write_error_status()
1252
1253
            # Currently the client unconditionally sends ('error',) as the
1253
1254
            # error args.
1254
1255
            self._write_structure(('error',))
 
1256
            self._write_end()
 
1257
            self._medium_request.finished_writing()
 
1258
            raise exc_info[0], exc_info[1], exc_info[2]
1255
1259
        self._write_end()
1256
1260
        self._medium_request.finished_writing()
1257
1261