← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

  • Committer: Aaron Bentley
  • Date: 2008-04-28 01:27:45 UTC
  • mfrom: (3383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3384.
  • Revision ID: aaron@aaronbentley.com-20080428012745-n6x7a8cymzkswbtv
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
412
412
        pack = ContainerSerialiser()
413
413
        buffer.write(pack.begin())
414
414
        try:
415
 
            try:
416
 
                for name_tuple, bytes in stream:
417
 
                    buffer.write(pack.bytes_record(bytes, [name_tuple]))
418
 
            except:
419
 
                # Undo the lock_read that happens once the iterator from
420
 
                # get_data_stream is started.
421
 
                repository.unlock()
422
 
                raise
 
415
            for name_tuple, bytes in stream:
 
416
                buffer.write(pack.bytes_record(bytes, [name_tuple]))
423
417
        except errors.RevisionNotPresent, e:
424
418
            return FailedSmartServerResponse(('NoSuchRevision', e.revision_id))
425
419
        buffer.write(pack.end())