Merge lp:~jelmer/bzr/empty-commit-message into lp:bzr

[Jelmer Vernooij]

Support forcing empty commit messages with -m.

Allow explicitly committing with an empty commit message.

Committing with an empty commit message by specifying one in the
editor still fails.

This is a prerequisite for:

https://code.launchpad.net/~paulbrianstewart/bzr/207507-bzr-commit-message/+merge/68921

[Jonathan Riddell (jr)]

Approved with release note added

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2011-08-17 02:08:00 +0000
+++ bzrlib/builtins.py	2011-08-17 10:58:35 +0000
@@ -3327,11 +3327,11 @@
                 if my_message is None:
                     raise errors.BzrCommandError("please specify a commit"
                         " message with either --message or --file")
-            if my_message == "":
-                raise errors.BzrCommandError("Empty commit message specified."
-                        " Please specify a commit message with either"
-                        " --message or --file or leave a blank message"
-                        " with --message \"\".")
+                if my_message == "":
+                    raise errors.BzrCommandError("Empty commit message specified."
+                            " Please specify a commit message with either"
+                            " --message or --file or leave a blank message"
+                            " with --message \"\".")
             return my_message
 
         # The API permits a commit with a filter of [] to mean 'select nothing'

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2011-08-13 23:07:36 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2011-08-17 10:58:35 +0000
@@ -29,13 +29,10 @@
     osutils,
     ignores,
     msgeditor,
-    tests,
     )
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import (
-    probe_bad_non_ascii,
     test_foreign,
-    TestSkipped,
     features,
     )
 from bzrlib.tests import TestCaseWithTransport
@@ -332,7 +329,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([('foo.c', 'int main() {}')])
         tree.add('foo.c')
-        self.run_bzr('commit -m ""', retcode=3)
+        self.run_bzr('commit -m ""')
 
     def test_other_branch_commit(self):
         # this branch is to ensure consistent behaviour, whether we're run
@@ -741,6 +738,16 @@
         tree.add('hello.txt')
         return tree
 
+    def test_edit_empty_message(self):
+        tree = self.make_branch_and_tree('tree')
+        self.setup_editor()
+        self.build_tree(['tree/hello.txt'])
+        tree.add('hello.txt')
+        out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
+            stdin="y\n")
+        self.assertContainsRe(err,
+            "bzr: ERROR: Empty commit message specified")
+
     def test_commit_hook_template_accepted(self):
         tree = self.setup_commit_with_template()
         out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-08-17 08:40:16 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2011-08-17 10:58:35 +0000
@@ -81,6 +81,10 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* ``bzr commit -m ''`` can now be used to force an empty commit message.
+  Entering an empty commit message in the message editor still triggers
+  an error. (Jelmer Vernooij)
+
 Bug Fixes
 *********