/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 breezy/tests/blackbox/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
"""Tests for the commit CLI of bzr."""
19
19
 
 
20
import doctest
20
21
import os
 
22
import re
21
23
import sys
22
24
 
23
 
from bzrlib import (
 
25
from testtools.matchers import DocTestMatches
 
26
 
 
27
from ... import (
 
28
    config,
24
29
    osutils,
25
30
    ignores,
26
31
    msgeditor,
27
 
    osutils,
28
 
    tests,
29
 
    )
30
 
from bzrlib.bzrdir import BzrDir
31
 
from bzrlib.tests import (
32
 
    probe_bad_non_ascii,
33
 
    TestSkipped,
34
 
    )
35
 
from bzrlib.tests.blackbox import ExternalBase
36
 
 
37
 
 
38
 
class TestCommit(ExternalBase):
 
32
    )
 
33
from ...controldir import ControlDir
 
34
from ...sixish import PY3
 
35
from .. import (
 
36
    test_foreign,
 
37
    features,
 
38
    )
 
39
from .. import TestCaseWithTransport
 
40
from ..matchers import ContainsNoVfsCalls
 
41
from ..test_bedding import override_whoami
 
42
 
 
43
 
 
44
class TestCommit(TestCaseWithTransport):
39
45
 
40
46
    def test_05_empty_commit(self):
41
47
        """Commit of tree with no versioned files should fail"""
42
48
        # If forced, it should succeed, but this is not tested here.
43
49
        self.make_branch_and_tree('.')
44
50
        self.build_tree(['hello.txt'])
45
 
        out,err = self.run_bzr('commit -m empty', retcode=3)
 
51
        out, err = self.run_bzr('commit -m empty', retcode=3)
46
52
        self.assertEqual('', out)
47
 
        self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
 
                                  ' 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) brz: ERROR: is a really long line, so we wrap it with '\'
 
56
        self.assertThat(
 
57
            err,
 
58
            DocTestMatches("""\
 
59
Committing to: ...
 
60
brz: ERROR: No changes to commit.\
 
61
 Please 'brz add' the files you want to commit,\
 
62
 or use --unchanged to force an empty commit.
 
63
""", flags=doctest.ELLIPSIS | doctest.REPORT_UDIFF))
49
64
 
50
65
    def test_commit_success(self):
51
66
        """Successful commit should not leave behind a bzr-commit-* file"""
57
72
        self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
58
73
        self.assertEqual('', self.run_bzr('unknowns')[0])
59
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
 
60
89
    def test_commit_with_path(self):
61
90
        """Commit tree with path of root specified"""
62
91
        a_tree = self.make_branch_and_tree('a')
64
93
        a_tree.add('a_file')
65
94
        self.run_bzr(['commit', '-m', 'first commit', 'a'])
66
95
 
67
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
68
 
        self.build_tree_contents([('b/a_file', 'changes in b')])
 
96
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
97
        self.build_tree_contents([('b/a_file', b'changes in b')])
69
98
        self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
70
99
 
71
 
        self.build_tree_contents([('a/a_file', 'new contents')])
 
100
        self.build_tree_contents([('a/a_file', b'new contents')])
72
101
        self.run_bzr(['commit', '-m', 'change in a', 'a'])
73
102
 
74
103
        b_tree.merge_from_branch(a_tree.branch)
76
105
        self.run_bzr('resolved b/a_file')
77
106
        self.run_bzr(['commit', '-m', 'merge into b', 'b'])
78
107
 
79
 
 
80
108
    def test_10_verbose_commit(self):
81
109
        """Add one file and examine verbose commit output"""
82
110
        tree = self.make_branch_and_tree('.')
83
111
        self.build_tree(['hello.txt'])
84
112
        tree.add("hello.txt")
85
 
        out,err = self.run_bzr('commit -m added')
 
113
        out, err = self.run_bzr('commit -m added')
86
114
        self.assertEqual('', out)
87
115
        self.assertContainsRe(err, '^Committing to: .*\n'
88
116
                              'added hello.txt\n'
91
119
    def prepare_simple_history(self):
92
120
        """Prepare and return a working tree with one commit of one file"""
93
121
        # Commit with modified file should say so
94
 
        wt = BzrDir.create_standalone_workingtree('.')
 
122
        wt = ControlDir.create_standalone_workingtree('.')
95
123
        self.build_tree(['hello.txt', 'extra.txt'])
96
124
        wt.add(['hello.txt'])
97
125
        wt.commit(message='added')
100
128
    def test_verbose_commit_modified(self):
101
129
        # Verbose commit of modified file should say so
102
130
        wt = self.prepare_simple_history()
103
 
        self.build_tree_contents([('hello.txt', 'new contents')])
 
131
        self.build_tree_contents([('hello.txt', b'new contents')])
104
132
        out, err = self.run_bzr('commit -m modified')
105
133
        self.assertEqual('', out)
106
134
        self.assertContainsRe(err, '^Committing to: .*\n'
107
 
                              'modified hello\.txt\n'
108
 
                              'Committed revision 2\.\n$')
 
135
                              'modified hello\\.txt\n'
 
136
                              'Committed revision 2\\.\n$')
 
