/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/tests/per_repository/test_commit_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_repository/test_commit_builder.py
1083
1083
    def _commit_sprout(self, tree, name):
1084
1084
        tree.add([name], [name + 'id'])
1085
1085
        rev_id = tree.commit('')
1086
 
        return rev_id, tree.bzrdir.sprout('t2').open_workingtree()
 
1086
        return rev_id, tree.controldir.sprout('t2').open_workingtree()
1087
1087
 
1088
1088
    def _rename_in_tree(self, tree, name):
1089
1089
        tree.rename_one(name, 'new_' + name)
1178
1178
        # Part 2: change in the merged into branch - we use tree2 that has a
1179
1179
        # change to name, branch tree1 and give it an unrelated change, then
1180
1180
        # merge that to t2.
1181
 
        other_tree = tree1.bzrdir.sprout('t3').open_workingtree()
 
1181
        other_tree = tree1.controldir.sprout('t3').open_workingtree()
1182
1182
        other_rev = other_tree.commit('')
1183
1183
        tree2.merge_from_branch(other_tree.branch)
1184
1184
        _check_graph(tree2, False)
1188
1188
        # another branch. The per-file graph shows no additional change
1189
1189
        # in the merge because its a straight line.
1190
1190
        rev1 = tree1.commit('')
1191
 
        tree2 = tree1.bzrdir.sprout('t2').open_workingtree()
 
1191
        tree2 = tree1.controldir.sprout('t2').open_workingtree()
1192
1192
        # make and commit on the other side to merge back
1193
1193
        make('t2/name')
1194
1194
        file_id = 'nameid'