← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-12 04:19:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5377.
  • Revision ID: andrew.bennetts@canonical.com-20100812041907-lgauj5jm4voyjxbm
Don't traceback if a repository doesn't support reconcile_canonicalize_chks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
100
100
            self.repo.user_url)
101
101
        self.pb.update("Reconciling repository", 0, 1)
102
102
        if self.canonicalize_chks:
 
103
            try:
 
104
                self.repo.reconcile_canonicalize_chks
 
105
            except AttributeError:
 
106
                raise errors.BzrError(
 
107
                    "%s cannot canonicalize CHKs." % (self.repo,))
103
108
            repo_reconciler = self.repo.reconcile_canonicalize_chks()
104
109
        else:
105
110
            repo_reconciler = self.repo.reconcile(thorough=True)