← 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: 2010-04-22 17:08:27 UTC
  • mfrom: (5107.3.8 new_branch_and_repo_hooks)
  • Revision ID: pqm@pqm.ubuntu.com-20100422170827-h0bb41yq5nkosu6t
(vila) Add 'post_repo_init', 'post_branch_init' and 'post_switch' hooks. (Marco Pantaleoni)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
30
30
    cleanup,
31
31
    errors,
32
32
    ui,
 
33
    repository,
33
34
    )
34
35
from bzrlib.trace import mutter
35
36
from bzrlib.tsort import topo_sort
96
97
    def _reconcile_repository(self):
97
98
        self.repo = self.bzrdir.find_repository()
98
99
        ui.ui_factory.note('Reconciling repository %s' %
99
 
            self.repo.user_url)
 
100
            self.repo.bzrdir.root_transport.base)
100
101
        self.pb.update("Reconciling repository", 0, 1)
101
102
        repo_reconciler = self.repo.reconcile(thorough=True)
102
103
        self.inconsistent_parents = repo_reconciler.inconsistent_parents