/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

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 .. import (
 
35
    test_foreign,
 
36
    features,
 
37
    )
 
38
from .. import TestCaseWithTransport
 
39
from ..test_bedding import override_whoami
 
40
 
 
41
 
 
42
class TestCommit(TestCaseWithTransport):
39
43
 
40
44
    def test_05_empty_commit(self):
41
45
        """Commit of tree with no versioned files should fail"""
42
46
        # If forced, it should succeed, but this is not tested here.
43
47
        self.make_branch_and_tree('.')
44
48
        self.build_tree(['hello.txt'])
45
 
        out,err = self.run_bzr('commit -m empty', retcode=3)
 
49
        out, err = self.run_bzr('commit -m empty', retcode=3)
46
50
        self.assertEqual('', out)
47
 
        self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
 
                                  ' Use --unchanged to commit anyhow.\n')
 
51
        # Two ugly bits here.
 
52
        # 1) We really don't want 'aborting commit write group' anymore.
 
53
        # 2) brz: ERROR: is a really long line, so we wrap it with '\'
 
54
        self.assertThat(
 
55
            err,
 
56
            DocTestMatches("""\
 
57
Committing to: ...
 
58
brz: ERROR: No changes to commit.\
 
59
 Please 'brz add' the files you want to commit,\
 
60
 or use --unchanged to force an empty commit.
 
61
""", flags=doctest.ELLIPSIS | doctest.REPORT_UDIFF))
49
62
 
50
63
    def test_commit_success(self):
51
64
        """Successful commit should not leave behind a bzr-commit-* file"""
57
70
        self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
58
71
        self.assertEqual('', self.run_bzr('unknowns')[0])
59
72
 
 
73
    def test_commit_lossy_native(self):
 
74
        """A --lossy option to commit is supported."""
 
75
        self.make_branch_and_tree('.')
 
76
        self.run_bzr('commit --lossy --unchanged -m message')
 
77
        self.assertEqual('', self.run_bzr('unknowns')[0])
 
78
 
 
79
    def test_commit_lossy_foreign(self):
 
80
        test_foreign.register_dummy_foreign_for_test(self)
 
81
        self.make_branch_and_tree('.',
 
82
                                  format=test_foreign.DummyForeignVcsDirFormat())
 
83
        self.run_bzr('commit --lossy --unchanged -m message')
 
84
        output = self.run_bzr('revision-info')[0]
 
85
        self.assertTrue(output.startswith('1 dummy-'))
 
86
 
60
87
    def test_commit_with_path(self):
61
88
        """Commit tree with path of root specified"""
62
89
        a_tree = self.make_branch_and_tree('a')
64
91
        a_tree.add('a_file')
65
92
        self.run_bzr(['commit', '-m', 'first commit', 'a'])
66
93
 
67
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
68
 
        self.build_tree_contents([('b/a_file', 'changes in b')])
 
94
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
95
        self.build_tree_contents([('b/a_file', b'changes in b')])
69
96
        self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
70
97
 
71
 
        self.build_tree_contents([('a/a_file', 'new contents')])
 
98
        self.build_tree_contents([('a/a_file', b'new contents')])
72
99
        self.run_bzr(['commit', '-m', 'change in a', 'a'])
73
100
 
74
101
        b_tree.merge_from_branch(a_tree.branch)
76
103
        self.run_bzr('resolved b/a_file')
77
104
        self.run_bzr(['commit', '-m', 'merge into b', 'b'])
78
105
 
79
 
 
80
106
    def test_10_verbose_commit(self):
81
107
        """Add one file and examine verbose commit output"""
82
108
        tree = self.make_branch_and_tree('.')
83
109
        self.build_tree(['hello.txt'])
84
110
        tree.add("hello.txt")
85
 
        out,err = self.run_bzr('commit -m added')
 
111
        out, err = self.run_bzr('commit -m added')
86
112
        self.assertEqual('', out)
