/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/blackbox/test_diff.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/tests/blackbox/test_diff.py
174
174
        branch1_tree.add('file')
175
175
        branch1_tree.add('file2')
176
176
        branch1_tree.commit(message='add file and file2')
177
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
177
        branch2_tree = branch1_tree.controldir.sprout('branch2').open_workingtree()
178
178
        self.build_tree_contents([('branch2/file', 'new content\n')])
179
179
        branch2_tree.commit(message='update file')
180
180
        return branch1_tree, branch2_tree
229
229
    def test_diff_branches_no_working_trees(self):
230
230
        branch1_tree, branch2_tree = self.example_branches()
231
231
        # Compare a working tree to a branch without a WT
232
 
        dir1 = branch1_tree.bzrdir
 
232
        dir1 = branch1_tree.controldir
233
233
        dir1.destroy_workingtree()
234
234
        self.assertFalse(dir1.has_workingtree())
235
235
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
240
240
        self.check_b1_vs_b2('diff --old branch1 branch2')
241
241
        self.check_b1_vs_b2('diff branch1 --new branch2')
242
242
        # Compare a branch with a WT against another without a WT
243
 
        dir2 = branch2_tree.bzrdir
 
243
        dir2 = branch2_tree.controldir
244
244
        dir2.destroy_workingtree()
245
245
        self.assertFalse(dir2.has_workingtree())
246
246
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
301
301
 
302
302
    def test_diff_to_branch_no_working_tree(self):
303
303
        branch1_tree = self.example_branch2()
304
 
        dir1 = branch1_tree.bzrdir
 
304
        dir1 = branch1_tree.controldir
305
305
        dir1.destroy_workingtree()
306
306
        self.assertFalse(dir1.has_workingtree())
307
307
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)