← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
https://launchpad.net/bugs/177390
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
17
17
 
18
18
from StringIO import StringIO
19
19
 
20
 
from bzrlib import config
21
20
from bzrlib.revisionspec import RevisionSpec
22
21
from bzrlib.status import show_pending_merges, show_tree_status
23
22
from bzrlib.tests import TestCaseWithTransport
35
34
        # do a merge
36
35
        tree2.merge_from_branch(tree.branch)
37
36
        output = StringIO()
38
 
        tree2.lock_read()
39
 
        try:
40
 
            show_pending_merges(tree2, output)
41
 
        finally:
42
 
            tree2.unlock()
 
37
        show_pending_merges(tree2, output)
43
38
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
39
 
45
 
    def test_multiple_pending(self):
46
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
47
 
        tree = self.make_branch_and_tree('a')
48
 
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
49
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
50
 
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
51
 
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
52
 
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
53
 
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
 
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
 
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch)
57
 
        output = StringIO()
58
 
        tree.lock_read()
59
 
        self.addCleanup(tree.unlock)
60
 
        show_pending_merges(tree, output)
61
 
        # Even though 2b is in the ancestry of 3c, it should only be displayed
62
 
        # under the first merge parent.
63
 
        self.assertEqualDiff('pending merges:\n'
64
 
                             '  Joe Foo 2007-12-04 commit 3b\n'
65
 
                             '    Joe Foo 2007-12-04 commit 2b\n'
66
 
                             '  Joe Foo 2007-12-04 commit 3c\n',
67
 
                             output.getvalue())
68
 
 
69
 
    def test_with_pending_ghost(self):
70
 
        """Test when a pending merge is itself a ghost"""
71
 
        tree = self.make_branch_and_tree('a')
72
 
        tree.commit('first')
73
 
        tree.add_parent_tree_id('a-ghost-revision')
74
 
        tree.lock_read()
75
 
        self.addCleanup(tree.unlock)
76
 
        output = StringIO()
77
 
        show_pending_merges(tree, output)
78
 
        self.assertEqualDiff('pending merges:\n'
79
 
                             '  (ghost) a-ghost-revision\n',
80
 
                             output.getvalue())
81
 
 
82
 
    def test_pending_with_ghosts(self):
83
 
        """Test when a pending merge's ancestry includes ghosts."""
84
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
85
 
        tree = self.make_branch_and_tree('a')
86
 
        tree.commit('empty commit')
87
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
88
 
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
89
 
        tree2.add_parent_tree_id('a-ghost-revision')
90
 
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
91
 
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
92
 
        tree.merge_from_branch(tree2.branch)
93
 
        tree.lock_read()
94
 
        self.addCleanup(tree.unlock)
95
 
        output = StringIO()
96
 
        show_pending_merges(tree, output)
97
 
        self.assertEqualDiff('pending merges:\n'
98
 
                             '  Joe Foo 2007-12-04 another non-ghost\n'
99
 
                             '    Joe Foo 2007-12-04 commit with ghost\n'
100
 
                             '    (ghost) a-ghost-revision\n'
101
 
                             '    Joe Foo 2007-12-04 a non-ghost\n',
102
 
                             output.getvalue())
103
 
 
104
40
    def tests_revision_to_revision(self):
105
41
        """doing a status between two revision trees should work."""
106
42
        tree = self.make_branch_and_tree('.')