/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/switch.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/switch.py
78
78
    branch_format = control.find_branch_format()
79
79
    if branch_format.get_reference(control) is not None:
80
80
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
81
        branch_format.set_reference(control, None, to_branch)
82
82
    else:
83
83
        b = control.open_branch()
84
84
        bound_branch = b.get_bound_location()