/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5387.2.7 by John Arbash Meinel
Merge bzr.dev 5444 to resolve some small text conflicts.
1
# Copyright (C) 2006-2010 Canonical Ltd
1551.6.20 by Aaron Bentley
Add copyright and whitespace
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1551.6.20 by Aaron Bentley
Add copyright and whitespace
16
17
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
18
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
19
from .. import (
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
20
    config,
21
    status as _mod_status,
22
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from ..revisionspec import RevisionSpec
24
from ..sixish import (
7045.2.17 by Jelmer Vernooij
Some more.
25
    StringIO,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
26
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from ..status import show_pending_merges, show_tree_status
28
from . import TestCaseWithTransport
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
29
30
31
class TestStatus(TestCaseWithTransport):
1551.6.20 by Aaron Bentley
Add copyright and whitespace
32
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
33
    def test_pending_none(self):
1551.6.20 by Aaron Bentley
Add copyright and whitespace
34
        # Test whether show_pending_merges works in a tree with no commits
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
35
        tree = self.make_branch_and_tree('a')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
36
        tree.commit('empty commit')
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
37
        tree2 = self.make_branch_and_tree('b')
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
38
        # set a left most parent that is not a present commit
6973.10.4 by Jelmer Vernooij
Update python3.passing.
39
        tree2.add_parent_tree_id(b'some-ghost', allow_leftmost_as_ghost=True)
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
40
        # do a merge
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
41
        tree2.merge_from_branch(tree.branch)
7045.2.17 by Jelmer Vernooij
Some more.
42
        output = StringIO()
43
        with tree2.lock_read():
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
44
            show_pending_merges(tree2, output)
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
45
        self.assertContainsRe(output.getvalue(), 'empty commit')
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
46
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
47
    def make_multiple_pending_tree(self):
6449.6.1 by Jelmer Vernooij
Use config stacks in a few more places in the test suite.
48
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
49
        tree = self.make_branch_and_tree('a')
50
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
51
        tree2 = tree.controldir.clone('b').open_workingtree()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
52
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
53
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
54
        tree3 = tree2.controldir.clone('c').open_workingtree()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
55
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
56
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
57
        tree.merge_from_branch(tree2.branch)
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
58
        tree.merge_from_branch(tree3.branch, force=True)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
59
        return tree
60
61
    def test_multiple_pending(self):
62
        tree = self.make_multiple_pending_tree()
7045.2.17 by Jelmer Vernooij
Some more.
63
        output = StringIO()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
64
        tree.lock_read()
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
65
        self.addCleanup(tree.unlock)
66
        show_pending_merges(tree, output)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
67
        # 2b doesn't appear because it's an ancestor of 3b
3936.2.3 by Ian Clatworthy
feedback from jameinel
68
        self.assertEqualDiff(
69
            'pending merge tips: (use -v to see all merge revisions)\n'
70
            '  Joe Foo 2007-12-04 commit 3b\n'
71
            '  Joe Foo 2007-12-04 commit 3c\n',
72
            output.getvalue())
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
73
74
    def test_multiple_pending_verbose(self):
75
        tree = self.make_multiple_pending_tree()
7045.2.17 by Jelmer Vernooij
Some more.
76
        output = StringIO()
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
77
        tree.lock_read()
78
        self.addCleanup(tree.unlock)
79
        show_pending_merges(tree, output, verbose=True)
3377.3.37 by John Arbash Meinel
Ian's first review comments.
80
        # Even though 2b is in the ancestry of 3c, it should only be displayed
81
        # under the first merge parent.
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
82
        self.assertEqualDiff('pending merges:\n'
83
                             '  Joe Foo 2007-12-04 commit 3b\n'
84
                             '    Joe Foo 2007-12-04 commit 2b\n'
85
                             '  Joe Foo 2007-12-04 commit 3c\n',
86
                             output.getvalue())
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
87
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
88
    def test_with_pending_ghost(self):
89
        """Test when a pending merge is itself a ghost"""
90
        tree = self.make_branch_and_tree('a')
91
        tree.commit('first')
6973.10.4 by Jelmer Vernooij
Update python3.passing.
92
        tree.add_parent_tree_id(b'a-ghost-revision')
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
93
        tree.lock_read()
94
        self.addCleanup(tree.unlock)
7045.2.17 by Jelmer Vernooij
Some more.
95
        output = StringIO()
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
96
        show_pending_merges(tree, output)
3936.2.3 by Ian Clatworthy
feedback from jameinel
97
        self.assertEqualDiff(
98
            'pending merge tips: (use -v to see all merge revisions)\n'
99
            '  (ghost) a-ghost-revision\n',
100
            output.getvalue())
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
101
102
    def test_pending_with_ghosts(self):
103
        """Test when a pending merge's ancestry includes ghosts."""
6449.6.1 by Jelmer Vernooij
Use config stacks in a few more places in the test suite.
104
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
105
        tree = self.make_branch_and_tree('a')
106
        tree.commit('empty commit')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
107
        tree2 = tree.controldir.clone('b').open_workingtree()
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
108
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
6973.10.4 by Jelmer Vernooij
Update python3.passing.
109
        tree2.add_parent_tree_id(b'a-ghost-revision')
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
110
        tree2.commit('commit with ghost', timestamp=1196796819, timezone=0)
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
111
        tree2.commit('another non-ghost', timestamp=1196796819, timezone=0)
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
112
        tree.merge_from_branch(tree2.branch)
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
113
        tree.lock_read()
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
114
        self.addCleanup(tree.unlock)
7045.2.17 by Jelmer Vernooij
Some more.
115
        output = StringIO()
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
116
        show_pending_merges(tree, output, verbose=True)
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
117
        self.assertEqualDiff('pending merges:\n'
118
                             '  Joe Foo 2007-12-04 another non-ghost\n'
3998.1.1 by Ian Clatworthy
Add merge indication to line format (Neil Martinsen-Burrell)
119
                             '    Joe Foo 2007-12-04 [merge] commit with ghost\n'
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
120
                             '    (ghost) a-ghost-revision\n'
121
                             '    Joe Foo 2007-12-04 a non-ghost\n',
122
                             output.getvalue())
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
123
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
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)
7045.2.17 by Jelmer Vernooij
Some more.
130
        output = StringIO()
1948.4.29 by John Arbash Meinel
Remove a few more direct references to RevisionSpec
131
        show_tree_status(tree, to_file=output,
7045.2.17 by Jelmer Vernooij
Some more.
132
                     revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
133
                               RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
134
        # return does not matter as long as it did not raise.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
135
136
137
class TestHooks(TestCaseWithTransport):
138
139
    def test_constructor(self):
140
        """Check that creating a StatusHooks instance has the right defaults.
141
        """
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
142
        hooks = _mod_status.StatusHooks()
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
143
        self.assertTrue("post_status" in hooks, "post_status not in %s" % hooks)
5393.3.7 by Parth Malwankar
added pre_status hook
144
        self.assertTrue("pre_status" in hooks, "pre_status not in %s" % hooks)
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
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
        r2_tree = tree.branch.repository.revision_tree(r2_id)
7045.2.17 by Jelmer Vernooij
Some more.
163
        output = StringIO()
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
164
        show_tree_status(tree, to_file=output,
7045.2.17 by Jelmer Vernooij
Some more.
165
            revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
166
                RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
167
        self.assertLength(1, calls)
168
        params = calls[0]
5393.3.7 by Parth Malwankar
added pre_status hook
169
        self.assertIsInstance(params, _mod_status.StatusHookParams)
170
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
171
            'show_ids', 'short', 'verbose', 'specific_files']
5393.3.7 by Parth Malwankar
added pre_status hook
172
        for a in attrs:
173
            self.assertTrue(hasattr(params, a),
174
                'Attribute "%s" not found in StatusHookParam' % a)
175
176
    def test_pre_status_hook(self):
177
        """Ensure that pre_status hook is invoked with the right args.
178
        """
179
        calls = []
180
        _mod_status.hooks.install_named_hook('pre_status', calls.append, None)
181
        self.assertLength(0, calls)
182
        tree = self.make_branch_and_tree('.')
183
        r1_id = tree.commit('one', allow_pointless=True)
184
        r2_id = tree.commit('two', allow_pointless=True)
185
        r2_tree = tree.branch.repository.revision_tree(r2_id)
7045.2.17 by Jelmer Vernooij
Some more.
186
        output = StringIO()
5393.3.7 by Parth Malwankar
added pre_status hook
187
        show_tree_status(tree, to_file=output,
7045.2.17 by Jelmer Vernooij
Some more.
188
            revision=[RevisionSpec.from_string("revid:%s" % r1_id.decode('utf-8')),
189
                RevisionSpec.from_string("revid:%s" % r2_id.decode('utf-8'))])
5393.3.7 by Parth Malwankar
added pre_status hook
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',
6282.4.1 by Francis Devereux
Pass specific_files to status hooks
194
            'show_ids', 'short', 'verbose', 'specific_files']
5393.3.7 by Parth Malwankar
added pre_status hook
195
        for a in attrs:
196
            self.assertTrue(hasattr(params, a),
197
                'Attribute "%s" not found in StatusHookParam' % a)
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
198