← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 04:10:02 UTC
  • mfrom: (2960.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20071104041002-f0vk33xqo463lnt6
(robertc) Reconcile now shows progress bars. (Robert Collins, #159351)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
78
78
        self.repo = self.bzrdir.find_repository()
79
79
        self.pb.note('Reconciling repository %s',
80
80
                     self.repo.bzrdir.root_transport.base)
 
81
        self.pb.update("Reconciling repository", 0, 1)
81
82
        repo_reconciler = self.repo.reconcile(thorough=True)
82
83
        self.inconsistent_parents = repo_reconciler.inconsistent_parents
83
84
        self.garbage_inventories = repo_reconciler.garbage_inventories