137
 
 
138
    def test_unicode_commit_message_is_filename(self):
 
139
        """Unicode commit message same as a filename (Bug #563646).
 
140
        """
 
141
        self.requireFeature(features.UnicodeFilenameFeature)
 
142
        file_name = u'\N{euro sign}'
 
143
        self.run_bzr(['init'])
 
144
        with open(file_name, 'w') as f:
 
145
            f.write('hello world')
 
146
        self.run_bzr(['add'])
 
147
        out, err = self.run_bzr(['commit', '-m', file_name])
 
148
        reflags = re.MULTILINE | re.DOTALL | re.UNICODE
 
149
        te = osutils.get_terminal_encoding()
 
150
        self.assertContainsRe(err if PY3 else err.decode(te),
 
151
                              u'The commit message is a file name:',
 
152
                              flags=reflags)
 
153
 
 
154
        # Run same test with a filename that causes encode
 
155
        # error for the terminal encoding. We do this
 
156
        # by forcing terminal encoding of ascii for
 
157
        # osutils.get_terminal_encoding which is used
 
158
        # by ui.text.show_warning
 
159
        default_get_terminal_enc = osutils.get_terminal_encoding
 
160
        try:
 
161
            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
 
162
            file_name = u'foo\u1234'
 
163
            with open(file_name, 'w') as f:
 
164
                f.write('hello world')
 
165
            self.run_bzr(['add'])
 
166
            out, err = self.run_bzr(['commit', '-m', file_name])
 
167
            reflags = re.MULTILINE | re.DOTALL | re.UNICODE
 
168
            te = osutils.get_terminal_encoding()
 
169
            self.assertContainsRe(err if PY3 else err.decode(te, 'replace'),
 
170
                                  u'The commit message is a file name:',
 
171
                                  flags=reflags)
 
172
        finally:
 
173
            osutils.get_terminal_encoding = default_get_terminal_enc
 
174
 
 
175
    def test_non_ascii_file_unversioned_utf8(self):
 
176
        self.requireFeature(features.UnicodeFilenameFeature)
 
177
        tree = self.make_branch_and_tree(".")
 
178
        self.build_tree(["f"])
 
179
        tree.add(["f"])
 
180
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
 
181
                                    encoding="utf-8", retcode=3)
 
182
        self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
 
183
 
 
184
    def test_non_ascii_file_unversioned_iso_8859_5(self):
 
185
        self.requireFeature(features.UnicodeFilenameFeature)
 
186
        tree = self.make_branch_and_tree(".")
 
187
        self.build_tree(["f"])
 
188
        tree.add(["f"])
 
189
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
 
190
                                    encoding="iso-8859-5", retcode=3)
 
191
        if not PY3:
 
192
            self.expectFailure("Error messages are always written as UTF-8",
 
193
                               self.assertNotContainsString, err, b"\xc2\xa7")
 
194
        else:
 
195
            self.assertNotContainsString(err, b"\xc2\xa7")
 
196
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
109
197
 
110
198
    def test_warn_about_forgotten_commit_message(self):
111
199
        """Test that the lack of -m parameter is caught"""
122
210
        out, err = self.run_bzr('commit -m renamed')
123
211
        self.assertEqual('', out)
124
212
        self.assertContainsRe(err, '^Committing to: .*\n'
125
 
                              'renamed hello\.txt => gutentag\.txt\n'
126
 
                              'Committed revision 2\.$\n')
 
213
                              'renamed hello\\.txt => gutentag\\.txt\n'
 
214
                              'Committed revision 2\\.$\n')
127
215
 
128
216
    def test_verbose_commit_moved(self):
129
217
        # Verbose commit of file moved to new directory should say so
133
221
        wt.rename_one('hello.txt', 'subdir/hello.txt')
134
222
        out, err = self.run_bzr('commit -m renamed')
135
223
        self.assertEqual('', out)
136
 
        self.assertEqual(set([
 
224
        self.assertEqual({
137
225
            'Committing to: %s/' % osutils.getcwd(),
138
226
            'added subdir',
139
227
            'renamed hello.txt => subdir/hello.txt',
140
228
            'Committed revision 2.',
141
229
            '',
142
 
            ]), set(err.split('\n')))
 
230
            }, set(err.split('\n')))
143
231
 
