/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/weave_fmt/workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
103
103
                         inv,
104
104
                         _internal=True,
105
105
                         _format=self,
106
 
                         _bzrdir=a_controldir,
 
106
                         _controldir=a_controldir,
107
107
                         _control_files=branch.control_files)
108
108
        basis_tree = branch.repository.revision_tree(revision_id)
109
109
        if basis_tree.get_root_id() is not None:
138
138
        wt = WorkingTree2(a_controldir.root_transport.local_abspath('.'),
139
139
                           _internal=True,
140
140
                           _format=self,
141
 
                           _bzrdir=a_controldir,
 
141
                           _controldir=a_controldir,
142
142
                           _control_files=a_controldir.open_branch().control_files)
143
143
        return wt
144
144