Rev 6069: (jelmer) Mention ways of specifying a commit message or forcing an empty in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6069 [merge]
revision-id: pqm at pqm.ubuntu.com-20110814012348-8sg40gtq2rls03fa
parent: pqm at pqm.ubuntu.com-20110813033924-w5vit9zjr8dmqe99
parent: paulbrianstewart at gmail.com-20110813230736-lqi6eek015wh23yv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-08-14 01:23:48 +0000
message:
  (jelmer) Mention ways of specifying a commit message or forcing an empty
   commit message when the user specifies an empty message. (Paul Stewart)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-07-21 07:08:05 +0000
+++ b/bzrlib/builtins.py	2011-08-13 23:07:36 +0000
@@ -3328,7 +3328,10 @@
                     raise errors.BzrCommandError("please specify a commit"
                         " message with either --message or --file")
             if my_message == "":
-                raise errors.BzrCommandError("empty commit message specified")
+                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'
--- a/bzrlib/tests/blackbox/test_commit.py	2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2011-08-13 23:07:36 +0000
@@ -750,7 +750,10 @@
     def test_commit_hook_template_rejected(self):
         tree = self.setup_commit_with_template()
         expected = tree.last_revision()
-        out, err = self.run_bzr_error(["empty commit message"],
+        out, err = self.run_bzr_error(["Empty commit message specified."
+                  " Please specify a commit message with either"
+                  " --message or --file or leave a blank message"
+                  " with --message \"\"."],
             "commit tree/hello.txt", stdin="n\n")
         self.assertEqual(expected, tree.last_revision())