144
232
    def test_verbose_commit_with_unknown(self):
145
233
        """Unknown files should not be listed by default in verbose output"""
146
234
        # Is that really the best policy?
147
 
        wt = BzrDir.create_standalone_workingtree('.')
 
235
        wt = ControlDir.create_standalone_workingtree('.')
148
236
        self.build_tree(['hello.txt', 'extra.txt'])
149
237
        wt.add(['hello.txt'])
150
 
        out,err = self.run_bzr('commit -m added')
 
238
        out, err = self.run_bzr('commit -m added')
151
239
        self.assertEqual('', out)
152
240
        self.assertContainsRe(err, '^Committing to: .*\n'
153
 
                              'added hello\.txt\n'
154
 
                              'Committed revision 1\.\n$')
 
241
                              'added hello\\.txt\n'
 
242
                              'Committed revision 1\\.\n$')
155
243
 
156
244
    def test_verbose_commit_with_unchanged(self):
157
245
        """Unchanged files should not be listed by default in verbose output"""
160
248
        tree.add('unchanged.txt')
161
249
        self.run_bzr('commit -m unchanged unchanged.txt')
162
250
        tree.add("hello.txt")
163
 
        out,err = self.run_bzr('commit -m added')
 
251
        out, err = self.run_bzr('commit -m added')
164
252
        self.assertEqual('', out)
165
253
        self.assertContainsRe(err, '^Committing to: .*\n'
166
 
                              'added hello\.txt\n'
167
 
                              'Committed revision 2\.$\n')
 
254
                              'added hello\\.txt\n'
 
255
                              'Committed revision 2\\.$\n')
168
256
 
169
257
    def test_verbose_commit_includes_master_location(self):
170
258
        """Location of master is displayed when committing to bound branch"""
181
269
 
182
270
    def test_commit_sanitizes_CR_in_message(self):
183
271
        # See bug #433779, basically Emacs likes to pass '\r\n' style line
184
 
        # endings to 'bzr commit -m ""' which breaks because we don't allow
 
272
        # endings to 'brz commit -m ""' which breaks because we don't allow
185
273
        # '\r' in commit messages. (Mostly because of issues where XML style
186
274
        # formats arbitrarily strip it out of the data while parsing.)
187
275
        # To make life easier for users, we just always translate '\r\n' =>
199
287
 
200
288
    def test_commit_merge_reports_all_modified_files(self):
201
289
        # the commit command should show all the files that are shown by
202
 
        # bzr diff or bzr status when committing, even when they were not
 
290
        # brz diff or brz status when committing, even when they were not
203
291
        # changed by the user but rather through doing a merge.
204
292
        this_tree = self.make_branch_and_tree('this')
205
293
        # we need a bunch of files and dirs, to perform one action on each.
226
314
            'filetoleave']
227
315
            )
228
316
        this_tree.commit('create_files')
229
 
        other_dir = this_tree.bzrdir.sprout('other')
 
317
        other_dir = this_tree.controldir.sprout('other')
230
318
        other_tree = other_dir.open_workingtree()
231
 
        other_tree.lock_write()
232
 
        # perform the needed actions on the files and dirs.
233
 
        try:
 
319
        with other_tree.lock_write():
 
320
            # perform the needed actions on the files and dirs.
234
321
            other_tree.rename_one('dirtorename', 'renameddir')
235
322
            other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
236
323
            other_tree.rename_one('filetorename', 'renamedfile')
239
326
            other_tree.remove(['dirtoremove', 'filetoremove'])
240
327
            self.build_tree_contents([
241
328
                ('other/newdir/',),
242
 
                ('other/filetomodify', 'new content'),
243
 
                ('other/newfile', 'new file content')])
 
329
                ('other/filetomodify', b'new content'),
 
330
                ('other/newfile', b'new file content')])
244
331
            other_tree.add('newfile')
245
332
            other_tree.add('newdir/')
246
333
            other_tree.commit('modify all sample files and dirs.')
247
 
        finally:
248
 
            other_tree.unlock()
249
334
        this_tree.merge_from_branch(other_tree.branch)
250
 
        os.chdir('this')
251
 
        out,err = self.run_bzr('commit -m added')
 
335
        out, err = self.run_bzr('commit -m added', working_dir='this')
252
336
        self.assertEqual('', out)
253
 
        self.assertEqual(set([
254
 
            'Committing to: %s/' % osutils.getcwd(),
 
337
        self.assertEqual({
 
338
            'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
255
339
            'modified filetomodify',
256
340
            'added newdir',
257
341
            'added newfile',
263
347
            'deleted filetoremove',
264
348
            'Committed revision 2.',
265
349
            ''
266
 
            ]), set(err.split('\n')))
 
350
            }, set(err.split('\n')))