87
113
        self.assertContainsRe(err, '^Committing to: .*\n'
88
114
                              'added hello.txt\n'
91
117
    def prepare_simple_history(self):
92
118
        """Prepare and return a working tree with one commit of one file"""
93
119
        # Commit with modified file should say so
94
 
        wt = BzrDir.create_standalone_workingtree('.')
 
120
        wt = ControlDir.create_standalone_workingtree('.')
95
121
        self.build_tree(['hello.txt', 'extra.txt'])
96
122
        wt.add(['hello.txt'])
97
123
        wt.commit(message='added')
100
126
    def test_verbose_commit_modified(self):
101
127
        # Verbose commit of modified file should say so
102
128
        wt = self.prepare_simple_history()
103
 
        self.build_tree_contents([('hello.txt', 'new contents')])
 
129
        self.build_tree_contents([('hello.txt', b'new contents')])
104
130
        out, err = self.run_bzr('commit -m modified')
105
131
        self.assertEqual('', out)
106
132
        self.assertContainsRe(err, '^Committing to: .*\n'
107
 
                              'modified hello\.txt\n'
108
 
                              'Committed revision 2\.\n$')
 
133
                              'modified hello\\.txt\n'
 
134
                              'Committed revision 2\\.\n$')
 
135
 
 
136
    def test_unicode_commit_message_is_filename(self):
 
137
        """Unicode commit message same as a filename (Bug #563646).
 
138
        """
 
139
        self.requireFeature(features.UnicodeFilenameFeature)
 
140
        file_name = u'\N{euro sign}'
 
141
        self.run_bzr(['init'])
 
142
        with open(file_name, 'w') as f:
 
143
            f.write('hello world')
 
144
        self.run_bzr(['add'])
 
145
        out, err = self.run_bzr(['commit', '-m', file_name])
 
146
        reflags = re.MULTILINE | re.DOTALL | re.UNICODE
 
147
        te = osutils.get_terminal_encoding()
 
148
        self.assertContainsRe(err,
 
149
                              u'The commit message is a file name:',
 
150
                              flags=reflags)
 
151
 
 
152
        # Run same test with a filename that causes encode
 
153
        # error for the terminal encoding. We do this
 
154
        # by forcing terminal encoding of ascii for
 
155
        # osutils.get_terminal_encoding which is used
 
156
        # by ui.text.show_warning
 
157
        default_get_terminal_enc = osutils.get_terminal_encoding
 
158
        try:
 
159
            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
 
160
            file_name = u'foo\u1234'
 
161
            with open(file_name, 'w') as f:
 
162
                f.write('hello world')
 
163
            self.run_bzr(['add'])
 
164
            out, err = self.run_bzr(['commit', '-m', file_name])
 
165
            reflags = re.MULTILINE | re.DOTALL | re.UNICODE
 
166
            te = osutils.get_terminal_encoding()
 
167
            self.assertContainsRe(err,
 
168
                                  u'The commit message is a file name:',
 
169
                                  flags=reflags)
 
170
        finally:
 
171
            osutils.get_terminal_encoding = default_get_terminal_enc
 
172
 
 
173
    def test_non_ascii_file_unversioned_utf8(self):
 
174
        self.requireFeature(features.UnicodeFilenameFeature)
 
175
        tree = self.make_branch_and_tree(".")
 
176
        self.build_tree(["f"])
 
177
        tree.add(["f"])
 
178
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
 
179
                                    encoding="utf-8", retcode=3)
 
180
        self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
 
181
 
 
182
    def test_non_ascii_file_unversioned_iso_8859_5(self):
 
183
        self.requireFeature(features.UnicodeFilenameFeature)
 
184
        tree = self.make_branch_and_tree(".")
 
185
        self.build_tree(["f"])
 
186
        tree.add(["f"])
 
187
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
 
188
                                    encoding="iso-8859-5", retcode=3)
 
189
        self.assertNotContainsString(err, b"\xc2\xa7")
 
190
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
109
191
 
110
192
    def test_warn_about_forgotten_commit_message(self):
111
193
        """Test that the lack of -m parameter is caught"""
122
204
        out, err = self.run_bzr('commit -m renamed')
123
205
        self.assertEqual('', out)
124
206
        self.assertContainsRe(err, '^Committing to: .*\n'
125
 
                              'renamed hello\.txt => gutentag\.txt\n'
126
 
                              'Committed revision 2\.$\n')
 
207
                              'renamed hello\\.txt => gutentag\\.txt\n'
 
208
                              'Committed revision 2\\.$\n')
127
209
 
128
210
    def test_verbose_commit_moved(self):
