← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_annotate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 
 
22
command-line interface. This doesn't actually run a new interpreter but
23
23
rather starts again from the run_bzr function.
24
24
"""
25
25
 
26
26
 
27
 
import os
28
 
 
29
 
from bzrlib.tests import TestCaseWithTransport
30
 
 
31
 
 
32
 
class TestAnnotate(TestCaseWithTransport):
 
27
from bzrlib import (
 
28
    config,
 
29
    tests,
 
30
    )
 
31
 
 
32
from bzrlib.urlutils import joinpath
 
33
 
 
34
 
 
35
class TestAnnotate(tests.TestCaseWithTransport):
33
36
 
34
37
    def setUp(self):
35
38
        super(TestAnnotate, self).setUp()
137
140
        out, err = self.run_bzr('annotate hello.txt -r 10',
138
141
                                retcode=3)
139
142
        self.assertEqual('', out)
140
 
        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
 
143
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
141
144
 
142
145
    def test_annotate_cmd_two_revisions(self):
143
146
        out, err = self.run_bzr('annotate hello.txt -r1..2',
144
147
                                retcode=3)
145
148
        self.assertEqual('', out)
146
149
        self.assertEqual('bzr: ERROR: bzr annotate --revision takes'
147
 
                         ' exactly 1 argument\n',
 
150
                         ' exactly one revision identifier\n',
148
151
                         err)
149
152
 
 
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, 'foo\ngam\n')])
 
162
        tree.add('file')
 
163
        tree.commit('add file', committer="test@host", rev_id="rev1")
 
164
        self.build_tree_contents([(file_relpath, '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
        tree.branch.get_config().set_user_option('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
        self.overrideEnv('EMAIL', None)
 
191
        self.overrideEnv('BZR_EMAIL', None)
 
192
        # Also, make sure that it's not inferred from mailname.
 
193
        self.overrideAttr(config, '_auto_user_id',
 
194
            lambda: (None, None))
 
195
        tree = self._setup_edited_file()
 
196
        out, err = self.run_bzr('annotate file')
 
197
        self.assertEqual(
 
198
            '1   test@ho | foo\n'
 
199
            '2?  local u | bar\n'
 
200
            '1   test@ho | gam\n',
 
201
            out)
 
202
 
 
203
    def test_annotate_edited_file_show_ids(self):
 
204
        tree = self._setup_edited_file()
 
205
        tree.branch.get_config().set_user_option('email', 'current@host2')
 
206
        out, err = self.run_bzr('annotate file --show-ids')
 
207
        self.assertEqual(
 
208
            '    rev1 | foo\n'
 
209
            'current: | bar\n'
 
210
            '    rev1 | gam\n',
 
211
            out)
 
212
 
 
213
    def _create_merged_file(self):
 
214
        """Create a file with a pending merge and local edit."""
 
215
        tree = self.make_branch_and_tree('.')
 
216
        self.build_tree_contents([('file', 'foo\ngam\n')])
 
217
        tree.add('file')
 
218
        tree.commit('add file', rev_id="rev1", committer="test@host")
 
219
        # right side
 
220
        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
 
221
        tree.commit("right", rev_id="rev1.1.1", committer="test@host")
 
222
        tree.pull(tree.branch, True, "rev1")
 
223
        # left side
 
224
        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
 
225
        tree.commit("left", rev_id="rev2", committer="test@host")
 
226
        # merge
 
227
        tree.merge_from_branch(tree.branch, "rev1.1.1")
 
228
        # edit the file to be 'resolved' and have a further local edit
 
229
        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
 
230
        return tree
 
231
 
 
232
    def test_annotated_edited_merged_file_revnos(self):
 
233
        wt = self._create_merged_file()
 
234
        out, err = self.run_bzr(['annotate', 'file'])
 
235
        email = config.extract_email_address(wt.branch.get_config().username())
 
236
        self.assertEqual(
 
237
            '3?    %-7s | local\n'
 
238
            '1     test@ho | foo\n'
 
239
            '1.1.1 test@ho | bar\n'
 
240
            '2     test@ho | baz\n'
 
241
            '1     test@ho | gam\n' % email[:7],
 
242
            out)
 
243
 
 
244
    def test_annotated_edited_merged_file_ids(self):
 
245
        self._create_merged_file()
 
246
        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])
 
247
        self.assertEqual(
 
248
            'current: | local\n'
 
249
            '    rev1 | foo\n'
 
250
            'rev1.1.1 | bar\n'
 
251
            '    rev2 | baz\n'
 
252
            '    rev1 | gam\n',
 
253
            out)
 
254
 
150
255
    def test_annotate_empty_file(self):
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')
 
256
        tree = self.make_branch_and_tree('.')
 
257
        self.build_tree_contents([('empty', '')])
 
258
        tree.add('empty')
 
259
        tree.commit('add empty file')
 
260
        out, err = self.run_bzr(['annotate', 'empty'])
 
261
        self.assertEqual('', out)
 
262
 
 
263
    def test_annotate_removed_file(self):
 
264
        tree = self.make_branch_and_tree('.')
 
265
        self.build_tree_contents([('empty', '')])
 
266
        tree.add('empty')
 
267
        tree.commit('add empty file')
 
268
        # delete the file.
 
269
        tree.remove('empty')
 
270
        tree.commit('remove empty file')
 
271
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
 
272
        self.assertEqual('', out)
 
273
 
 
274
    def test_annotate_empty_file_show_ids(self):
 
275
        tree = self.make_branch_and_tree('.')
 
276
        self.build_tree_contents([('empty', '')])
 
277
        tree.add('empty')
 
278
        tree.commit('add empty file')
 
279
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
158
280
        self.assertEqual('', out)
159
281
 
160
282
    def test_annotate_nonexistant_file(self):
161
 
        tree = self.make_branch_and_tree('tree')
162
 
        self.build_tree(['tree/file'])
 
283
        tree = self.make_branch_and_tree('.')
 
284
        self.build_tree(['file'])
163
285
        tree.add(['file'])
164
286
        tree.commit('add a file')
165
 
 
166
 
        os.chdir('tree')
167
 
        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
 
287
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
168
288
        self.assertEqual('', out)
169
289
        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)
170
290
 
171
291
    def test_annotate_without_workingtree(self):
172
 
        tree = self.make_branch_and_tree('branch')
173
 
        self.build_tree_contents([('branch/empty', '')])
 
292
        tree = self.make_branch_and_tree('.')
 
293
        self.build_tree_contents([('empty', '')])
174
294
        tree.add('empty')
175
295
        tree.commit('add empty file')
176
296
        bzrdir = tree.branch.bzrdir
177
297
        bzrdir.destroy_workingtree()
178
298
        self.assertFalse(bzrdir.has_workingtree())
 
299
        out, err = self.run_bzr(['annotate', 'empty'])
 
300
        self.assertEqual('', out)
179
301
 
180
 
        os.chdir('branch')
181
 
        out, err = self.run_bzr('annotate empty')
182
 
        self.assertEqual('', out)
 
302
    def test_annotate_directory(self):
 
303
        """Test --directory option"""
 
304
        wt = self.make_branch_and_tree('a')
 
305
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
 
306
        wt.add(['hello.txt'])
 
307
        wt.commit('commit', committer='test@user')
 
308
        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
 
309
        self.assertEqualDiff('1   test@us | my helicopter\n', out)