267
351
 
268
352
    def test_empty_commit_message(self):
269
353
        tree = self.make_branch_and_tree('.')
270
 
        self.build_tree_contents([('foo.c', 'int main() {}')])
271
 
        tree.add('foo.c')
272
 
        self.run_bzr('commit -m ""', retcode=3)
273
 
 
274
 
    def test_unsupported_encoding_commit_message(self):
275
 
        if sys.platform == 'win32':
276
 
            raise tests.TestNotApplicable('Win32 parses arguments directly'
277
 
                ' as Unicode, so we can\'t pass invalid non-ascii')
278
 
        tree = self.make_branch_and_tree('.')
279
 
        self.build_tree_contents([('foo.c', 'int main() {}')])
280
 
        tree.add('foo.c')
281
 
        # LANG env variable has no effect on Windows
282
 
        # but some characters anyway cannot be represented
283
 
        # in default user encoding
284
 
        char = probe_bad_non_ascii(osutils.get_user_encoding())
285
 
        if char is None:
286
 
            raise TestSkipped('Cannot find suitable non-ascii character'
287
 
                'for user_encoding (%s)' % osutils.get_user_encoding())
288
 
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
289
 
                                          retcode=1,
290
 
                                          env_changes={'LANG': 'C'})
291
 
        self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
292
 
                                    'unsupported by the current encoding.')
 
354
        self.build_tree_contents([('foo.c', b'int main() {}')])
 
355
        tree.add('foo.c')
 
356
        self.run_bzr('commit -m ""')
293
357
 
294
358
    def test_other_branch_commit(self):
295
359
        # this branch is to ensure consistent behaviour, whether we're run
297
361
        outer_tree = self.make_branch_and_tree('.')
298
362
        inner_tree = self.make_branch_and_tree('branch')
299
363
        self.build_tree_contents([
300
 
            ('branch/foo.c', 'int main() {}'),
301
 
            ('branch/bar.c', 'int main() {}')])
 
364
            ('branch/foo.c', b'int main() {}'),
 
365
            ('branch/bar.c', b'int main() {}')])
302
366
        inner_tree.add(['foo.c', 'bar.c'])
303
367
        # can't commit files in different trees; sane error
304
368
        self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
307
371
        # can commit to branch - records bar.c
308
372
        self.run_bzr('commit -m newstuff branch')
309
373
        # No changes left
310
 
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
 
374
        self.run_bzr_error(["No changes to commit"],
 
375
                           'commit -m newstuff branch')
311
376
 
312
377
    def test_out_of_date_tree_commit(self):
313
378
        # check we get an error code and a clear message committing with an out
318
383
        # commit to the original branch to make the checkout out of date
319
384
        tree.commit('message branch', allow_pointless=True)
320
385
        # now commit to the checkout should emit
321
 
        # ERROR: Out of date with the branch, 'bzr update' is suggested
 
386
        # ERROR: Out of date with the branch, 'brz update' is suggested
322
387
        output = self.run_bzr('commit --unchanged -m checkout_message '
323
 
                             'checkout', retcode=3)
 
388
                              'checkout', retcode=3)
324
389
        self.assertEqual(output,
325
390
                         ('',
326
 
                          "bzr: ERROR: Working tree is out of date, please "
327
 
                          "run 'bzr update'.\n"))
 
391
                          "brz: ERROR: Working tree is out of date, please "
 
392
                          "run 'brz update'.\n"))
328
393
 
329
394
    def test_local_commit_unbound(self):
330
395
        # a --local commit on an unbound branch is an error
331
396
        self.make_branch_and_tree('.')
332
397
        out, err = self.run_bzr('commit --local', retcode=3)
333
398
        self.assertEqualDiff('', out)
334
 
        self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
 
399
        self.assertEqualDiff('brz: ERROR: Cannot perform local-only commits '
335
400
                             'on unbound branches.\n', err)
336
401
 
337
402
    def test_commit_a_text_merge_in_a_checkout(self):
343
408
        trunk = self.make_branch_and_tree('trunk')
344
409
 
345
410
        u1 = trunk.branch.create_checkout('u1')
346
 
        self.build_tree_contents([('u1/hosts', 'initial contents\n')])
 
411
        self.build_tree_contents([('u1/hosts', b'initial contents\n')])
347
412
        u1.add('hosts')
348
413
        self.run_bzr('commit -m add-hosts u1')
349
414
 
350
415
        u2 = trunk.branch.create_checkout('u2')
351
 
        self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
 
416
        self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
352
417
        self.run_bzr('commit -m checkin-from-u2 u2')
353
418
 
354
419
        # make an offline commits
355
 
        self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
 
420
        self.build_tree_contents(
 
421
            [('u1/hosts', b'first offline change in u1\n')])