129
211
        # Verbose commit of file moved to new directory should say so
133
215
        wt.rename_one('hello.txt', 'subdir/hello.txt')
134
216
        out, err = self.run_bzr('commit -m renamed')
135
217
        self.assertEqual('', out)
136
 
        self.assertEqual(set([
 
218
        self.assertEqual({
137
219
            'Committing to: %s/' % osutils.getcwd(),
138
220
            'added subdir',
139
221
            'renamed hello.txt => subdir/hello.txt',
140
222
            'Committed revision 2.',
141
223
            '',
142
 
            ]), set(err.split('\n')))
 
224
            }, set(err.split('\n')))
143
225
 
144
226
    def test_verbose_commit_with_unknown(self):
145
227
        """Unknown files should not be listed by default in verbose output"""
146
228
        # Is that really the best policy?
147
 
        wt = BzrDir.create_standalone_workingtree('.')
 
229
        wt = ControlDir.create_standalone_workingtree('.')
148
230
        self.build_tree(['hello.txt', 'extra.txt'])
149
231
        wt.add(['hello.txt'])
150
 
        out,err = self.run_bzr('commit -m added')
 
232
        out, err = self.run_bzr('commit -m added')
151
233
        self.assertEqual('', out)
152
234
        self.assertContainsRe(err, '^Committing to: .*\n'
153
 
                              'added hello\.txt\n'
154
 
                              'Committed revision 1\.\n$')
 
235
                              'added hello\\.txt\n'
 
236
                              'Committed revision 1\\.\n$')
155
237
 
156
238
    def test_verbose_commit_with_unchanged(self):
157
239
        """Unchanged files should not be listed by default in verbose output"""
160
242
        tree.add('unchanged.txt')
161
243
        self.run_bzr('commit -m unchanged unchanged.txt')
162
244
        tree.add("hello.txt")
163
 
        out,err = self.run_bzr('commit -m added')
 
245
        out, err = self.run_bzr('commit -m added')
164
246
        self.assertEqual('', out)
165
247
        self.assertContainsRe(err, '^Committing to: .*\n'
166
 
                              'added hello\.txt\n'
167
 
                              'Committed revision 2\.$\n')
 
248
                              'added hello\\.txt\n'
 
249
                              'Committed revision 2\\.$\n')
168
250
 
169
251
    def test_verbose_commit_includes_master_location(self):
170
252
        """Location of master is displayed when committing to bound branch"""
181
263
 
182
264
    def test_commit_sanitizes_CR_in_message(self):
183
265
        # 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
 
266
        # endings to 'brz commit -m ""' which breaks because we don't allow
185
267
        # '\r' in commit messages. (Mostly because of issues where XML style
186
268
        # formats arbitrarily strip it out of the data while parsing.)
187
269
        # To make life easier for users, we just always translate '\r\n' =>
199
281
 
200
282
    def test_commit_merge_reports_all_modified_files(self):
201
283
        # 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
 
284
        # brz diff or brz status when committing, even when they were not
203
285
        # changed by the user but rather through doing a merge.
204
286
        this_tree = self.make_branch_and_tree('this')
205
287
        # we need a bunch of files and dirs, to perform one action on each.
226
308
            'filetoleave']
227
309
            )
228
310
        this_tree.commit('create_files')
229
 
        other_dir = this_tree.bzrdir.sprout('other')
 
311
        other_dir = this_tree.controldir.sprout('other')
230
312
        other_tree = other_dir.open_workingtree()
231
 
        other_tree.lock_write()
232
 
        # perform the needed actions on the files and dirs.
233
 
        try:
 
313
        with other_tree.lock_write():
 
314
            # perform the needed actions on the files and dirs.
234
315
            other_tree.rename_one('dirtorename', 'renameddir')
235
316
            other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
236
317
            other_tree.rename_one('filetorename', 'renamedfile')
239
320
            other_tree.remove(['dirtoremove', 'filetoremove'])
240
321
            self.build_tree_contents([
241
322
                ('other/newdir/',),
242
 
                ('other/filetomodify', 'new content'),
243
 
                ('other/newfile', 'new file content')])
 
323
                ('other/filetomodify', b'new content'),
 
324
                ('other/newfile', b'new file content')])
244
325
            other_tree.add('newfile')
