/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
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
18
from .. import (
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
19
    config,
20
    status as _mod_status,
21
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
22
from ..revisionspec import RevisionSpec
23
from ..sixish import (
7045.2.17 by Jelmer Vernooij
Some more.
24
    StringIO,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
25
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from ..status import show_pending_merges, show_tree_status
27
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.
28
29
30
class TestStatus(TestCaseWithTransport):
1551.6.20 by Aaron Bentley
Add copyright and whitespace
31
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
32
    def test_pending_none(self):
1551.6.20 by Aaron Bentley
Add copyright and whitespace
33
        # 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.
34
        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.
35
        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.
36
        tree2 = self.make_branch_and_tree('b')
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
37
        # set a left most parent that is not a present commit
6973.10.4 by Jelmer Vernooij
Update python3.passing.
38
        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.
39
        # do a merge
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
40
        tree2.merge_from_branch(tree.branch)
7045.2.17 by Jelmer Vernooij
Some more.
41
        output = StringIO()
42
        with tree2.lock_read():
3074.3.1 by John Arbash Meinel
Fix bug #172657, use Graph.find_difference() rather than ancestry set operations.
43
            show_pending_merges(tree2, output)
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
44
        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.
45
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
46
    def make_multiple_pending_tree(self):
6449.6.1 by Jelmer Vernooij
Use config stacks in a few more places in the test suite.
47
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
48
        tree = self.make_branch_and_tree('a')
49
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
50
        tree2 = tree.controldir.clone('b').open_workingtree()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
51
        tree.commit('commit 2', timestamp=1196796819, timezone=0)
52
        tree2.commit('commit 2b', timestamp=1196796819, timezone=0)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
53
        tree3 = tree2.controldir.clone('c').open_workingtree()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
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)
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
57
        tree.merge_from_branch(tree3.branch, force=True)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
58
        return tree
59
60
    def test_multiple_pending(self):
61
        tree = self.make_multiple_pending_tree()
7045.2.17 by Jelmer Vernooij
Some more.
62
        output = StringIO()
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
63
        tree.lock_read()
3377.3.42 by John Arbash Meinel
Get the tests to actually work, and get the code to go along with.
64
        self.addCleanup(tree.unlock)
65
        show_pending_merges(tree, output)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
66
        # 2b doesn't appear because it's an ancestor of 3b
3936.2.3 by Ian Clatworthy
feedback from jameinel
67
        self.assertEqualDiff(
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',
71
            output.getvalue())
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
72
73
    def test_multiple_pending_verbose(self):
74
        tree = self.make_multiple_pending_tree()
7045.2.17 by Jelmer Vernooij
Some more.
75
        output = StringIO()
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
76
        tree.lock_read()
77
        self.addCleanup(tree.unlock)
78
        show_pending_merges(tree, output, verbose=True)
3377.3.37 by John Arbash Meinel
Ian's first review comments.
79
        # Even though 2b is in the ancestry of 3c, it should only be displayed
80
        # 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.
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',
85
                             output.getvalue())
3074.3.2 by John Arbash Meinel
update the ignore list in one-go.
86
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
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')
90
        tree.commit('first')
6973.10.4 by Jelmer Vernooij
Update python3.passing.
91
        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
92
        tree.lock_read()
93
        self.addCleanup(tree.unlock)
7045.2.17 by Jelmer Vernooij
Some more.
94
        output = StringIO()
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
95
        show_pending_merges(tree, output)
3936.2.3 by Ian Clatworthy
feedback from jameinel
96
        self.assertEqualDiff(
97
            'pending merge tips: (use -v to see all merge revisions)\n'
98
            '  (ghost) a-ghost-revision\n',
99
            output.getvalue())
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
100
101
    def test_pending_with_ghosts(self):
102
        """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.
103
        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
104
        tree = self.make_branch_and_tree('a')
105
        tree.commit('empty commit')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
106
        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.
107
        tree2.commit('a non-ghost', timestamp=1196796819, timezone=0)
6973.10.4 by Jelmer Vernooij
Update python3.passing.
108
        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
109
        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.
110
        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
111
        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.
112
        tree.lock_read()
3377.3.40 by John Arbash Meinel
a little bit more cleanup, change how ghosts are handled
113
        self.addCleanup(tree.unlock)
7045.2.17 by Jelmer Vernooij
Some more.
114
        output = StringIO()
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
115
        show_pending_merges(tree, output, verbose=True)
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
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())
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)
7045.2.17 by Jelmer Vernooij
Some more.
129
        output = StringIO()
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
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'))])
1852.2.1 by Robert Collins
General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
133
        # return does not matter as long as it did not raise.
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
134
135
136
class TestHooks(TestCaseWithTransport):
137
138
    def test_constructor(self):
139
        """Check that creating a StatusHooks instance has the right defaults.
140
        """
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
141
        hooks = _mod_status.StatusHooks()
7143.15.2 by Jelmer Vernooij
Run autopep8.
142
        self.assertTrue("post_status" in hooks,
143
                        "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],
7143.15.2 by Jelmer Vernooij
Run autopep8.
151
                              _mod_status.StatusHooks)
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
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)
7045.2.17 by Jelmer Vernooij
Some more.
162
        output = StringIO()
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
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'))])
5393.3.2 by Parth Malwankar
added StatusPostHookParams and test cases
166
        self.assertLength(1, calls)
167
        params = calls[0]
5393.3.7 by Parth Malwankar
added pre_status hook
168
        self.assertIsInstance(params, _mod_status.StatusHookParams)
169
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
7143.15.2 by Jelmer Vernooij
Run autopep8.
170
                 'show_ids', 'short', 'verbose', 'specific_files']
5393.3.7 by Parth Malwankar
added pre_status hook
171
        for a in attrs:
172
            self.assertTrue(hasattr(params, a),
7143.15.2 by Jelmer Vernooij
Run autopep8.
173
                            'Attribute "%s" not found in StatusHookParam' % a)
5393.3.7 by Parth Malwankar
added pre_status hook
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)
7045.2.17 by Jelmer Vernooij
Some more.
184
        output = StringIO()
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
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'))])
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',
7143.15.2 by Jelmer Vernooij
Run autopep8.
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),
7143.15.2 by Jelmer Vernooij
Run autopep8.
197
                            'Attribute "%s" not found in StatusHookParam' % a)