356
422
        self.run_bzr('commit -m checkin-offline --local u1')
357
423
 
358
424
        # now try to pull in online work from u2, and then commit our offline
359
425
        # work as a merge
360
426
        # retcode 1 as we expect a text conflict
361
427
        self.run_bzr('update u1', retcode=1)
362
 
        self.assertFileEqual('''\
 
428
        self.assertFileEqual(b'''\
363
429
<<<<<<< TREE
364
430
first offline change in u1
365
431
=======
372
438
        # add a text change here to represent resolving the merge conflicts in
373
439
        # favour of a new version of the file not identical to either the u1
374
440
        # version or the u2 version.
375
 
        self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
 
441
        self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
376
442
        self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
377
443
 
378
444
    def test_commit_exclude_excludes_modified_files(self):
411
477
        t.add(['file-a', 'dir-a', 'dir-a/file-b'])
412
478
        t.commit('Create')
413
479
        t.remove(['file-a', 'dir-a/file-b'])
414
 
        os.chdir('dir-a')
415
 
        result = self.run_bzr('commit . -m removed-file-b')[1]
 
480
        result = self.run_bzr('commit . -m removed-file-b',
 
481
                              working_dir='dir-a')[1]
416
482
        self.assertNotContainsRe(result, 'file-a')
417
 
        result = self.run_bzr('status')[0]
 
483
        result = self.run_bzr('status', working_dir='dir-a')[0]
418
484
        self.assertContainsRe(result, 'removed:\n  file-a')
419
485
 
420
486
    def test_strict_commit(self):
424
490
        self.build_tree(['tree/a'])
425
491
        tree.add('a')
426
492
        # A simple change should just work
427
 
        self.run_bzr('commit --strict -m adding-a',
428
 
                     working_dir='tree')
 
493
        self.run_bzr('commit --strict -m adding-a', working_dir='tree')
429
494
 
430
495
    def test_strict_commit_no_changes(self):
431
496
        """commit --strict gives "no changes" if there is nothing to commit"""
471
536
            'commit -m hello --fixes=lp:23452 tree/hello.txt')
472
537
        self.assertEqual('', output)
473
538
        self.assertContainsRe(err, 'Committing to: .*\n'
474
 
                              'added hello\.txt\n'
475
 
                              'Committed revision 1\.\n')
 
539
                              'added hello\\.txt\n'
 
540
                              'Committed revision 1\\.\n')
 
541
 
 
542
    def test_fixes_bug_unicode(self):
 
543
        """commit --fixes=lp:unicode succeeds without output."""
 
544
        tree = self.make_branch_and_tree('tree')
 
545
        self.build_tree(['tree/hello.txt'])
 
546
        tree.add('hello.txt')
 
547
        output, err = self.run_bzr_raw(
 
548
            ['commit', '-m', 'hello',
 
549
             u'--fixes=generic:\u20ac', 'tree/hello.txt'],
 
550
            encoding='utf-8', retcode=3)
 
551
        self.assertEqual(b'', output)
 
552
        self.assertContainsRe(err,
 
553
                              b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
476
554
 
477
555
    def test_no_bugs_no_properties(self):
478
556
        """If no bugs are fixed, the bugs property is not set.
482
560
        tree = self.make_branch_and_tree('tree')
483
561
        self.build_tree(['tree/hello.txt'])
484
562
        tree.add('hello.txt')
485
 
        self.run_bzr( 'commit -m hello tree/hello.txt')
 
563
        self.run_bzr('commit -m hello tree/hello.txt')
486
564
        # Get the revision properties, ignoring the branch-nick property, which
487
565
        # we don't care about for this test.
488
566
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
490
568
        del properties['branch-nick']
491
569
        self.assertFalse('bugs' in properties)
492
570
 
 
571
    def test_bugs_sets_property(self):
 
572
        """commit --bugs=lp:234 sets the lp:234 revprop to 'related'."""
 
573
        tree = self.make_branch_and_tree('tree')
 
574
        self.build_tree(['tree/hello.txt'])
 
575
        tree.add('hello.txt')
 
576
        self.run_bzr('commit -m hello --bugs=lp:234 tree/hello.txt')
 
577
 
 
578
        # Get the revision properties, ignoring the branch-nick property, which
 
579
        # we don't care about for this test.
 
580
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
581
        properties = dict(last_rev.properties)
 
582
        del properties[u'branch-nick']
 
583
 
 
584
        self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 related'},
 
585
                         properties)
 
586
 
493
587
    def test_fixes_bug_sets_property(self):
494
588
        """commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
495
589
        tree = self.make_branch_and_tree('tree')
501
595
        # we don't care about for this test.
502
596
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
503
597
        properties = dict(last_rev.properties)
504
 
        del properties['branch-nick']
 
598
        del properties[u'branch-nick']
505
599
 
506
 
        self.assertEqual({'bugs': 'https://launchpad.net/bugs/234 fixed'},
 
600
        self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 fixed'},
507
601
                         properties)
508
602
 
509
603
    def test_fixes_multiple_bugs_sets_properties(self):
521
615
        del properties['branch-nick']
522
616
 
523
617
        self.assertEqual(
524
 
            {'bugs': 'https://launchpad.net/bugs/123 fixed\n'
525
 
                     'https://launchpad.net/bugs/235 fixed'},
 
618
            {u'bugs': 'https://launchpad.net/bugs/123 fixed\n'
 
619
             'https://launchpad.net/bugs/235 fixed'},
526
620
            properties)
527
621
 
528
622
    def test_fixes_bug_with_alternate_trackers(self):
534
628
            'trac_twisted_url', 'http://twistedmatrix.com/trac')
