/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/plugins/fastimport/processors/generic_processor.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/processors/generic_processor.py
127
127
            prune_empty_dirs=True):
128
128
        processor.ImportProcessor.__init__(self, params, verbose)
129
129
        self.prune_empty_dirs = prune_empty_dirs
130
 
        self.bzrdir = bzrdir
 
130
        self.controldir = bzrdir
131
131
        try:
132
132
            # Might be inside a branch
133
133
            (self.working_tree, self.branch) = bzrdir._get_tree_branch()
448
448
                    result.append(self.working_tree)
449
449
            elif wt_expected:
450
450
                try:
451
 
                    result.append(br.bzrdir.open_workingtree())
 
451
                    result.append(br.controldir.open_workingtree())
452
452
                except errors.NoWorkingTree:
453
453
                    self.warning("No working tree for branch %s", br)
454
454
        return result