← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
17
17
 
18
18
"""Tests for the commit CLI of bzr."""
19
19
 
 
20
import doctest
20
21
import os
21
22
import re
22
23
import sys
23
24
 
 
25
from testtools.matchers import DocTestMatches
 
26
 
24
27
from bzrlib import (
25
 
    bzrdir,
 
28
    config,
26
29
    osutils,
27
30
    ignores,
28
31
    msgeditor,
29
 
    osutils,
30
32
    tests,
31
33
    )
32
34
from bzrlib.bzrdir import BzrDir
33
35
from bzrlib.tests import (
34
36
    probe_bad_non_ascii,
 
37
    test_foreign,
35
38
    TestSkipped,
36
39
    UnicodeFilenameFeature,
37
40
    )
47
50
        self.build_tree(['hello.txt'])
48
51
        out,err = self.run_bzr('commit -m empty', retcode=3)
49
52
        self.assertEqual('', out)
50
 
        self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
51
 
                                  ' Use --unchanged to commit anyhow.\n')
 
53
        # Two ugly bits here.
 
54
        # 1) We really don't want 'aborting commit write group' anymore.
 
55
        # 2) bzr: ERROR: is a really long line, so we wrap it with '\'
 
56
        self.assertThat(
 
57
            err,
 
58
            DocTestMatches("""\
 
59
Committing to: ...
 
60
bzr: ERROR: No changes to commit.\
 
61
 Please 'bzr add' the files you want to commit,\
 
62
 or use --unchanged to force an empty commit.
 
63
""", flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
52
64
 
53
65
    def test_commit_success(self):
54
66
        """Successful commit should not leave behind a bzr-commit-* file"""
60
72
        self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
61
73
        self.assertEqual('', self.run_bzr('unknowns')[0])
62
74
 
 
75
    def test_commit_lossy_native(self):
 
76
        """A --lossy option to commit is supported."""
 
77
        self.make_branch_and_tree('.')
 
78
        self.run_bzr('commit --lossy --unchanged -m message')
 
79
        self.assertEqual('', self.run_bzr('unknowns')[0])
 
80
 
 
81
    def test_commit_lossy_foreign(self):
 
82
        test_foreign.register_dummy_foreign_for_test(self)
 
83
        self.make_branch_and_tree('.',
 
84
            format=test_foreign.DummyForeignVcsDirFormat())
 
85
        self.run_bzr('commit --lossy --unchanged -m message')
 
86
        output = self.run_bzr('revision-info')[0]
 
87
        self.assertTrue(output.startswith('1 dummy-'))
 
88
 
63
89
    def test_commit_with_path(self):
64
90
        """Commit tree with path of root specified"""
65
91
        a_tree = self.make_branch_and_tree('a')
79
105
        self.run_bzr('resolved b/a_file')
80
106
        self.run_bzr(['commit', '-m', 'merge into b', 'b'])
81
107
 
82
 
 
83
108
    def test_10_verbose_commit(self):
84
109
        """Add one file and examine verbose commit output"""
85
110
        tree = self.make_branch_and_tree('.')
309
334
        tree.add('foo.c')
310
335
        self.run_bzr('commit -m ""', retcode=3)
311
336
 
312
 
    def test_unsupported_encoding_commit_message(self):
313
 
        if sys.platform == 'win32':
314
 
            raise tests.TestNotApplicable('Win32 parses arguments directly'
315
 
                ' as Unicode, so we can\'t pass invalid non-ascii')
316
 
        tree = self.make_branch_and_tree('.')
317
 
        self.build_tree_contents([('foo.c', 'int main() {}')])
318
 
        tree.add('foo.c')
319
 
        # LANG env variable has no effect on Windows
320
 
        # but some characters anyway cannot be represented
321
 
        # in default user encoding
322
 
        char = probe_bad_non_ascii(osutils.get_user_encoding())
323
 
        if char is None:
324
 
            raise TestSkipped('Cannot find suitable non-ascii character'
325
 
                'for user_encoding (%s)' % osutils.get_user_encoding())
326
 
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
327
 
                                          retcode=1,
328
 
                                          env_changes={'LANG': 'C'})
329
 
        self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
330
 
                                    'unsupported by the current encoding.')
331
 
 
332
337
    def test_other_branch_commit(self):
333
338
        # this branch is to ensure consistent behaviour, whether we're run
334
339
        # inside a branch, or not.
758
763
        self.run_bzr(['add'])
759
764
        self.overrideEnv('EMAIL', None)
760
765
        self.overrideEnv('BZR_EMAIL', None)
 
766
        # Also, make sure that it's not inferred from mailname.
 
767
        self.overrideAttr(config, '_auto_user_id',
 
768
            lambda: (None, None))
761
769
        out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
762
770
        self.assertContainsRe(err, 'Unable to determine your name')
763
771