245
326
            other_tree.add('newdir/')
246
327
            other_tree.commit('modify all sample files and dirs.')
247
 
        finally:
248
 
            other_tree.unlock()
249
328
        this_tree.merge_from_branch(other_tree.branch)
250
 
        os.chdir('this')
251
 
        out,err = self.run_bzr('commit -m added')
 
329
        out, err = self.run_bzr('commit -m added', working_dir='this')
252
330
        self.assertEqual('', out)
253
 
        self.assertEqual(set([
254
 
            'Committing to: %s/' % osutils.getcwd(),
 
331
        self.assertEqual({
 
332
            'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
255
333
            'modified filetomodify',
256
334
            'added newdir',
257
335
            'added newfile',
263
341
            'deleted filetoremove',
264
342
            'Committed revision 2.',
265
343
            ''
266
 
            ]), set(err.split('\n')))
 
344
            }, set(err.split('\n')))
267
345
 
268
346
    def test_empty_commit_message(self):
269
347
        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.')
 
348
        self.build_tree_contents([('foo.c', b'int main() {}')])
 
349
        tree.add('foo.c')
 
350
        self.run_bzr('commit -m ""')
293
351
 
294
352
    def test_other_branch_commit(self):
295
353
        # this branch is to ensure consistent behaviour, whether we're run
297
355
        outer_tree = self.make_branch_and_tree('.')
298
356
        inner_tree = self.make_branch_and_tree('branch')
299
357
        self.build_tree_contents([
300
 
            ('branch/foo.c', 'int main() {}'),
301
 
            ('branch/bar.c', 'int main() {}')])
 
358
            ('branch/foo.c', b'int main() {}'),
 
359
            ('branch/bar.c', b'int main() {}')])
302
360
        inner_tree.add(['foo.c', 'bar.c'])
303
361
        # can't commit files in different trees; sane error
304
362
        self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
307
365
        # can commit to branch - records bar.c
308
366
        self.run_bzr('commit -m newstuff branch')
309
367
        # No changes left
310
 
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
 
368
        self.run_bzr_error(["No changes to commit"],
 
369
                           'commit -m newstuff branch')
311
370
 
312
371
    def test_out_of_date_tree_commit(self):
313
372
        # check we get an error code and a clear message committing with an out
318
377
        # commit to the original branch to make the checkout out of date
319
378
        tree.commit('message branch', allow_pointless=True)
320
379
        # now commit to the checkout should emit
321
 
        # ERROR: Out of date with the branch, 'bzr update' is suggested
 
380
        # ERROR: Out of date with the branch, 'brz update' is suggested
322
381
        output = self.run_bzr('commit --unchanged -m checkout_message '
323
 
                             'checkout', retcode=3)
 
382
                              'checkout', retcode=3)
324
383
        self.assertEqual(output,
325
384
                         ('',
326
 
                          "bzr: ERROR: Working tree is out of date, please "
327
 
                          "run 'bzr update'.\n"))
 
385
                          "brz: ERROR: Working tree is out of date, please "
 
386
                          "run 'brz update'.\n"))
328
387
 
329
388
    def test_local_commit_unbound(self):
330
389
        # a --local commit on an unbound branch is an error
331
390
        self.make_branch_and_tree('.')
332
391
        out, err = self.run_bzr('commit --local', retcode=3)
333
392
        self.assertEqualDiff('', out)
334
 
        self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
 
393
        self.assertEqualDiff('brz: ERROR: Cannot perform local-only commits '
335
394
                             'on unbound branches.\n', err)
336
395
 
337
396
    def test_commit_a_text_merge_in_a_checkout(self):
343
402
        trunk = self.make_branch_and_tree('trunk')
344
403
 
345
404
        u1 = trunk.branch.create_checkout('u1')
346
 
        self.build_tree_contents([('u1/hosts', 'initial contents\n')])
 
405
        self.build_tree_contents([('u1/hosts', b'initial contents\n')])
347
406
        u1.add('hosts')
348
407
        self.run_bzr('commit -m add-hosts u1')
349
408
 
350
409
        u2 = trunk.branch.create_checkout('u2')
351
 
        self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
 
410
        self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
352
411
        self.run_bzr('commit -m checkin-from-u2 u2')
353
412
 
354
413
        # make an offline commits
