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

  • Committer: John Arbash Meinel
  • Date: 2011-02-04 22:25:59 UTC
  • mto: (5609.2.11 2.3)
  • mto: This revision was merged to the branch mainline in revision 5652.
  • Revision ID: john@arbash-meinel.com-20110204222559-e25nlgfei7uawnvz
https://launchpad.net/bugs/713258
Fix bug #713258. Restore logging of bytes transferred.
When Martin fixed the test isolation issue with --verbose, he accidentally
made it so that we reset the bytes-transferred right before we logged
the total transfer. This changes where we log bytes transferred earlier.
The test is a little bit ugly, because we need a real TextUIFactory hooked
up to a real ProgressView. However, it should help avoid regressing again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/index.py
462
462
        trailers = 0
463
463
        pos = stream.tell()
464
464
        lines = stream.read().split('\n')
 
465
        # GZ 2009-09-20: Should really use a try/finally block to ensure close
465
466
        stream.close()
466
467
        del lines[-1]
467
468
        _, _, _, trailers = self._parse_lines(lines, pos)