/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconcile.py
60
60
 
61
61
    def __init__(self, dir, other=None, canonicalize_chks=False):
62
62
        """Create a Reconciler."""
63
 
        self.bzrdir = dir
 
63
        self.controldir = dir
64
64
        self.canonicalize_chks = canonicalize_chks
65
65
 
66
66
    def reconcile(self):
89
89
 
90
90
    def _reconcile_branch(self):
91
91
        try:
92
 
            self.branch = self.bzrdir.open_branch()
 
92
            self.branch = self.controldir.open_branch()
93
93
        except errors.NotBranchError:
94
94
            # Nothing to check here
95
95
            self.fixed_branch_history = None
99
99
        self.fixed_branch_history = branch_reconciler.fixed_history
100
100
 
101
101
    def _reconcile_repository(self):
102
 
        self.repo = self.bzrdir.find_repository()
 
102
        self.repo = self.controldir.find_repository()
103
103
        ui.ui_factory.note(gettext('Reconciling repository %s') %
104
104
            self.repo.user_url)
105
105
        self.pb.update(gettext("Reconciling repository"), 0, 1)