/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_status.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-19 13:16:11 UTC
  • mto: (6968.4.3 git-archive)
  • mto: This revision was merged to the branch mainline in revision 6972.
  • Revision ID: jelmer@jelmer.uk-20180519131611-l9h9ud41j7qg1m03
Move tar/zip to breezy.archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2006-2010 Canonical Ltd
 
2
#
 
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.
 
7
#
 
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.
 
12
#
 
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
 
16
 
 
17
 
 
18
 
 
19
from .. import (
 
20
    config,
 
21
    status as _mod_status,
 
22
    )
 
23
from ..revisionspec import RevisionSpec
 
24
from ..sixish import (
 
25
    BytesIO,
 
26
    )
 
27
from ..status import show_pending_merges, show_tree_status
 
28
from . import TestCaseWithTransport
 
29
 
 
30
 
 
31
class TestStatus(TestCaseWithTransport):
 
32
 
 
33
    def test_pending_none(self):
 
34
        # Test whether show_pending_merges works in a tree with no commits
 
35
        tree = self.make_branch_and_tree('a')
 
36
        tree.commit('empty commit')
 
37
        tree2 = self.make_branch_and_tree('b')
 
38
        # set a left most parent that is not a present commit
 
39
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
 
40
        # do a merge
 
41
        tree2.merge_from_branch(tree.branch)
 
42
        output = BytesIO()
 
43
        tree2.lock_read()
 
44
        try:
 
45
            show_pending_merges(tree2, output)
 
46
        finally:
 
47
            tree2.unlock()
 
48
        self.assertContainsRe(output.getvalue(), 'empty commit')
 
49
 
 
50
    def make_multiple_pending_tree(self):
 
51
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
 
52
        tree = self.make_branch_and_tree('a')
 
53
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
 
54
        tree2 = tree.controldir.clone('b').open_workingtree()
 
55
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
 
56
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
 
57
        tree3 = tree2.controldir.clone('c').open_workingtree()
 
58
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
 
59
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
 
60
        tree.merge_from_branch(tree2.branch)
 
61
        tree.merge_from_branch(tree3.branch, force=True)
 
62
        return tree
 
63
 
 
64
    def test_multiple_pending(self):
 
65
        tree = self.make_multiple_pending_tree()
 
66
        output = BytesIO()
 
67
        tree.lock_read()
 
68
        self.addCleanup(tree.unlock)
 
69
        show_pending_merges(tree, output)
 
70
        # 2b doesn't appear because it's an ancestor of 3b
 
71
        self.assertEqualDiff(
 
72
            'pending merge tips: (use -v to see all merge revisions)\n'
 
73
            '  Joe Foo 2007-12-04 commit 3b\n'
 
74
            '  Joe Foo 2007-12-04 commit 3c\n',
 
75
            output.getvalue())
 
76
 
 
77
    def test_multiple_pending_verbose(self):
 
78
        tree = self.make_multiple_pending_tree()
 
79
        output = BytesIO()
 
80
        tree.lock_read()
 
81
        self.addCleanup(tree.unlock)
 
82
        show_pending_merges(tree, output, verbose=True)
 
83
        # Even though 2b is in the ancestry of 3c, it should only be displayed
 
84
        # under the first merge parent.
 
85
        self.assertEqualDiff('pending merges:\n'
 
86
                             '  Joe Foo 2007-12-04 commit 3b\n'
 
87
                             '    Joe Foo 2007-12-04 commit 2b\n'
 
88
                             '  Joe Foo 2007-12-04 commit 3c\n',
 
89
                             output.getvalue())
 
90
 
 
91
    def test_with_pending_ghost(self):
 
92
        """Test when a pending merge is itself a ghost"""
 
93
        tree = self.make_branch_and_tree('a')
 
94
        tree.commit('first')
 
95
        tree.add_parent_tree_id('a-ghost-revision')
 
96
        tree.lock_read()
 
97
        self.addCleanup(tree.unlock)
 
98
        output = BytesIO()
 
99
        show_pending_merges(tree, output)
 
100
        self.assertEqualDiff(
 
101
            'pending merge tips: (use -v to see all merge revisions)\n'
 
102
            '  (ghost) a-ghost-revision\n',
 
103
            output.getvalue())
 
104
 
 
105
    def test_pending_with_ghosts(self):
 
106
        """Test when a pending merge's ancestry includes ghosts."""
 
107
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
 