355
 
        self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
 
414
        self.build_tree_contents(
 
415
            [('u1/hosts', b'first offline change in u1\n')])
356
416
        self.run_bzr('commit -m checkin-offline --local u1')
357
417
 
358
418
        # now try to pull in online work from u2, and then commit our offline
359
419
        # work as a merge
360
420
        # retcode 1 as we expect a text conflict
361
421
        self.run_bzr('update u1', retcode=1)
362
 
        self.assertFileEqual('''\
 
422
        self.assertFileEqual(b'''\
363
423
<<<<<<< TREE
364
424
first offline change in u1
365
425
=======
372
432
        # add a text change here to represent resolving the merge conflicts in
373
433
        # favour of a new version of the file not identical to either the u1
374
434
        # version or the u2 version.
375
 
        self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
 
435
        self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
376
436
        self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
377
437
 
378
438
    def test_commit_exclude_excludes_modified_files(self):
411
471
        t.add(['file-a', 'dir-a', 'dir-a/file-b'])
412
472
        t.commit('Create')
413
473
        t.remove(['file-a', 'dir-a/file-b'])
414
 
        os.chdir('dir-a')
415
 
        result = self.run_bzr('commit . -m removed-file-b')[1]
 
474
        result = self.run_bzr('commit . -m removed-file-b',
 
475
                              working_dir='dir-a')[1]
416
476
        self.assertNotContainsRe(result, 'file-a')
417
 
        result = self.run_bzr('status')[0]
 
477
        result = self.run_bzr('status', working_dir='dir-a')[0]
418
478
        self.assertContainsRe(result, 'removed:\n  file-a')
419
479
 
420
480
    def test_strict_commit(self):
424
484
        self.build_tree(['tree/a'])
425
485
        tree.add('a')
426
486
        # A simple change should just work
427
 
        self.run_bzr('commit --strict -m adding-a',
428
 
                     working_dir='tree')
 
487
        self.run_bzr('commit --strict -m adding-a', working_dir='tree')
429
488
 
430
489
    def test_strict_commit_no_changes(self):
431
490
        """commit --strict gives "no changes" if there is nothing to commit"""
471
530
            'commit -m hello --fixes=lp:23452 tree/hello.txt')
472
531
        self.assertEqual('', output)
473
532
        self.assertContainsRe(err, 'Committing to: .*\n'
474
 
                              'added hello\.txt\n'
475
 
                              'Committed revision 1\.\n')
 
533
                              'added hello\\.txt\n'
 
534
                              'Committed revision 1\\.\n')
 
535
 
 
536
    def test_fixes_bug_unicode(self):
 
537
        """commit --fixes=lp:unicode succeeds without output."""
 
538
        tree = self.make_branch_and_tree('tree')
 
539
        self.build_tree(['tree/hello.txt'])
 
540
        tree.add('hello.txt')
 
541
        output, err = self.run_bzr_raw(
 
542
            ['commit', '-m', 'hello',
 
543
             u'--fixes=generic:\u20ac', 'tree/hello.txt'],
 
544
            encoding='utf-8', retcode=3)
 
545
        self.assertEqual(b'', output)
 