535
629
        self.build_tree(['tree/hello.txt'])
536
630
        tree.add('hello.txt')
537
 
        self.run_bzr('commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
 
631
        self.run_bzr(
 
632
            'commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
538
633
 
539
634
        # Get the revision properties, ignoring the branch-nick property, which
540
635
        # we don't care about for this test.
556
651
            'commit -m add-b --fixes=xxx:123',
557
652
            working_dir='tree')
558
653
 
 
654
    def test_fixes_bug_with_default_tracker(self):
 
655
        """commit --fixes=234 uses the default bug tracker."""
 
656
        tree = self.make_branch_and_tree('tree')
 
657
        self.build_tree(['tree/hello.txt'])
 
658
        tree.add('hello.txt')
 
659
        self.run_bzr_error(
 
660
            ["brz: ERROR: No tracker specified for bug 123. Use the form "
 
661
             "'tracker:id' or specify a default bug tracker using the "
 
662
             "`bugtracker` option.\n"
 
663
             "See \"brz help bugs\" for more information on this feature. "
 
664
             "Commit refused."],
 
665
            'commit -m add-b --fixes=123',
 
666
            working_dir='tree')
 
667
        tree.branch.get_config_stack().set("bugtracker", "lp")
 
668
        self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
 
669
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
670
        self.assertEqual('https://launchpad.net/bugs/234 fixed',
 
671
                         last_rev.properties['bugs'])
 
672
 
559
673
    def test_fixes_invalid_bug_number(self):
560
674
        tree = self.make_branch_and_tree('tree')
561
675
        self.build_tree(['tree/hello.txt'])
562
676
        tree.add('hello.txt')
563
677
        self.run_bzr_error(
564
678
            ["Did not understand bug identifier orange: Must be an integer. "
565
 
             "See \"bzr help bugs\" for more information on this feature.\n"
 
679
             "See \"brz help bugs\" for more information on this feature.\n"
566
680
             "Commit refused."],
567
681
            'commit -m add-b --fixes=lp:orange',
568
682
            working_dir='tree')
573
687
        self.build_tree(['tree/hello.txt'])
574
688
        tree.add('hello.txt')
575
689
        self.run_bzr_error(
576
 
            [r"Invalid bug orange. Must be in the form of 'tracker:id'\. "
577
 
             r"See \"bzr help bugs\" for more information on this feature.\n"
578
 
             r"Commit refused\."],
579
 
            'commit -m add-b --fixes=orange',
 
690
            [r"Invalid bug orange:apples:bananas. Must be in the form of "
 
691
             r"'tracker:id'\. See \"brz help bugs\" for more information on "
 
692
             r"this feature.\nCommit refused\."],
 
693
            'commit -m add-b --fixes=orange:apples:bananas',
580
694
            working_dir='tree')
581
695
 
582
696
    def test_no_author(self):
584
698
        tree = self.make_branch_and_tree('tree')
585
699
        self.build_tree(['tree/hello.txt'])
586
700
        tree.add('hello.txt')
587
 
        self.run_bzr( 'commit -m hello tree/hello.txt')
 
701
        self.run_bzr('commit -m hello tree/hello.txt')
588
702
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
589
703
        properties = last_rev.properties
590
704
        self.assertFalse('author' in properties)
598
712
        tree.add('hello.txt')
599
713
        self.run_bzr(["commit", '-m', 'hello',
600
714
                      '--author', u'John D\xf6 <jdoe@example.com>',
601
 
                     "tree/hello.txt"])
 
715
                      "tree/hello.txt"])
602
716
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
603
717
        properties = last_rev.properties
604
 
        self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
 
718
        self.assertEqual(u'John D\xf6 <jdoe@example.com>',
 
719
                         properties['authors'])
605
720
 
606
721
    def test_author_no_email(self):
