← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

Introduce BzrDir.destroy_workingtree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
29
29
        tree = self.make_branch_and_tree('a')
30
30
        tree.commit('empty commit')
31
31
        tree2 = self.make_branch_and_tree('b')
32
 
        # set a left most parent
 
32
        # set a left most parent that is not a present commit
33
33
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
34
34
        # do a merge
35
 
        self.merge(tree.branch, tree2)
 
35
        tree2.merge_from_branch(tree.branch)
36
36
        output = StringIO()
37
37
        show_pending_merges(tree2, output)
38
38
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
44
        r2_id = tree.commit('two', allow_pointless=True)
45
45
        r2_tree = tree.branch.repository.revision_tree(r2_id)
46
46
        output = StringIO()
47
 
        show_tree_status(tree, to_file=output, revision=[RevisionSpec("revid:%s" % r1_id), RevisionSpec("revid:%s" % r2_id)])
 
47
        show_tree_status(tree, to_file=output,
 
48
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
49
                               RevisionSpec.from_string("revid:%s" % r2_id)])
48
50
        # return does not matter as long as it did not raise.