108
        tree = self.make_branch_and_tree('a')
 
109
        tree.commit('empty commit')
 
110
        tree2 = tree.controldir.clone('b').open_workingtree()
 
111
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
 
112
        tree2.add_parent_tree_id('a-ghost-revision')
 
113
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
 
114
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
 
115
        tree.merge_from_branch(tree2.branch)
 
116
        tree.lock_read()
 
117
        self.addCleanup(tree.unlock)
 
118
        output = BytesIO()
 
119
        show_pending_merges(tree, output, verbose=True)
 
120
        self.assertEqualDiff('pending merges:\n'
 
121
                             '  Joe Foo 2007-12-04 another non-ghost\n'
 
122
                             '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
 
123
                             '    (ghost) a-ghost-revision\n'
 
124
                             '    Joe Foo 2007-12-04 a non-ghost\n',
 
125
                             output.getvalue())
 
126
 
 
127
    def tests_revision_to_revision(self):
 
128
        """doing a status between two revision trees should work."""
 
129
        tree = self.make_branch_and_tree('.')
 
130
        r1_id = tree.commit('one', allow_pointless=True)
 
131
        r2_id = tree.commit('two', allow_pointless=True)
 
132
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
133
        output = BytesIO()
 
134
        show_tree_status(tree, to_file=output,
 
135
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
136
                               RevisionSpec.from_string("revid:%s" % r2_id)])
 
137
        # return does not matter as long as it did not raise.
 
138
 
 
139
 
 
140
class TestHooks(TestCaseWithTransport):
 
141
 
 
142
    def test_constructor(self):
 
143
        """Check that creating a StatusHooks instance has the right defaults.
 
144
        """
 
145
        hooks = _mod_status.StatusHooks()
 
146
        self.assertTrue("post_status" in hooks, "post_status not in %s" % hooks)
 
147
        self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
 
148
 
 
149
    def test_installed_hooks_are_StatusHooks(self):
 
150
        """The installed hooks object should be a StatusHooks.
 
151
        """
 
152
        # the installed hooks are saved in self._preserved_hooks.
 
153
        self.assertIsInstance(self._preserved_hooks[_mod_status][1],
 
154
            _mod_status.StatusHooks)
 
155
 
 
156
    def test_post_status_hook(self):
 
157
        """Ensure that post_status hook is invoked with the right args.
 
158
        """
 
159
        calls = []
 
160
        _mod_status.hooks.install_named_hook('post_status', calls.append, None)
 
161
        self.assertLength(0, calls)
 
162
        tree = self.make_branch_and_tree('.')
 
163
        r1_id = tree.commit('one', allow_pointless=True)
 
164
        r2_id = tree.commit('two', allow_pointless=True)
 
165
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
166
        output = BytesIO()
 
167
        show_tree_status(tree, to_file=output,
 
168
            revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
169
                RevisionSpec.from_string("revid:%s" % r2_id)])
 
170
        self.assertLength(1, calls)
 
171
        params = calls[0]
 
172
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
173
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
174
            'show_ids', 'short', 'verbose', 'specific_files']
 
175
        for a in attrs:
 
176
            self.assertTrue(hasattr(params, a),
 
177
                'Attribute "%s" not found in StatusHookParam' % a)
 
178
 
 
179
    def test_pre_status_hook(self):
 
180
        """Ensure that pre_status hook is invoked with the right args.
 
181
        """
 
182
        calls = []
 
183
        _mod_status.hooks.install_named_hook('pre_status', calls.append, None)
 
184
        self.assertLength(0, calls)
 
185
        tree = self.make_branch_and_tree('.')
 
186
        r1_id = tree.commit('one', allow_pointless=True)
 
187
        r2_id = tree.commit('two', allow_pointless=True)
 
188
        r2_tree = tree.branch.repository.revision_tree(r2_id)
 
189
        output = BytesIO()
 
190
        show_tree_status(tree, to_file=output,
 
191
            revision=[RevisionSpec.from_string("revid:%s" % r1_id),
 
192
                RevisionSpec.from_string("revid:%s" % r2_id)])
 
193
        self.assertLength(1, calls)
 
194
        params = calls[0]
 
195
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
196
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
197
            'show_ids', 'short', 'verbose', 'specific_files']
 
198
        for a in attrs:
 
199
            self.assertTrue(hasattr(params, a),
 
200
                'Attribute "%s" not found in StatusHookParam' % a)
 
201