/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/blackbox/test_annotate.py

  • Committer: Robert Collins
  • Date: 2007-04-19 02:27:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2426.
  • Revision ID: robertc@robertcollins.net-20070419022744-pfdqz42kp1wizh43
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
"""Black-box tests for bzr.
20
20
 
21
21
These check that it behaves properly when it's invoked through the regular
22
 
command-line interface. This doesn't actually run a new interpreter but
23
 
rather starts again from the run_brz function.
 
22
command-line interface. This doesn't actually run a new interpreter but 
 
23
rather starts again from the run_bzr function.
24
24
"""
25
25
 
26
26
 
27
 
from breezy import (
28
 
    config,
29
 
    tests,
30
 
    )
31
 
 
32
 
from breezy.urlutils import joinpath
33
 
 
34
 
from ..test_bedding import override_whoami
35
 
 
36
 
class TestAnnotate(tests.TestCaseWithTransport):
 
27
import os
 
28
 
 
29
from bzrlib.tests import TestCaseWithTransport
 
30
 
 
31
 
 
32
class TestAnnotate(TestCaseWithTransport):
37
33
 
38
34
    def setUp(self):
39
35
        super(TestAnnotate, self).setUp()
40
36
        wt = self.make_branch_and_tree('.')
41
37
        b = wt.branch
42
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
43
 
                                  ('nomail.txt', b'nomail\n')])
 
38
        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
 
39
                                  ('nomail.txt', 'nomail\n')])
44
40
        wt.add(['hello.txt'])
45
41
        self.revision_id_1 = wt.commit('add hello',
46
 
                                       committer='test@user',
47
 
                                       timestamp=1165960000.00, timezone=0)
 
42
                              committer='test@user',
 
43
                              timestamp=1165960000.00, timezone=0)
48
44
        wt.add(['nomail.txt'])
49
45
        self.revision_id_2 = wt.commit('add nomail',
50
 
                                       committer='no mail',
51
 
                                       timestamp=1165970000.00, timezone=0)
52
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
53
 
                                                b'your helicopter\n')])
 
46
                              committer='no mail',
 
47
                              timestamp=1165970000.00, timezone=0)
 
48
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
49
                                                'your helicopter\n')])
54
50
        self.revision_id_3 = wt.commit('mod hello',
55
 
                                       committer='user@test',
56
 
                                       timestamp=1166040000.00, timezone=0)
57
 
        self.build_tree_contents([('hello.txt', b'my helicopter\n'
58
 
                                                b'your helicopter\n'
59
 
                                                b'all of\n'
60
 
                                                b'our helicopters\n'
61
 
                                   )])
 
51
                              committer='user@test',
 
52
                              timestamp=1166040000.00, timezone=0)
 
53
        self.build_tree_contents([('hello.txt', 'my helicopter\n'
 
54
                                                'your helicopter\n'
 
55
                                                'all of\n'
 
56
                                                'our helicopters\n'
 
57
                                  )])
62
58
        self.revision_id_4 = wt.commit('mod hello',
63
 
                                       committer='user@test',
64
 
                                       timestamp=1166050000.00, timezone=0)
 
59
                              committer='user@test',
 
60
                              timestamp=1166050000.00, timezone=0)
65
61
 
66
62
    def test_help_annotate(self):
67
63
        """Annotate command exists"""
68
 
        out, err = self.run_bzr('--no-plugins annotate --help')
 
64
        out, err = self.run_bzr('--no-plugins', 'annotate', '--help')
69
65
 
70
66
    def test_annotate_cmd(self):
71
 
        out, err = self.run_bzr('annotate hello.txt')
 
67
        out, err = self.run_bzr('annotate', 'hello.txt')
72
68
        self.assertEqual('', err)
73
69
        self.assertEqualDiff('''\
74
70
1   test@us | my helicopter
78
74
''', out)
79
75
 
80
76
    def test_annotate_cmd_full(self):
81
 
        out, err = self.run_bzr('annotate hello.txt --all')
 
77
        out, err = self.run_bzr('annotate', 'hello.txt', '--all')
82
78
        self.assertEqual('', err)
83
79
        self.assertEqualDiff('''\
84
80
1   test@us | my helicopter
88
84
''', out)
89
85
 
90
86
    def test_annotate_cmd_long(self):
91
 
        out, err = self.run_bzr('annotate hello.txt --long')
 
87
        out, err = self.run_bzr('annotate', 'hello.txt', '--long')
92
88
        self.assertEqual('', err)
93
89
        self.assertEqualDiff('''\
94
90
1   test@user 20061212 | my helicopter
98
94
''', out)
99
95
 
100
96
    def test_annotate_cmd_show_ids(self):
101
 
        out, err = self.run_bzr('annotate hello.txt --show-ids')
 
97
        out, err = self.run_bzr('annotate', 'hello.txt', '--show-ids')
