/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 bzrlib/tests/test_status.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from .. import (
19
 
    config,
20
 
    status as _mod_status,
21
 
    )
22
 
from ..revisionspec import RevisionSpec
23
 
from ..sixish import (
24
 
    StringIO,
25
 
    )
26
 
from ..status import show_pending_merges, show_tree_status
27
 
from . import TestCaseWithTransport
 
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
28
24
 
29
25
 
30
26
class TestStatus(TestCaseWithTransport):
35
31
        tree.commit('empty commit')
36
32
        tree2 = self.make_branch_and_tree('b')
37
33
        # 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)
 
34
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
39
35
        # do a merge
40
36
        tree2.merge_from_branch(tree.branch)
41
37
        output = StringIO()
42
 
        with tree2.lock_read():
 
38
        tree2.lock_read()
 
39
        try:
43
40
            show_pending_merges(tree2, output)
 
41
        finally:
 
42
            tree2.unlock()
44
43
        self.assertContainsRe(output.getvalue(), 'empty commit')
45
44
 
46
45
    def make_multiple_pending_tree(self):
47
 
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
 
46
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
48
47
        tree = self.make_branch_and_tree('a')
49
48
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
50
 
        tree2 = tree.controldir.clone('b').open_workingtree()
 
49
        tree2 = tree.bzrdir.clone('b').open_workingtree()
51
50
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
52
51
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
53
 
        tree3 = tree2.controldir.clone('c').open_workingtree()
 
52
        tree3 = tree2.bzrdir.clone('c').open_workingtree()
54
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
55
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
56
55
        tree.merge_from_branch(tree2.branch)
88
87
        """Test when a pending merge is itself a ghost"""
89
88
        tree = self.make_branch_and_tree('a')
90
89
        tree.commit('first')
91
 
        tree.add_parent_tree_id(b'a-ghost-revision')
 
90
        tree.add_parent_tree_id('a-ghost-revision')
92
91
        tree.lock_read()
93
92
        self.addCleanup(tree.unlock)
94
93
        output = StringIO()
100
99
 
101
100
    def test_pending_with_ghosts(self):
102
101
        """Test when a pending merge's ancestry includes ghosts."""
103
 
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
 
102
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
104
103
        tree = self.make_branch_and_tree('a')
105
104
        tree.commit('empty commit')
106
 
        tree2 = tree.controldir.clone('b').open_workingtree()
 
105
        tree2 = tree.bzrdir.clone('b').open_workingtree()
107
106
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
108
 
        tree2.add_parent_tree_id(b'a-ghost-revision')
 
107
        tree2.add_parent_tree_id('a-ghost-revision')
109
108
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
110
109
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
111
110
        tree.merge_from_branch(tree2.branch)
113
112
        self.addCleanup(tree.unlock)
114
113
        output = StringIO()
115
114
        show_pending_merges(tree, output, verbose=True)
116
 
        self.assertEqualDiff(
117
 
            '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',
122
 
            output.getvalue())
 
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())
123
121
 
124
122
    def tests_revision_to_revision(self):
125
123
        """doing a status between two revision trees should work."""
126
124
        tree = self.make_branch_and_tree('.')
127
125
        r1_id = tree.commit('one', allow_pointless=True)
128
126
        r2_id = tree.commit('two', allow_pointless=True)
 
127
        r2_tree = tree.branch.repository.revision_tree(r2_id)
129
128
        output = StringIO()
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'))])
 
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)])
133
132
        # return does not matter as long as it did not raise.
134
 
 
135
 
 
136
 
class TestHooks(TestCaseWithTransport):
137
 
 
138
 
    def test_constructor(self):
139
 
        """Check that creating a StatusHooks instance has the right defaults.
140
 
        """
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)
145
 
 
146
 
    def test_installed_hooks_are_StatusHooks(self):
147
 
        """The installed hooks object should be a StatusHooks.
148
 
        """
149
 
        # the installed hooks are saved in self._preserved_hooks.
150
 
        self.assertIsInstance(self._preserved_hooks[_mod_status][1],
151
 
                              _mod_status.StatusHooks)
152
 
 
153
 
    def test_post_status_hook(self):
154
 
        """Ensure that post_status hook is invoked with the right args.
155
 
        """
156
 
        calls = []
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)
162
 
        output = StringIO()
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)
167
 
        params = calls[0]
168
 
        self.assertIsInstance(params, _mod_status.StatusHookParams)
169
 
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
170
 
                 'show_ids', 'short', 'verbose', 'specific_files']
171
 
        for a in attrs:
172
 
            self.assertTrue(hasattr(params, a),
173
 
                            'Attribute "%s" not found in StatusHookParam' % a)
174
 
 
175
 
    def test_pre_status_hook(self):
176
 
        """Ensure that pre_status hook is invoked with the right args.
177
 
        """
178
 
        calls = []
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)
184
 
        output = StringIO()
185
 
        show_tree_status(
186
 
            tree, to_file=output,
187
 
            revision=[
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)
191
 
        params = calls[0]
192
 
        self.assertIsInstance(params, _mod_status.StatusHookParams)
193
 
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
194
 
                 'show_ids', 'short', 'verbose', 'specific_files']
195
 
        for a in attrs:
196
 
            self.assertTrue(hasattr(params, a),
197
 
                            'Attribute "%s" not found in StatusHookParam' % a)