/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_status.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
 
from StringIO import StringIO
19
 
 
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
 
17
from io import StringIO
 
18
 
 
19
from .. import (
 
20
    config,
 
21
    status as _mod_status,
 
22
    )
 
23
from ..revisionspec import RevisionSpec
 
24
from ..status import show_pending_merges, show_tree_status
 
25
from . import TestCaseWithTransport
24
26
 
25
27
 
26
28
class TestStatus(TestCaseWithTransport):
31
33
        tree.commit('empty commit')
32
34
        tree2 = self.make_branch_and_tree('b')
33
35
        # 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.add_parent_tree_id(b'some-ghost', allow_leftmost_as_ghost=True)
35
37
        # do a merge
36
38
        tree2.merge_from_branch(tree.branch)
37
39
        output = StringIO()
38
 
        tree2.lock_read()
39
 
        try:
 
40
        with tree2.lock_read():
40
41
            show_pending_merges(tree2, output)
41
 
        finally:
42
 
            tree2.unlock()
43
42
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
43
 
45
44
    def make_multiple_pending_tree(self):
46
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
45
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
47
46
        tree = self.make_branch_and_tree('a')
48
47
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
49
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
48
        tree2 = tree.controldir.clone('b').open_workingtree()
50
49
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
51
50
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
52
 
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
 
51
        tree3 = tree2.controldir.clone('c').open_workingtree()
53
52
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
53
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
54
        tree.merge_from_branch(tree2.branch)
87
86
        """Test when a pending merge is itself a ghost"""
88
87
        tree = self.make_branch_and_tree('a')
89
88
        tree.commit('first')
90
 
        tree.add_parent_tree_id('a-ghost-revision')
 
89
        tree.add_parent_tree_id(b'a-ghost-revision')
91
90
        tree.lock_read()
92
91
        self.addCleanup(tree.unlock)
93
92
        output = StringIO()
99
98
 
100
99
    def test_pending_with_ghosts(self):
101
100
        """Test when a pending merge's ancestry includes ghosts."""
102
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
101
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
103
102
        tree = self.make_branch_and_tree('a')
104
103
        tree.commit('empty commit')
105
 
        tree2 = tree.bzrdir.clone('b').open_workingtree()
 
104
        tree2 = tree.controldir.clone('b').open_workingtree()
106
105
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
107
 
        tree2.add_parent_tree_id('a-ghost-revision')
 
106
        tree2.add_parent_tree_id(b'a-ghost-revision')
108
107
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
109
108
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
110
109
        tree.merge_from_branch(tree2.branch)
112
111
        self.addCleanup(tree.unlock)
113
112
        output = StringIO()
114
113
        show_pending_merges(tree, output, verbose=True)
115
 
        self.assertEqualDiff('pending merges:\n'
116
 
                             '  Joe Foo 2007-12-04 another non-ghost\n'
117
 
                             '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
118
 
                             '    (ghost) a-ghost-revision\n'
119
 
                             '    Joe Foo 2007-12-04 a non-ghost\n',
120
 
                             output.getvalue())
 
114
        self.assertEqualDiff(
 
115
            'pending merges:\n'
 
116
            '  Joe Foo 2007-12-04 another non-ghost\n'
 
117
            '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
 
118
            '    (ghost) a-ghost-revision\n'
 
119
            '    Joe Foo 2007-12-04 a non-ghost\n',
 
120
            output.getvalue())
121
121
 
122
122
    def tests_revision_to_revision(self):
123
123
        """doing a status between two revision trees should work."""
124
124
        tree = self.make_branch_and_tree('.')
125
125
        r1_id = tree.commit('one', allow_pointless=True)
126
126
        r2_id = tree.commit('two', allow_pointless=True)
127
 
        r2_tree = tree.branch.repository.revision_tree(r2_id)
128
127
        output = StringIO()
129
 
        show_tree_status(tree, to_file=output,
130
 
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id),
131
 
                               RevisionSpec.from_string("revid:%s" % r2_id)])
 
128
        show_tree_status(tree, to_file=output, revision=[
 
129
            RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
130
            RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
132
131
        # return does not matter as long as it did not raise.
 
132
 
 
133
 
 
134
class TestHooks(TestCaseWithTransport):
 
135
 
 
136
    def test_constructor(self):
 
137
        """Check that creating a StatusHooks instance has the right defaults.
 
138
        """
 
139
        hooks = _mod_status.StatusHooks()
 
140
        self.assertTrue("post_status" in hooks,
 
141
                        "post_status not in %s" % hooks)
 
142
        self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
 
143
 
 
144
    def test_installed_hooks_are_StatusHooks(self):
 
145
        """The installed hooks object should be a StatusHooks.
 
146
        """
 
147
        # the installed hooks are saved in self._preserved_hooks.
 
148
        self.assertIsInstance(self._preserved_hooks[_mod_status][1],
 
149
                              _mod_status.StatusHooks)
 
150
 
 
151
    def test_post_status_hook(self):
 
152
        """Ensure that post_status hook is invoked with the right args.
 
153
        """
 
154
        calls = []
 
155
        _mod_status.hooks.install_named_hook('post_status', calls.append, None)
 
156
        self.assertLength(0, calls)
 
157
        tree = self.make_branch_and_tree('.')
 
158
        r1_id = tree.commit('one', allow_pointless=True)
 
159
        r2_id = tree.commit('two', allow_pointless=True)
 
160
        output = StringIO()
 
161
        show_tree_status(tree, to_file=output, revision=[
 
162
            RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
163
            RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
 
164
        self.assertLength(1, calls)
 
165
        params = calls[0]
 
166
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
167
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
168
                 'show_ids', 'short', 'verbose', 'specific_files']
 
169
        for a in attrs:
 
170
            self.assertTrue(hasattr(params, a),
 
171
                            'Attribute "%s" not found in StatusHookParam' % a)
 
172
 
 
173
    def test_pre_status_hook(self):
 
174
        """Ensure that pre_status hook is invoked with the right args.
 
175
        """
 
176
        calls = []
 
177
        _mod_status.hooks.install_named_hook('pre_status', calls.append, None)
 
178
        self.assertLength(0, calls)
 
179
        tree = self.make_branch_and_tree('.')
 
180
        r1_id = tree.commit('one', allow_pointless=True)
 
181
        r2_id = tree.commit('two', allow_pointless=True)
 
182
        output = StringIO()
 
183
        show_tree_status(
 
184
            tree, to_file=output,
 
185
            revision=[
 
186
                RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
 
187
                RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
 
188
        self.assertLength(1, calls)
 
189
        params = calls[0]
 
190
        self.assertIsInstance(params, _mod_status.StatusHookParams)
 
191
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
 
192
                 'show_ids', 'short', 'verbose', 'specific_files']
 
193
        for a in attrs:
 
194
            self.assertTrue(hasattr(params, a),
 
195
                            'Attribute "%s" not found in StatusHookParam' % a)