546
        self.assertContainsRe(err,
 
547
                              b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
476
548
 
477
549
    def test_no_bugs_no_properties(self):
478
550
        """If no bugs are fixed, the bugs property is not set.
482
554
        tree = self.make_branch_and_tree('tree')
483
555
        self.build_tree(['tree/hello.txt'])
484
556
        tree.add('hello.txt')
485
 
        self.run_bzr( 'commit -m hello tree/hello.txt')
 
557
        self.run_bzr('commit -m hello tree/hello.txt')
486
558
        # Get the revision properties, ignoring the branch-nick property, which
487
559
        # we don't care about for this test.
488
560
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
490
562
        del properties['branch-nick']
491
563
        self.assertFalse('bugs' in properties)
492
564
 
 
565
    def test_bugs_sets_property(self):
 
566
        """commit --bugs=lp:234 sets the lp:234 revprop to 'related'."""
 
567
        tree = self.make_branch_and_tree('tree')
 
568
        self.build_tree(['tree/hello.txt'])
 
569
        tree.add('hello.txt')
 
570
        self.run_bzr('commit -m hello --bugs=lp:234 tree/hello.txt')
 
571
 
 
572
        # Get the revision properties, ignoring the branch-nick property, which
 
573
        # we don't care about for this test.
 
574
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
575
        properties = dict(last_rev.properties)
 
576
        del properties[u'branch-nick']
 
577
 
 
578
        self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 related'},
 
579
                         properties)
 
580
 
493
581
    def test_fixes_bug_sets_property(self):
494
582
        """commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
495
583
        tree = self.make_branch_and_tree('tree')
501
589
        # we don't care about for this test.
502
590
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
503
591
        properties = dict(last_rev.properties)
504
 
        del properties['branch-nick']
 
592
        del properties[u'branch-nick']
505
593
 
506
 
        self.assertEqual({'bugs': 'https://launchpad.net/bugs/234 fixed'},
 
594
        self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 fixed'},
507
595
                         properties)
508
596
 
509
597
    def test_fixes_multiple_bugs_sets_properties(self):
521
609
        del properties['branch-nick']
522
610
 
523
611
        self.assertEqual(
524
 
            {'bugs': 'https://launchpad.net/bugs/123 fixed\n'
525
 
                     'https://launchpad.net/bugs/235 fixed'},
 
612
            {u'bugs': 'https://launchpad.net/bugs/123 fixed\n'
 
613
             'https://launchpad.net/bugs/235 fixed'},
526
614
            properties)
527
615
 
528
616
    def test_fixes_bug_with_alternate_trackers(self):
534
622
            'trac_twisted_url', 'http://twistedmatrix.com/trac')
535
623
        self.build_tree(['tree/hello.txt'])
536
624
        tree.add('hello.txt')
537
 
        self.run_bzr('commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
 
625
        self.run_bzr(
 
626
            'commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
538
627
 
539
628
        # Get the revision properties, ignoring the branch-nick property, which
540
629
        # we don't care about for this test.
556
645
            'commit -m add-b --fixes=xxx:123',
557
646
            working_dir='tree')
558
647
 
 
648
    def test_fixes_bug_with_default_tracker(self):
 
649
        """commit --fixes=234 uses the default bug tracker."""
 
650
        tree = self.make_branch_and_tree('tree')
 
651
        self.build_tree(['tree/hello.txt'])
 
652
        tree.add('hello.txt')
 
653
        self.run_bzr_error(
 
654
            ["brz: ERROR: No tracker specified for bug 123. Use the form "
 
655
             "'tracker:id' or specify a default bug tracker using the "
 
656
             "`bugtracker` option.\n"
 
657
             "See \"brz help bugs\" for more information on this feature. "
 
658
             "Commit refused."],
 
659
            'commit -m add-b --fixes=123',
 
660
            working_dir='tree')
 
661
        tree.branch.get_config_stack().set("bugtracker", "lp")
 
662
        self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
 
663
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
664
        self.assertEqual('https://launchpad.net/bugs/234 fixed',
 
665
                         last_rev.properties['bugs'])
 
666
 
559
667
    def test_fixes_invalid_bug_number(self):
560
668
        tree = self.make_branch_and_tree('tree')
561
669
        self.build_tree(['tree/hello.txt'])
562
670
        tree.add('hello.txt')
563
671
        self.run_bzr_error(
564
672
            ["Did not understand bug identifier orange: Must be an integer. "
565
 
             "See \"bzr help bugs\" for more information on this feature.\n"
 
673
             "See \"brz help bugs\" for more information on this feature.\n"
566
674
             "Commit refused."],
567
675
            'commit -m add-b --fixes=lp:orange',
568
676
            working_dir='tree')
573
681
        self.build_tree(['tree/hello.txt'])
574
682
        tree.add('hello.txt')
575
683
        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',
 
684
            [r"Invalid bug orange:apples:bananas. Must be in the form of "
 
685
             r"'tracker:id'\. See \"brz help bugs\" for more information on "
 
686
             r"this feature.\nCommit refused\."],
 
687
            'commit -m add-b --fixes=orange:apples:bananas',
580
688
            working_dir='tree')
581
689
 
582
690
    def test_no_author(self):
584
692
        tree = self.make_branch_and_tree('tree')
585
693
        self.build_tree(['tree/hello.txt'])
586
694
        tree.add('hello.txt')
