[MERGE] reconcile progress bars for the win

Robert Collins robertc at robertcollins.net
Sat Nov 3 21:21:20 GMT 2007


Due to our default progress status being '', 0/0, reconcile helpfully
shows 0/0 no matter that deeper nested bars are showing progress.

This trivial patch makes it show 0/1 and move fractionally as
RepoReconcile objects perform reconciliation.

-Rob

=== modified file 'bzrlib/reconcile.py'
--- bzrlib/reconcile.py 2007-10-31 22:33:53 +0000
+++ bzrlib/reconcile.py 2007-11-03 20:04:13 +0000
@@ -79,6 +79,7 @@
         self.repo = self.bzrdir.find_repository()
         self.pb.note('Reconciling repository %s',
                      self.repo.bzrdir.root_transport.base)
+        self.pb.update("Reconciling repository", 0, 1)
         repo_reconciler = self.repo.reconcile(thorough=True)
         self.inconsistent_parents =
repo_reconciler.inconsistent_parents
         self.garbage_inventories = repo_reconciler.garbage_inventories

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071104/58727d56/attachment.pgp 


More information about the bazaar mailing list