Rev 3045: (robertc) Be more correct with progress bar usage in pack to pack in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3045
revision-id:pqm at pqm.ubuntu.com-20071128235613-x2mlgis46pvcfphp
parent: pqm at pqm.ubuntu.com-20071128230840-b2ra2nso0qtqxon6
parent: robertc at robertcollins.net-20071128215507-a72akc0jdq71k7vg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-11-28 23:56:13 +0000
message:
  (robertc) Be more correct with progress bar usage in pack to pack
  	copying. (Robert Collins, #159147)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3039.1.3
    revision-id:robertc at robertcollins.net-20071128215507-a72akc0jdq71k7vg
    parent: robertc at robertcollins.net-20071128215410-7k4vfjqd5akacmjj
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pack-progress
    timestamp: Thu 2007-11-29 08:55:07 +1100
    message:
      Document the try:except:else: rather than a finally: in pack_repo.._copy_nodes_graph.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3039.1.2
    revision-id:robertc at robertcollins.net-20071128215410-7k4vfjqd5akacmjj
    parent: robertc at robertcollins.net-20071128012616-g714qafixu08w0pc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pack-progress
    timestamp: Thu 2007-11-29 08:54:10 +1100
    message:
      python2.4 'compatibility'.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3039.1.1
    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-28 01:35:49 +0000
+++ b/NEWS	2007-11-28 23:56:13 +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 21:55:07 +0000
@@ -745,9 +745,14 @@
         """
         pb = ui.ui_factory.nested_progress_bar()
         try:
-            return self._do_copy_nodes_graph(nodes, index_map, writer,
-                write_index, output_lines, pb)
-        finally:
+            for result in self._do_copy_nodes_graph(nodes, index_map, writer,
+                write_index, output_lines, pb):
+                yield result
+        except Exception:
+            # Python 2.4 does not permit try:finally: in a generator.
+            pb.finished()
+            raise
+        else:
             pb.finished()
 
     def _do_copy_nodes_graph(self, nodes, index_map, writer, write_index,