Rev 2959: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/reconcile

[Robert Collins]

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

------------------------------------------------------------
revno: 2959
revision-id:robertc at robertcollins.net-20071104153255-00xlkcuu9cl6gqzn
parent: robertc at robertcollins.net-20071103183255-3h06a3ijbennz6w1
parent: pqm at pqm.ubuntu.com-20071104041002-f0vk33xqo463lnt6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Mon 2007-11-05 02:32:55 +1100
message:
  Merge bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
    ------------------------------------------------------------
    revno: 2951.1.10
    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: 2951.1.9.1.1
        revision-id: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:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
    ------------------------------------------------------------
    revno: 2951.1.9
    revision-id:pqm at pqm.ubuntu.com-20071103230216-mnmwuxm413lyhjdv
    parent: pqm at pqm.ubuntu.com-20071103093911-4alf7wiad3n3vfz6
    parent: robertc at robertcollins.net-20071031165438-lc0o11v5vaf3p1ta
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-11-03 23:02:16 +0000
    message:
      (robertc) Fix data-refresh logic for packs not to refresh mid-transaction when a names write lock is held. (Robert Collins)
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
=== 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-31 22:33:53 +0000
+++ b/bzrlib/reconcile.py	2007-11-04 15:32:55 +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