1
# Copyright (C) 2005 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from StringIO import StringIO
20
from bzrlib import config
21
from bzrlib.revisionspec import RevisionSpec
22
from bzrlib.status import show_pending_merges, show_tree_status
23
from bzrlib.tests import TestCaseWithTransport
26
class TestStatus(TestCaseWithTransport):
28
def test_pending_none(self):
29
# Test whether show_pending_merges works in a tree with no commits
30
tree = self.make_branch_and_tree('a')
31
tree.commit('empty commit')
32
tree2 = self.make_branch_and_tree('b')
33
# set a left most parent that is not a present commit
34
tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
36
tree2.merge_from_branch(tree.branch)
40
show_pending_merges(tree2, output)
43
self.assertContainsRe(output.getvalue(), 'empty commit')
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)
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',
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')
73
tree.add_parent_tree_id('a-ghost-revision')
75
self.addCleanup(tree.unlock)
77
show_pending_merges(tree, output)
78
self.assertEqualDiff('pending merges:\n'
79
' (ghost) a-ghost-revision\n',
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)
94
self.addCleanup(tree.unlock)
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',
104
def tests_revision_to_revision(self):
105
"""doing a status between two revision trees should work."""
106
tree = self.make_branch_and_tree('.')
107
r1_id = tree.commit('one', allow_pointless=True)
108
r2_id = tree.commit('two', allow_pointless=True)
109
r2_tree = tree.branch.repository.revision_tree(r2_id)
111
show_tree_status(tree, to_file=output,
112
revision=[RevisionSpec.from_string("revid:%s" % r1_id),
113
RevisionSpec.from_string("revid:%s" % r2_id)])
114
# return does not matter as long as it did not raise.
added
removed
bzrlib/tests/test_status.py