607
722
        """Author's name without an email address is allowed, too."""
630
745
        self.build_tree(['tree/hello.txt'])
631
746
        tree.add('hello.txt')
632
747
        out, err = self.run_bzr("commit -m hello "
633
 
            "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
 
748
                                "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
634
749
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
635
750
        self.assertEqual(
636
751
            'Sat 2009-10-10 08:00:00 +0100',
637
752
            osutils.format_date(last_rev.timestamp, last_rev.timezone))
638
 
        
 
753
 
639
754
    def test_commit_time_bad_time(self):
640
755
        tree = self.make_branch_and_tree('tree')
641
756
        self.build_tree(['tree/hello.txt'])
642
757
        tree.add('hello.txt')
643
758
        out, err = self.run_bzr("commit -m hello "
644
 
            "--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
645
 
        self.assertStartsWith(
646
 
            err, "bzr: ERROR: Could not parse --commit-time:")
 
759
                                "--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
 
760
        self.assertStartsWith(
 
761
            err, "brz: ERROR: Could not parse --commit-time:")
 
762
 
 
763
    def test_commit_time_missing_tz(self):
 
764
        tree = self.make_branch_and_tree('tree')
 
765
        self.build_tree(['tree/hello.txt'])
 
766
        tree.add('hello.txt')
 
767
        out, err = self.run_bzr("commit -m hello "
 
768
                                "--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
 
769
        self.assertStartsWith(
 
770
            err, "brz: ERROR: Could not parse --commit-time:")
 
771
        # Test that it is actually checking and does not simply crash with
 
772
        # some other exception
 
773
        self.assertContainsString(err, "missing a timezone offset")
647
774
 
648
775
    def test_partial_commit_with_renames_in_tree(self):
649
776
        # this test illustrates bug #140419
656
783
        # then during partial commit we have error
657
784
        # parent_id {dir-XXX} not in inventory
658
785
        t.rename_one('dir/a', 'a')
659
 
        self.build_tree_contents([('test', 'changes in test')])
 
786
        self.build_tree_contents([('test', b'changes in test')])
660
787
        # partial commit
661
788
        out, err = self.run_bzr('commit test -m "partial commit"')
662
 
        self.assertEquals('', out)
 
789
        self.assertEqual('', out)
663
790
        self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
664
791
 
665
792
    def test_commit_readonly_checkout(self):
666
 
        # https://bugs.edge.launchpad.net/bzr/+bug/129701
 
793
        # https://bugs.launchpad.net/bzr/+bug/129701
667
794
        # "UnlockableTransport error trying to commit in checkout of readonly
668
795
        # branch"
669
796
        self.make_branch('master')
670
 
        master = BzrDir.open_from_transport(
 
797
        master = ControlDir.open_from_transport(
671
798
            self.get_readonly_transport('master')).open_branch()
672
799
        master.create_checkout('checkout')
673
800
        out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
674
 
            retcode=3)
 
801
                                retcode=3)
675
802
        self.assertContainsRe(err,
676
 
            r'^bzr: ERROR: Cannot lock.*readonly transport')
 
803
                              r'^brz: ERROR: Cannot lock.*readonly transport')
677
804
 
678
805
    def setup_editor(self):
679
806
        # Test that commit template hooks work
680
807
        if sys.platform == "win32":
681
 
            f = file('fed.bat', 'w')
682
 
            f.write('@rem dummy fed')
683
 
            f.close()
684
 
            osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
 
808
            with open('fed.bat', 'w') as f:
 
809
                f.write('@rem dummy fed')
 
810
            self.overrideEnv('BRZ_EDITOR', "fed.bat")
685
811
        else:
686
 
            f = file('fed.sh', 'wb')
687
 
            f.write('#!/bin/sh\n')
688
 
            f.close()
689
 
            os.chmod('fed.sh', 0755)
690
 
            osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
 
812
            with open('fed.sh', 'wb') as f:
 
813
                f.write(b'#!/bin/sh\n')
 
814
            os.chmod('fed.sh', 0o755)
 
815
            self.overrideEnv('BRZ_EDITOR', "./fed.sh")
691
816
 
692
817
    def setup_commit_with_template(self):
693
818
        self.setup_editor()
694
819
        msgeditor.hooks.install_named_hook("commit_message_template",
695
 
                lambda commit_obj, msg: "save me some typing\n", None)
 
820
                                           lambda commit_obj, msg: "save me some typing\n", None)
696
821
        tree = self.make_branch_and_tree('tree')
697
822
        self.build_tree(['tree/hello.txt'])
698
823
        tree.add('hello.txt')
699
824
        return tree
700
825
 
 
826
    def test_edit_empty_message(self):
 
827
        tree = self.make_branch_and_tree('tree')
 