587
 
        self.run_bzr( 'commit -m hello tree/hello.txt')
 
695
        self.run_bzr('commit -m hello tree/hello.txt')
588
696
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
589
697
        properties = last_rev.properties
590
698
        self.assertFalse('author' in properties)
598
706
        tree.add('hello.txt')
599
707
        self.run_bzr(["commit", '-m', 'hello',
600
708
                      '--author', u'John D\xf6 <jdoe@example.com>',
601
 
                     "tree/hello.txt"])
 
709
                      "tree/hello.txt"])
602
710
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
603
711
        properties = last_rev.properties
604
 
        self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
 
712
        self.assertEqual(u'John D\xf6 <jdoe@example.com>',
 
713
                         properties['authors'])
605
714
 
606
715
    def test_author_no_email(self):
607
716
        """Author's name without an email address is allowed, too."""
630
739
        self.build_tree(['tree/hello.txt'])
631
740
        tree.add('hello.txt')
632
741
        out, err = self.run_bzr("commit -m hello "
633
 
            "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
 
742
                                "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
634
743
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
635
744
        self.assertEqual(
636
745
            'Sat 2009-10-10 08:00:00 +0100',
637
746
            osutils.format_date(last_rev.timestamp, last_rev.timezone))
638
 
        
 
747
 
639
748
    def test_commit_time_bad_time(self):
640
749
        tree = self.make_branch_and_tree('tree')
641
750
        self.build_tree(['tree/hello.txt'])
642
751
        tree.add('hello.txt')
643
752
        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:")
 
753
                                "--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
 
754
        self.assertStartsWith(
 
755
            err, "brz: ERROR: Could not parse --commit-time:")
 
756
 
 
757
    def test_commit_time_missing_tz(self):
 
758
        tree = self.make_branch_and_tree('tree')
 
759
        self.build_tree(['tree/hello.txt'])
 
760
        tree.add('hello.txt')
 
761
        out, err = self.run_bzr("commit -m hello "
 
762
                                "--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
 
763
        self.assertStartsWith(
 
764
            err, "brz: ERROR: Could not parse --commit-time:")
 
765
        # Test that it is actually checking and does not simply crash with
 
766
        # some other exception
 
767
        self.assertContainsString(err, "missing a timezone offset")
647
768
 
648
769
    def test_partial_commit_with_renames_in_tree(self):
649
770
        # this test illustrates bug #140419
656
777
        # then during partial commit we have error
657
778
        # parent_id {dir-XXX} not in inventory
658
779
        t.rename_one('dir/a', 'a')
659
 
        self.build_tree_contents([('test', 'changes in test')])
 
780
        self.build_tree_contents([('test', b'changes in test')])
660
781
        # partial commit
661
782
        out, err = self.run_bzr('commit test -m "partial commit"')
662
 
        self.assertEquals('', out)
 
783
        self.assertEqual('', out)
663
784
        self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
664
785
 
665
786
    def test_commit_readonly_checkout(self):
666
 
        # https://bugs.edge.launchpad.net/bzr/+bug/129701
 
787
        # https://bugs.launchpad.net/bzr/+bug/129701
667
788
        # "UnlockableTransport error trying to commit in checkout of readonly
668
789
        # branch"
669
790
        self.make_branch('master')
670
 
        master = BzrDir.open_from_transport(
 
791
        master = ControlDir.open_from_transport(
671
792
            self.get_readonly_transport('master')).open_branch()
672
793
        master.create_checkout('checkout')
673
794
        out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
674
 
            retcode=3)
 
795
                                retcode=3)
675
796
        self.assertContainsRe(err,
676
 
            r'^bzr: ERROR: Cannot lock.*readonly transport')
 
797
                              r'^brz: ERROR: Cannot lock.*readonly transport')
677
798
 
678
799
    def setup_editor(self):
679
800
        # Test that commit template hooks work
680
801
        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")
 
802
            with open('fed.bat', 'w') as f:
 
803
                f.write('@rem dummy fed')
 
804
            self.overrideEnv('BRZ_EDITOR', "fed.bat")
685
805
        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")
 
806
            with open('fed.sh', 'wb') as f:
 
807
                f.write(b'#!/bin/sh\n')
 
808
            os.chmod('fed.sh', 0o755)
 
