1
# Copyright (C) 2005 by Canonical Ltd
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
12
# GNU General Public License for more details.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
"""Black-box tests for bzr.
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
22
command-line interface. This doesn't actually run a new interpreter but
23
23
rather starts again from the run_bzr function.
27
from cStringIO import StringIO
33
29
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
35
from bzrlib.errors import BzrCommandError
36
from bzrlib.osutils import has_symlinks
37
from bzrlib.tests import TestCaseInTempDir, BzrTestBase
38
from bzrlib.annotate import annotate_file
41
class TestAnnotate(TestCaseInTempDir):
30
from bzrlib.config import extract_email_address
31
from bzrlib.tests import TestCaseWithTransport
32
from bzrlib.urlutils import joinpath
35
class TestAnnotate(TestCaseWithTransport):
43
38
super(TestAnnotate, self).setUp()
44
b = Branch.initialize(u'.')
39
wt = self.make_branch_and_tree('.')
45
41
self.build_tree_contents([('hello.txt', 'my helicopter\n'),
46
42
('nomail.txt', 'nomail\n')])
47
b.working_tree().add(['hello.txt'])
48
b.working_tree().commit('add hello',
49
committer='test@user')
50
b.working_tree().add(['nomail.txt'])
51
b.working_tree().commit('add nomail', committer='no mail')
44
self.revision_id_1 = wt.commit('add hello',
45
committer='test@user',
46
timestamp=1165960000.00, timezone=0)
47
wt.add(['nomail.txt'])
48
self.revision_id_2 = wt.commit('add nomail',
50
timestamp=1165970000.00, timezone=0)
51
self.build_tree_contents([('hello.txt', 'my helicopter\n'
52
'your helicopter\n')])
53
self.revision_id_3 = wt.commit('mod hello',
54
committer='user@test',
55
timestamp=1166040000.00, timezone=0)
56
self.build_tree_contents([('hello.txt', 'my helicopter\n'
61
self.revision_id_4 = wt.commit('mod hello',
62
committer='user@test',
63
timestamp=1166050000.00, timezone=0)
53
65
def test_help_annotate(self):
54
66
"""Annotate command exists"""
55
out, err = self.run_bzr_captured(['--no-plugins', 'annotate', '--help'])
67
out, err = self.run_bzr('--no-plugins annotate --help')
57
69
def test_annotate_cmd(self):
58
out, err = self.run_bzr_captured(['annotate', 'hello.txt'])
59
self.assertEquals(err, '')
60
self.assertEqualDiff(out, '''\
61
1 test@us | my helicopter
70
out, err = self.run_bzr('annotate hello.txt')
71
self.assertEqual('', err)
72
self.assertEqualDiff('''\
73
1 test@us | my helicopter
74
3 user@te | your helicopter
79
def test_annotate_cmd_full(self):
80
out, err = self.run_bzr('annotate hello.txt --all')
81
self.assertEqual('', err)
82
self.assertEqualDiff('''\
83
1 test@us | my helicopter
84
3 user@te | your helicopter
86
4 user@te | our helicopters
89
def test_annotate_cmd_long(self):
90
out, err = self.run_bzr('annotate hello.txt --long')
91
self.assertEqual('', err)
92
self.assertEqualDiff('''\
93
1 test@user 20061212 | my helicopter
94
3 user@test 20061213 | your helicopter
95
4 user@test 20061213 | all of
99
def test_annotate_cmd_show_ids(self):
100
out, err = self.run_bzr('annotate hello.txt --show-ids')
101
max_len = max([len(self.revision_id_1),
102
len(self.revision_id_3),
103
len(self.revision_id_4)])
104
self.assertEqual('', err)
105
self.assertEqualDiff('''\
107
%*s | your helicopter
109
%*s | our helicopters
110
''' % (max_len, self.revision_id_1,
111
max_len, self.revision_id_3,
112
max_len, self.revision_id_4,
64
117
def test_no_mail(self):
65
out, err = self.run_bzr_captured(['annotate', 'nomail.txt'])
66
self.assertEquals(err, '')
67
self.assertEqualDiff(out, '''\
118
out, err = self.run_bzr('annotate nomail.txt')
119
self.assertEqual('', err)
120
self.assertEqualDiff('''\
124
def test_annotate_cmd_revision(self):
125
out, err = self.run_bzr('annotate hello.txt -r1')
126
self.assertEqual('', err)
127
self.assertEqualDiff('''\
128
1 test@us | my helicopter
131
def test_annotate_cmd_revision3(self):
132
out, err = self.run_bzr('annotate hello.txt -r3')
133
self.assertEqual('', err)
134
self.assertEqualDiff('''\
135
1 test@us | my helicopter
136
3 user@te | your helicopter
139
def test_annotate_cmd_unknown_revision(self):
140
out, err = self.run_bzr('annotate hello.txt -r 10',
142
self.assertEqual('', out)
143
self.assertContainsRe(err, "Requested revision: '10' does not exist")
145
def test_annotate_cmd_two_revisions(self):
146
out, err = self.run_bzr('annotate hello.txt -r1..2',
148
self.assertEqual('', out)
149
self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
150
' exactly one revision identifier\n',
154
class TestSimpleAnnotate(TestCaseWithTransport):
155
"""Annotate tests with no complex setup."""
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, 'foo\ngam\n')])
163
tree.commit('add file', committer="test@host", rev_id="rev1")
164
self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
165
tree.branch.get_config().set_user_option('email', 'current@host2')
168
def test_annotate_cmd_revspec_branch(self):
169
tree = self._setup_edited_file('trunk')
170
tree.branch.create_checkout(self.get_url('work'), lightweight=True)
172
out, err = self.run_bzr('annotate file -r branch:../trunk')
173
self.assertEqual('', err)
179
def test_annotate_edited_file(self):
180
tree = self._setup_edited_file()
181
out, err = self.run_bzr('annotate file')
188
def test_annotate_edited_file_show_ids(self):
189
tree = self._setup_edited_file()
190
out, err = self.run_bzr('annotate file --show-ids')
197
def _create_merged_file(self):
198
"""Create a file with a pending merge and local edit."""
199
tree = self.make_branch_and_tree('.')
200
self.build_tree_contents([('file', 'foo\ngam\n')])
202
tree.commit('add file', rev_id="rev1", committer="test@host")
204
self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
205
tree.commit("right", rev_id="rev1.1.1", committer="test@host")
206
tree.pull(tree.branch, True, "rev1")
208
self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
209
tree.commit("left", rev_id="rev2", committer="test@host")
211
tree.merge_from_branch(tree.branch, "rev1.1.1")
212
# edit the file to be 'resolved' and have a further local edit
213
self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
215
def test_annotated_edited_merged_file_revnos(self):
216
self._create_merged_file()
217
out, err = self.run_bzr('annotate file')
218
email = extract_email_address(Branch.open('.').get_config().username())
222
'1.1.1 test@ho | bar\n'
224
'1 test@ho | gam\n' % email[:7],
227
def test_annotated_edited_merged_file_ids(self):
228
self._create_merged_file()
229
out, err = self.run_bzr('annotate file --show-ids')
238
def test_annotate_empty_file(self):
239
tree = self.make_branch_and_tree('tree')
240
self.build_tree_contents([('tree/empty', '')])
242
tree.commit('add empty file')
245
out, err = self.run_bzr('annotate empty')
246
self.assertEqual('', out)
248
def test_annotate_empty_file_show_ids(self):
249
tree = self.make_branch_and_tree('tree')
250
self.build_tree_contents([('tree/empty', '')])
252
tree.commit('add empty file')
255
out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
256
self.assertEqual('', out)
258
def test_annotate_nonexistant_file(self):
259
tree = self.make_branch_and_tree('tree')
260
self.build_tree(['tree/file'])
262
tree.commit('add a file')
265
out, err = self.run_bzr("annotate doesnotexist", retcode=3)
266
self.assertEqual('', out)
267
self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
269
def test_annotate_without_workingtree(self):
270
tree = self.make_branch_and_tree('branch')
271
self.build_tree_contents([('branch/empty', '')])
273
tree.commit('add empty file')
274
bzrdir = tree.branch.bzrdir
275
bzrdir.destroy_workingtree()
276
self.assertFalse(bzrdir.has_workingtree())
279
out, err = self.run_bzr('annotate empty')
280
self.assertEqual('', out)
282
def test_annotate_directory(self):
283
"""Test --directory option"""
284
wt = self.make_branch_and_tree('a')
285
self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
286
wt.add(['hello.txt'])
287
wt.commit('commit', committer='test@user')
288
out, err = self.run_bzr('annotate -d a hello.txt')
289
self.assertEqualDiff('1 test@us | my helicopter\n', out)
added
removed
bzrlib/tests/blackbox/test_annotate.py
