Rev 3040: (robertc) Fix the text progress for pack to pack fetches. (Robert Collins). in http://people.ubuntu.com/~robertc/baz2.0/reconcile

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/reconcile

------------------------------------------------------------
revno: 3040
revision-id:robertc at robertcollins.net-20071128012616-g714qafixu08w0pc
parent: pqm at pqm.ubuntu.com-20071128005930-4wb5pl12fyq8ek13
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack-progress
timestamp: Wed 2007-11-28 12:26:16 +1100
message:
  (robertc) Fix the text progress for pack to pack fetches. (Robert Collins).
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
=== modified file 'NEWS'
--- a/NEWS	2007-11-27 20:35:02 +0000
+++ b/NEWS	2007-11-28 01:26:16 +0000
@@ -76,7 +76,7 @@
      (Martin Pool, #164637)
 
    * A progress bar has been added for knitpack -> knitpack fetching.
-     (Robert Collins, #157789)
+     (Robert Collins, #157789, #159147)
 
    * ``commit`` is now able to invoke an external editor in a non-ascii
      directory. (Daniel Watkins, #84043)

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2007-11-28 00:59:30 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-11-28 01:26:16 +0000
@@ -745,8 +745,9 @@
         """
         pb = ui.ui_factory.nested_progress_bar()
         try:
-            return self._do_copy_nodes_graph(nodes, index_map, writer,
-                write_index, output_lines, pb)
+            for result in self._do_copy_nodes_graph(nodes, index_map, writer,
+                write_index, output_lines, pb):
+                yield result
         finally:
             pb.finished()