/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/weavefile.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/weavefile.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
118
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
 
    lines = iter(f.readlines())
 
121
    try:
 
122
        lines = iter(f.readlines())
 
123
    finally:
 
124
        f.close()
122
125
 
123
126
    try:
124
127
        l = lines.next()