102
98
        max_len = max([len(self.revision_id_1),
103
99
                       len(self.revision_id_3),
104
100
                       len(self.revision_id_4)])
108
104
%*s | your helicopter
109
105
%*s | all of
110
106
%*s | our helicopters
111
 
''' % (max_len, self.revision_id_1.decode('utf-8'),
112
 
            max_len, self.revision_id_3.decode('utf-8'),
113
 
            max_len, self.revision_id_4.decode('utf-8'),
114
 
            max_len, '',
115
 
       ), out)
 
107
''' % (max_len, self.revision_id_1,
 
108
       max_len, self.revision_id_3,
 
109
       max_len, self.revision_id_4,
 
110
       max_len, '',
 
111
      )
 
112
, out)
116
113
 
117
114
    def test_no_mail(self):
118
 
        out, err = self.run_bzr('annotate nomail.txt')
 
115
        out, err = self.run_bzr('annotate', 'nomail.txt')
119
116
        self.assertEqual('', err)
120
117
        self.assertEqualDiff('''\
121
118
2   no mail | nomail
122
119
''', out)
123
120
 
124
121
    def test_annotate_cmd_revision(self):
125
 
        out, err = self.run_bzr('annotate hello.txt -r1')
 
122
        out, err = self.run_bzr('annotate', 'hello.txt', '-r1')
126
123
        self.assertEqual('', err)
127
124
        self.assertEqualDiff('''\
128
125
1   test@us | my helicopter
129
126
''', out)
130
127
 
131
128
    def test_annotate_cmd_revision3(self):
132
 
        out, err = self.run_bzr('annotate hello.txt -r3')
 
129
        out, err = self.run_bzr('annotate', 'hello.txt', '-r3')
133
130
        self.assertEqual('', err)
134
131
        self.assertEqualDiff('''\
135
132
1   test@us | my helicopter
137
134
''', out)
138
135
 
139
136
    def test_annotate_cmd_unknown_revision(self):
140
 
        out, err = self.run_bzr('annotate hello.txt -r 10',
 
137
        out, err = self.run_bzr('annotate', 'hello.txt', '-r', '10',
141
138
                                retcode=3)
142
139
        self.assertEqual('', out)
143
 
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
 
140
        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
144
141
 
145
142
    def test_annotate_cmd_two_revisions(self):
146
 
        out, err = self.run_bzr('annotate hello.txt -r1..2',
 
143
        out, err = self.run_bzr('annotate', 'hello.txt', '-r1..2',
147
144
                                retcode=3)
148
145
        self.assertEqual('', out)
149
 
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
150
 
                         ' exactly one revision identifier\n',
 
146
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
 
147
                         ' exactly 1 argument\n',
151
148
                         err)
152
149
 
153
 
 
154
 
class TestSimpleAnnotate(tests.TestCaseWithTransport):
155
 
    """Annotate tests with no complex setup."""
156
 
 
157
 
    def _setup_edited_file(self, relpath='.'):
158
 
        """Create a tree with a locally edited file."""
159
 
        tree = self.make_branch_and_tree(relpath)
160
 
        file_relpath = joinpath(relpath, 'file')
161
 
        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
162
 
        tree.add('file')
163
 
        tree.commit('add file', committer="test@host", rev_id=b"rev1")
164
 
        self.build_tree_contents([(file_relpath, b'foo\nbar\ngam\n')])
165
 
        return tree
166
 
 
167
 
    def test_annotate_cmd_revspec_branch(self):
168
 
        tree = self._setup_edited_file('trunk')
169
 
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
170
 
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
171
 
                                working_dir='work')
172
 
        self.assertEqual('', err)
173
 
        self.assertEqual(
174
 
            '1   test@ho | foo\n'
175
 
            '            | gam\n',
176
 
            out)
177
 
 
178
 
    def test_annotate_edited_file(self):
179
 
        tree = self._setup_edited_file()
180
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
181
 
        out, err = self.run_bzr('annotate file')
182
 
        self.assertEqual(
183
 
            '1   test@ho | foo\n'
184
 
            '2?  current | bar\n'
185
 
            '1   test@ho | gam\n',
186
 
            out)
187
 
 
188
 
    def test_annotate_edited_file_no_default(self):
189
 
        # Ensure that when no username is available annotate still works.
190
 
        override_whoami(self)
191
 
        tree = self._setup_edited_file()
192
 
        out, err = self.run_bzr('annotate file')
193
 
        self.assertEqual(
194
 
            '1   test@ho | foo\n'
195
 
            '2?  local u | bar\n'
196
 
            '1   test@ho | gam\n',
197
 
            out)
198
 
 
199
 
    def test_annotate_edited_file_show_ids(self):
200
 
        tree = self._setup_edited_file()
201
 
        self.overrideEnv('BRZ_EMAIL', 'current@host2')
202
 
        out, err = self.run_bzr('annotate file --show-ids')
