Rev 2961: (robertc) Reconcile now shows progress bars. (Robert Collins, #159351) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2961
revision-id: pqm at pqm.ubuntu.com-20071104041002-f0vk33xqo463lnt6
parent: pqm at pqm.ubuntu.com-20071103230216-mnmwuxm413lyhjdv
parent: robertc at robertcollins.net-20071104030007-0qo670m4ueihsa15
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-11-04 04:10:02 +0000
message:
  (robertc) Reconcile now shows progress bars. (Robert Collins, #159351)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
    ------------------------------------------------------------
    revno: 2960.1.1
    merged: robertc at robertcollins.net-20071104030007-0qo670m4ueihsa15
    parent: pqm at pqm.ubuntu.com-20071103230216-mnmwuxm413lyhjdv
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Sun 2007-11-04 14:00:07 +1100
    message:
      * Reconcile now shows progress bars. (Robert Collins, #159351)
=== modified file 'NEWS'
--- a/NEWS	2007-10-31 14:37:46 +0000
+++ b/NEWS	2007-11-04 03:00:07 +0000
@@ -191,6 +191,8 @@
      directory to detect leaking tests.
      (Vincent Ladeuil, #147986)
 
+   * Reconcile now shows progress bars. (Robert Collins, #159351)
+
    * The basename, not the full path, is now used when checking whether
      the profiling dump file begins with ``callgrind.out`` or not. This
      fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)

=== modified file 'bzrlib/reconcile.py'
--- a/bzrlib/reconcile.py	2007-10-26 06:58:43 +0000
+++ b/bzrlib/reconcile.py	2007-11-04 03:00:07 +0000
@@ -78,6 +78,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