809
            self.overrideEnv('BRZ_EDITOR', "./fed.sh")
691
810
 
692
811
    def setup_commit_with_template(self):
693
812
        self.setup_editor()
694
813
        msgeditor.hooks.install_named_hook("commit_message_template",
695
 
                lambda commit_obj, msg: "save me some typing\n", None)
 
814
                                           lambda commit_obj, msg: "save me some typing\n", None)
696
815
        tree = self.make_branch_and_tree('tree')
697
816
        self.build_tree(['tree/hello.txt'])
698
817
        tree.add('hello.txt')
699
818
        return tree
700
819
 
 
820
    def test_edit_empty_message(self):
 
821
        tree = self.make_branch_and_tree('tree')
 
822
        self.setup_editor()
 
823
        self.build_tree(['tree/hello.txt'])
 
824
        tree.add('hello.txt')
 
825
        out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
 
826
                                stdin="y\n")
 
827
        self.assertContainsRe(err,
 
828
                              "brz: ERROR: Empty commit message specified")
 
829
 
701
830
    def test_commit_hook_template_accepted(self):
702
831
        tree = self.setup_commit_with_template()
703
832
        out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
707
836
    def test_commit_hook_template_rejected(self):
708
837
        tree = self.setup_commit_with_template()
709
838
        expected = tree.last_revision()
710
 
        out, err = self.run_bzr_error(["empty commit message"],
711
 
            "commit tree/hello.txt", stdin="n\n")
 
839
        out, err = self.run_bzr_error(["Empty commit message specified."
 
840
                                       " Please specify a commit message with either"
 
841
                                       " --message or --file or leave a blank message"
 
842
                                       " with --message \"\"."],
 
843
                                      "commit tree/hello.txt", stdin="n\n")
712
844
        self.assertEqual(expected, tree.last_revision())
 
845
 
 
846
    def test_set_commit_message(self):
 
847
        msgeditor.hooks.install_named_hook("set_commit_message",
 
848
                                           lambda commit_obj, msg: "save me some typing\n", None)
 
849
        tree = self.make_branch_and_tree('tree')
 
850
        self.build_tree(['tree/hello.txt'])
 
851
        tree.add('hello.txt')
 
852
        out, err = self.run_bzr("commit tree/hello.txt")
 
853
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
854
        self.assertEqual('save me some typing\n', last_rev.message)
 
855
 
 
856
    def test_commit_without_username(self):
 
857
        """Ensure commit error if username is not set.
 
858
        """
 
859
        self.run_bzr(['init', 'foo'])
 
860
        with open('foo/foo.txt', 'w') as f:
 
861
            f.write('hello')
 
862
        self.run_bzr(['add'], working_dir='foo')
 
863
        override_whoami(self)
 
864
        self.run_bzr_error(
 
865
            ['Unable to determine your name'],
 
866
            ['commit', '-m', 'initial'], working_dir='foo')
 
867
 
 
868
    def test_commit_recursive_checkout(self):
 
869
        """Ensure that a commit to a recursive checkout fails cleanly.
 
870
        """
 
871
        self.run_bzr(['init', 'test_branch'])
 
872
        self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
 
873
        # bind to self
 
874
        self.run_bzr(['bind', '.'], working_dir='test_checkout')
 
875
        with open('test_checkout/foo.txt', 'w') as f:
 
876
            f.write('hello')
 
877
        self.run_bzr(['add'], working_dir='test_checkout')
 
878
        out, err = self.run_bzr_error(
 
879
            ['Branch.*test_checkout.*appears to be bound to itself'],
 
880
            ['commit', '-m', 'addedfoo'], working_dir='test_checkout')
 
881
 
 
882
    def test_mv_dirs_non_ascii(self):
 
883
        """Move directory with non-ascii name and containing files.
 
884
 
 
885
        Regression test for bug 185211.
 
886
        """
 
887
        tree = self.make_branch_and_tree('.')
 
888
        self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
 
889
 
 
890
        tree.add([u'abc\xa7/', u'abc\xa7/foo'])
 
891
        tree.commit('checkin')
 
892
 
 
893
        tree.rename_one(u'abc\xa7', 'abc')
 
894
 
 
895
        self.run_bzr('ci -m "non-ascii mv"')
 
896