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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 make_multiple_pending_tree(self):
46
self.thisFailsStrictLockCheck() # clone?
47
config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
48
tree = self.make_branch_and_tree('a')
49
tree.commit('commit 1', timestamp=1196796819, timezone=0)
50
tree2 = tree.bzrdir.clone('b').open_workingtree()
51
tree.commit('commit 2', timestamp=1196796819, timezone=0)
52
tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
53
tree3 = tree2.bzrdir.clone('c').open_workingtree()
54
tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
55
tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
56
tree.merge_from_branch(tree2.branch)
57
tree.merge_from_branch(tree3.branch)
60
def test_multiple_pending(self):
61
tree = self.make_multiple_pending_tree()
64
self.addCleanup(tree.unlock)
65
show_pending_merges(tree, output)
66
# 2b doesn't appear because it's an ancestor of 3b
68
'pending merge tips: (use -v to see all merge revisions)\n'
69
' Joe Foo 2007-12-04 commit 3b\n'
70
' Joe Foo 2007-12-04 commit 3c\n',
73
def test_multiple_pending_verbose(self):
74
tree = self.make_multiple_pending_tree()
77
self.addCleanup(tree.unlock)
78
show_pending_merges(tree, output, verbose=True)
79
# Even though 2b is in the ancestry of 3c, it should only be displayed
80
# under the first merge parent.
81
self.assertEqualDiff('pending merges:\n'
82
' Joe Foo 2007-12-04 commit 3b\n'
83
' Joe Foo 2007-12-04 commit 2b\n'
84
' Joe Foo 2007-12-04 commit 3c\n',
87
def test_with_pending_ghost(self):
88
"""Test when a pending merge is itself a ghost"""
89
tree = self.make_branch_and_tree('a')
91
tree.add_parent_tree_id('a-ghost-revision')
93
self.addCleanup(tree.unlock)
95
show_pending_merges(tree, output)
97
'pending merge tips: (use -v to see all merge revisions)\n'
98
' (ghost) a-ghost-revision\n',
101
def test_pending_with_ghosts(self):
102
"""Test when a pending merge's ancestry includes ghosts."""
103
self.thisFailsStrictLockCheck() # clone?
104
config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
105
tree = self.make_branch_and_tree('a')
106
tree.commit('empty commit')
107
tree2 = tree.bzrdir.clone('b').open_workingtree()
108
tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
109
tree2.add_parent_tree_id('a-ghost-revision')
110
tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
111
tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
112
tree.merge_from_branch(tree2.branch)
114
self.addCleanup(tree.unlock)
116
show_pending_merges(tree, output, verbose=True)
117
self.assertEqualDiff('pending merges:\n'
118
' Joe Foo 2007-12-04 another non-ghost\n'
119
' Joe Foo 2007-12-04 [merge] commit with ghost\n'
120
' (ghost) a-ghost-revision\n'
121
' Joe Foo 2007-12-04 a non-ghost\n',
124
def tests_revision_to_revision(self):
125
"""doing a status between two revision trees should work."""
126
tree = self.make_branch_and_tree('.')
127
r1_id = tree.commit('one', allow_pointless=True)
128
r2_id = tree.commit('two', allow_pointless=True)
129
r2_tree = tree.branch.repository.revision_tree(r2_id)
131
show_tree_status(tree, to_file=output,
132
revision=[RevisionSpec.from_string("revid:%s" % r1_id),
133
RevisionSpec.from_string("revid:%s" % r2_id)])
134
# return does not matter as long as it did not raise.