Rev 3873: Merge brisbane-core tip in http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

------------------------------------------------------------
revno: 3873
revision-id: john at arbash-meinel.com-20090313072828-djt149m4lr8v7lvn
parent: john at arbash-meinel.com-20090313072221-ni97imlajgidohu3
parent: john at arbash-meinel.com-20090313073104-84v7k56qrkondv9o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hack3
timestamp: Fri 2009-03-13 02:28:28 -0500
message:
  Merge brisbane-core tip
modified:
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
    ------------------------------------------------------------
    revno: 3869.2.13
    revision-id: john at arbash-meinel.com-20090313073104-84v7k56qrkondv9o
    parent: john at arbash-meinel.com-20090313070303-0yj6miry6vyv1n2q
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: brisbane-core
    timestamp: Fri 2009-03-13 02:31:04 -0500
    message:
      Give the right progress message.
    modified:
      bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
-------------- next part --------------
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-03-13 05:21:14 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-03-13 07:31:04 +0000
@@ -362,7 +362,7 @@
     def _copy_stream(self, source_vf, target_vf, keys, message, vf_to_stream,
                      pb_offset):
         trace.mutter('repacking %d %s', len(keys), message)
-        self.pb.update('repacking %s', pb_offset)
+        self.pb.update('repacking %s' % (message,), pb_offset)
         child_pb = ui.ui_factory.nested_progress_bar()
         try:
             stream = vf_to_stream(source_vf, keys, message, child_pb)