828
        self.setup_editor()
 
829
        self.build_tree(['tree/hello.txt'])
 
830
        tree.add('hello.txt')
 
831
        out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
 
832
                                stdin="y\n")
 
833
        self.assertContainsRe(err,
 
834
                              "brz: ERROR: Empty commit message specified")
 
835
 
701
836
    def test_commit_hook_template_accepted(self):
702
837
        tree = self.setup_commit_with_template()
703
838
        out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
707
842
    def test_commit_hook_template_rejected(self):
708
843
        tree = self.setup_commit_with_template()
709
844
        expected = tree.last_revision()
710
 
        out, err = self.run_bzr_error(["empty commit message"],
711
 
            "commit tree/hello.txt", stdin="n\n")
 
845
        out, err = self.run_bzr_error(["Empty commit message specified."
 
846
                                       " Please specify a commit message with either"
 
847
                                       " --message or --file or leave a blank message"
 
848
                                       " with --message \"\"."],
 
849
                                      "commit tree/hello.txt", stdin="n\n")
712
850
        self.assertEqual(expected, tree.last_revision())
 
851
 
 
852
    def test_set_commit_message(self):
 
853
        msgeditor.hooks.install_named_hook("set_commit_message",
 
854
                                           lambda commit_obj, msg: "save me some typing\n", None)
 
855
        tree = self.make_branch_and_tree('tree')
 
856
        self.build_tree(['tree/hello.txt'])
 
857
        tree.add('hello.txt')
 
858
        out, err = self.run_bzr("commit tree/hello.txt")
 
859
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
860
        self.assertEqual('save me some typing\n', last_rev.message)
 
861
 
 
862
    def test_commit_without_username(self):
 
863
        """Ensure commit error if username is not set.
 
864
        """
 
865
        self.run_bzr(['init', 'foo'])
 
866
        with open('foo/foo.txt', 'w') as f:
 
867
            f.write('hello')
 
868
        self.run_bzr(['add'], working_dir='foo')
 
869
        override_whoami(self)
 
870
        self.run_bzr_error(
 
871
            ['Unable to determine your name'],
 
872
            ['commit', '-m', 'initial'], working_dir='foo')
 
873
 
 
874
    def test_commit_recursive_checkout(self):
 
875
        """Ensure that a commit to a recursive checkout fails cleanly.
 
876
        """
 
877
        self.run_bzr(['init', 'test_branch'])
 
878
        self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
 
879
        # bind to self
 
880
        self.run_bzr(['bind', '.'], working_dir='test_checkout')
 
881
        with open('test_checkout/foo.txt', 'w') as f:
 
882
            f.write('hello')
 
883
        self.run_bzr(['add'], working_dir='test_checkout')
 
884
        out, err = self.run_bzr_error(
 
885
            ['Branch.*test_checkout.*appears to be bound to itself'],
 
886
            ['commit', '-m', 'addedfoo'], working_dir='test_checkout')
 
887
 
 
888
    def test_mv_dirs_non_ascii(self):
 
889
        """Move directory with non-ascii name and containing files.
 
890
 
 
891
        Regression test for bug 185211.
 
892
        """
 
893
        tree = self.make_branch_and_tree('.')
 
894
        self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
 
895
 
 
896
        tree.add([u'abc\xa7/', u'abc\xa7/foo'])
 
897
        tree.commit('checkin')
 
898
 
 
899
        tree.rename_one(u'abc\xa7', 'abc')
 
900
 
 
901
        self.run_bzr('ci -m "non-ascii mv"')
 
902
 
 
903
 
 
904
class TestSmartServerCommit(TestCaseWithTransport):
 
905
 
 
906
    def test_commit_to_lightweight(self):
 
907
        self.setup_smart_server_with_call_log()
 
908
        t = self.make_branch_and_tree('from')
 
909
        for count in range(9):
 
910
            t.commit(message='commit %d' % count)
 
911
        out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
 
912
                                 'target'])
 
913
        self.reset_smart_call_log()
 
914
        self.build_tree(['target/afile'])
 
915
        self.run_bzr(['add', 'target/afile'])
 
916
        out, err = self.run_bzr(['commit', '-m', 'do something', 'target'])
 
917
        # This figure represent the amount of work to perform this use case. It
 
918
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
919
        # being too low. If rpc_count increases, more network roundtrips have
 
920
        # become necessary for this use case. Please do not adjust this number
 
921
        # upwards without agreement from bzr's network support maintainers.
 
922
        self.assertLength(211, self.hpss_calls)
 
923
        self.assertLength(2, self.hpss_connections)
 
924
        self.expectFailure("commit still uses VFS calls",
 
925
                           self.assertThat, self.hpss_calls, ContainsNoVfsCalls)