1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
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
107
106
'modified hello\.txt\n'
108
107
'Committed revision 2\.\n$')
110
def test_warn_about_forgotten_commit_message(self):
111
"""Test that the lack of -m parameter is caught"""
112
wt = self.make_branch_and_tree('.')
113
self.build_tree(['one', 'two'])
115
out, err = self.run_bzr('commit -m one two')
116
self.assertContainsRe(err, "The commit message is a file name")
118
109
def test_verbose_commit_renamed(self):
119
110
# Verbose commit of renamed file should say so
120
111
wt = self.prepare_simple_history()
179
170
self.assertEqual(err, 'Committing to: %s\n'
180
171
'Committed revision 2.\n' % expected)
182
def test_commit_sanitizes_CR_in_message(self):
183
# 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
185
# '\r' in commit messages. (Mostly because of issues where XML style
186
# formats arbitrarily strip it out of the data while parsing.)
187
# To make life easier for users, we just always translate '\r\n' =>
188
# '\n'. And '\r' => '\n'.
189
a_tree = self.make_branch_and_tree('a')
190
self.build_tree(['a/b'])
192
self.run_bzr(['commit',
193
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
195
rev_id = a_tree.branch.last_revision()
196
rev = a_tree.branch.repository.get_revision(rev_id)
197
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
200
173
def test_commit_merge_reports_all_modified_files(self):
201
174
# the commit command should show all the files that are shown by
202
175
# bzr diff or bzr status when committing, even when they were not
272
245
self.run_bzr('commit -m ""', retcode=3)
274
247
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
248
tree = self.make_branch_and_tree('.')
279
249
self.build_tree_contents([('foo.c', 'int main() {}')])
280
250
tree.add('foo.c')
286
256
raise TestSkipped('Cannot find suitable non-ascii character'
287
257
'for user_encoding (%s)' % osutils.get_user_encoding())
258
# TODO: jam 2009-07-23 This test seems to fail on Windows now. My best
259
# guess is that the change to use Unicode command lines means
260
# that we no longer pay any attention to LANG=C when decoding the
261
# commandline arguments.
288
262
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
290
264
env_changes={'LANG': 'C'})
343
317
trunk = self.make_branch_and_tree('trunk')
345
319
u1 = trunk.branch.create_checkout('u1')
346
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
320
self.build_tree_contents([('u1/hosts', 'initial contents')])
348
322
self.run_bzr('commit -m add-hosts u1')
350
324
u2 = trunk.branch.create_checkout('u2')
351
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
325
self.build_tree_contents([('u2/hosts', 'altered in u2')])
352
326
self.run_bzr('commit -m checkin-from-u2 u2')
354
328
# make an offline commits
355
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
329
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
356
330
self.run_bzr('commit -m checkin-offline --local u1')
358
332
# now try to pull in online work from u2, and then commit our offline
359
333
# work as a merge
360
334
# retcode 1 as we expect a text conflict
361
335
self.run_bzr('update u1', retcode=1)
362
self.assertFileEqual('''\
364
first offline change in u1
371
336
self.run_bzr('resolved u1/hosts')
372
337
# add a text change here to represent resolving the merge conflicts in
373
338
# favour of a new version of the file not identical to either the u1
625
590
properties = last_rev.properties
626
591
self.assertEqual('John Doe\nJane Rey', properties['authors'])
628
def test_commit_time(self):
629
tree = self.make_branch_and_tree('tree')
630
self.build_tree(['tree/hello.txt'])
631
tree.add('hello.txt')
632
out, err = self.run_bzr("commit -m hello "
633
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
634
last_rev = tree.branch.repository.get_revision(tree.last_revision())
636
'Sat 2009-10-10 08:00:00 +0100',
637
osutils.format_date(last_rev.timestamp, last_rev.timezone))
639
def test_commit_time_bad_time(self):
640
tree = self.make_branch_and_tree('tree')
641
self.build_tree(['tree/hello.txt'])
642
tree.add('hello.txt')
643
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:")
648
593
def test_partial_commit_with_renames_in_tree(self):
649
594
# this test illustrates bug #140419
650
595
t = self.make_branch_and_tree('.')
678
623
def test_commit_hook_template(self):
679
624
# Test that commit template hooks work
625
def restoreDefaults():
626
msgeditor.hooks['commit_message_template'] = []
627
osutils.set_or_unset_env('BZR_EDITOR', default_editor)
680
628
if sys.platform == "win32":
681
629
f = file('fed.bat', 'w')
682
630
f.write('@rem dummy fed')
684
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
632
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
686
634
f = file('fed.sh', 'wb')
687
635
f.write('#!/bin/sh\n')
689
637
os.chmod('fed.sh', 0755)
690
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
638
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
639
self.addCleanup(restoreDefaults)
691
640
msgeditor.hooks.install_named_hook("commit_message_template",
692
641
lambda commit_obj, msg: "save me some typing\n", None)
693
642
tree = self.make_branch_and_tree('tree')
added
removed
bzrlib/tests/blackbox/test_commit.py
