1
# Copyright (C) 2006-2010 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
20
status as _mod_status,
22
from ..revisionspec import RevisionSpec
23
from ..sixish import (
26
from ..status import show_pending_merges, show_tree_status
27
from . import TestCaseWithTransport
30
class TestStatus(TestCaseWithTransport):
32
def test_pending_none(self):
33
# Test whether show_pending_merges works in a tree with no commits
34
tree = self.make_branch_and_tree('a')
35
tree.commit('empty commit')
36
tree2 = self.make_branch_and_tree('b')
37
# set a left most parent that is not a present commit
38
tree2.add_parent_tree_id(b'some-ghost', allow_leftmost_as_ghost=True)
40
tree2.merge_from_branch(tree.branch)
42
with tree2.lock_read():
43
show_pending_merges(tree2, output)
44
self.assertContainsRe(output.getvalue(), 'empty commit')
46
def make_multiple_pending_tree(self):
47
config.GlobalStack().set('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.controldir.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.controldir.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, force=True)
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(b'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
config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
104
tree = self.make_branch_and_tree('a')
105
tree.commit('empty commit')
106
tree2 = tree.controldir.clone('b').open_workingtree()
107
tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
108
tree2.add_parent_tree_id(b'a-ghost-revision')
109
tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
110
tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
111
tree.merge_from_branch(tree2.branch)
113
self.addCleanup(tree.unlock)
115
show_pending_merges(tree, output, verbose=True)
116
self.assertEqualDiff(
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)
130
show_tree_status(tree, to_file=output, revision=[
131
RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
132
RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
133
# return does not matter as long as it did not raise.
136
class TestHooks(TestCaseWithTransport):
138
def test_constructor(self):
139
"""Check that creating a StatusHooks instance has the right defaults.
141
hooks = _mod_status.StatusHooks()
142
self.assertTrue("post_status" in hooks,
143
"post_status not in %s" % hooks)
144
self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
146
def test_installed_hooks_are_StatusHooks(self):
147
"""The installed hooks object should be a StatusHooks.
149
# the installed hooks are saved in self._preserved_hooks.
150
self.assertIsInstance(self._preserved_hooks[_mod_status][1],
151
_mod_status.StatusHooks)
153
def test_post_status_hook(self):
154
"""Ensure that post_status hook is invoked with the right args.
157
_mod_status.hooks.install_named_hook('post_status', calls.append, None)
158
self.assertLength(0, calls)
159
tree = self.make_branch_and_tree('.')
160
r1_id = tree.commit('one', allow_pointless=True)
161
r2_id = tree.commit('two', allow_pointless=True)
163
show_tree_status(tree, to_file=output, revision=[
164
RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
165
RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
166
self.assertLength(1, calls)
168
self.assertIsInstance(params, _mod_status.StatusHookParams)
169
attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
170
'show_ids', 'short', 'verbose', 'specific_files']
172
self.assertTrue(hasattr(params, a),
173
'Attribute "%s" not found in StatusHookParam' % a)
175
def test_pre_status_hook(self):
176
"""Ensure that pre_status hook is invoked with the right args.
179
_mod_status.hooks.install_named_hook('pre_status', calls.append, None)
180
self.assertLength(0, calls)
181
tree = self.make_branch_and_tree('.')
182
r1_id = tree.commit('one', allow_pointless=True)
183
r2_id = tree.commit('two', allow_pointless=True)
186
tree, to_file=output,
188
RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
189
RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
190
self.assertLength(1, calls)
192
self.assertIsInstance(params, _mod_status.StatusHookParams)
193
attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
194
'show_ids', 'short', 'verbose', 'specific_files']
196
self.assertTrue(hasattr(params, a),
197
'Attribute "%s" not found in StatusHookParam' % a)