/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/test_missing.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/test_missing.py
68
68
        base_tree.add(['a'], ['a-id'])
69
69
        base_tree.commit('add a', rev_id='b-1')
70
70
 
71
 
        child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
 
71
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
72
72
 
73
73
        self.build_tree(['child/b'])
74
74
        child_tree.add(['b'], ['b-id'])
157
157
    def test_one_ahead(self):
158
158
        tree = self.make_branch_and_tree('tree')
159
159
        rev1 = tree.commit('one')
160
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
160
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
161
161
        rev2 = tree2.commit('two')
162
162
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
163
163
        self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch)
165
165
    def test_restrict(self):
166
166
        tree = self.make_branch_and_tree('tree')
167
167
        rev1 = tree.commit('one')
168
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
168
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
169
169
        rev2 = tree2.commit('two')
170
170
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
171
171
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
175
175
    def test_merged(self):
176
176
        tree = self.make_branch_and_tree('tree')
177
177
        rev1 = tree.commit('one')
178
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
178
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
179
179
        rev2 = tree2.commit('two')
180
180
        rev3 = tree2.commit('three')
181
181
        tree.merge_from_branch(tree2.branch)
191
191
        tree = self.make_branch_and_tree('tree')
192
192
        rev1 = tree.commit('one', rev_id='rev1')
193
193
 
194
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
194
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
195
195
        rev2 = tree2.commit('two', rev_id='rev2')
196
196
        rev3 = tree2.commit('three', rev_id='rev3')
197
197
 
198
 
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
198
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
199
199
        rev4 = tree3.commit('four', rev_id='rev4')
200
200
        rev5 = tree3.commit('five', rev_id='rev5')
201
201
 
232
232
    def test_revision_range(self):
233
233
        local = self.make_branch_and_tree('local')
234
234
        lrevid1 = local.commit('one')
235
 
        remote = local.bzrdir.sprout('remote').open_workingtree()
 
235
        remote = local.controldir.sprout('remote').open_workingtree()
236
236
        rrevid2 = remote.commit('two')
237
237
        rrevid3 = remote.commit('three')
238
238
        rrevid4 = remote.commit('four')