203
 
        self.assertEqual(
204
 
            '    rev1 | foo\n'
205
 
            'current: | bar\n'
206
 
            '    rev1 | gam\n',
207
 
            out)
208
 
 
209
 
    def _create_merged_file(self):
210
 
        """Create a file with a pending merge and local edit."""
211
 
        tree = self.make_branch_and_tree('.')
212
 
        self.build_tree_contents([('file', b'foo\ngam\n')])
213
 
        tree.add('file')
214
 
        tree.commit('add file', rev_id=b"rev1", committer="test@host")
215
 
        # right side
216
 
        self.build_tree_contents([('file', b'foo\nbar\ngam\n')])
217
 
        tree.commit("right", rev_id=b"rev1.1.1", committer="test@host")
218
 
        tree.pull(tree.branch, True, b"rev1")
219
 
        # left side
220
 
        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
221
 
        tree.commit("left", rev_id=b"rev2", committer="test@host")
222
 
        # merge
223
 
        tree.merge_from_branch(tree.branch, b"rev1.1.1")
224
 
        # edit the file to be 'resolved' and have a further local edit
225
 
        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
226
 
        return tree
227
 
 
228
 
    def test_annotated_edited_merged_file_revnos(self):
229
 
        wt = self._create_merged_file()
230
 
        out, err = self.run_bzr(['annotate', 'file'])
231
 
        email = config.extract_email_address(
232
 
            wt.branch.get_config_stack().get('email'))
233
 
        self.assertEqual(
234
 
            '3?    %-7s | local\n'
235
 
            '1     test@ho | foo\n'
236
 
            '1.1.1 test@ho | bar\n'
237
 
            '2     test@ho | baz\n'
238
 
            '1     test@ho | gam\n' % email[:7],
239
 
            out)
240
 
 
241
 
    def test_annotated_edited_merged_file_ids(self):
242
 
        self._create_merged_file()
243
 
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
244
 
        self.assertEqual(
245
 
            'current: | local\n'
246
 
            '    rev1 | foo\n'
247
 
            'rev1.1.1 | bar\n'
248
 
            '    rev2 | baz\n'
249
 
            '    rev1 | gam\n',
250
 
            out)
251
 
 
252
150
    def test_annotate_empty_file(self):
253
 
        tree = self.make_branch_and_tree('.')
254
 
        self.build_tree_contents([('empty', b'')])
255
 
        tree.add('empty')
256
 
        tree.commit('add empty file')
257
 
        out, err = self.run_bzr(['annotate', 'empty'])
258
 
        self.assertEqual('', out)
259
 
 
260
 
    def test_annotate_removed_file(self):
261
 
        tree = self.make_branch_and_tree('.')
262
 
        self.build_tree_contents([('empty', b'')])
263
 
        tree.add('empty')
264
 
        tree.commit('add empty file')
265
 
        # delete the file.
266
 
        tree.remove('empty')
267
 
        tree.commit('remove empty file')
268
 
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
269
 
        self.assertEqual('', out)
270
 
 
271
 
    def test_annotate_empty_file_show_ids(self):
272
 
        tree = self.make_branch_and_tree('.')
273
 
        self.build_tree_contents([('empty', b'')])
274
 
        tree.add('empty')
275
 
        tree.commit('add empty file')
276
 
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
277
 
        self.assertEqual('', out)
278
 
 
279
 
    def test_annotate_nonexistant_file(self):
280
 
        tree = self.make_branch_and_tree('.')
281
 
        self.build_tree(['file'])
282
 
        tree.add(['file'])
283
 
        tree.commit('add a file')
284
 
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
285
 
        self.assertEqual('', out)
286
 
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
287
 
 
288
 
    def test_annotate_without_workingtree(self):
289
 
        tree = self.make_branch_and_tree('.')
290
 
        self.build_tree_contents([('empty', b'')])
291
 
        tree.add('empty')
292
 
        tree.commit('add empty file')
293
 
        bzrdir = tree.branch.controldir
294
 
        bzrdir.destroy_workingtree()
295
 
        self.assertFalse(bzrdir.has_workingtree())
296
 
        out, err = self.run_bzr(['annotate', 'empty'])
297
 
        self.assertEqual('', out)
298
 
 
299
 
    def test_annotate_directory(self):
300
 
        """Test --directory option"""
301
 
        wt = self.make_branch_and_tree('a')
302
 
        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
303
 
        wt.add(['hello.txt'])
304
 
        wt.commit('commit', committer='test@user')
305
 
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
306
 
        self.assertEqualDiff('1   test@us | my helicopter\n', out)
 
151
        tree = self.make_branch_and_tree('tree')
 
152
        self.build_tree_contents([('tree/empty', '')])
 
153
        tree.add('empty')
 
154
        tree.commit('add empty file')
 
155
 
 
156
        os.chdir('tree')
 
157
        out, err = self.run_bzr('annotate', 'empty')
 
158
        self.assertEqual('', out)