# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1198855934 -3600
# Node ID 6183df642f95f0b076221ad8e721ad684cecd7d9
# Parent  bc475d1f74caf65df21b267b5b9ab58770c3a903# Parent  75c2071385daea5bd23f0580b92a157292a42a51
merge with crew

diff -r bc475d1f74ca -r 6183df642f95 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Dec 28 00:03:55 2007 -0600
+++ b/mercurial/localrepo.py	Fri Dec 28 16:32:14 2007 +0100
@@ -799,6 +799,8 @@
                 if text:
                     edittext.append(text)
                 edittext.append("")
+                edittext.append(_("HG: Please write and save a commit message"))
+                edittext.append("HG: --")
                 edittext.append("HG: user: %s" % user)
                 if p2 != nullid:
                     edittext.append("HG: branch merge")
@@ -823,7 +825,7 @@
                 while lines and not lines[0]:
                     del lines[0]
                 if not lines:
-                    return None
+                    raise util.Abort(_("commit message cannot be left blank"))
                 text = '\n'.join(lines)
 
             n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
diff -r bc475d1f74ca -r 6183df642f95 tests/test-commit
--- a/tests/test-commit	Fri Dec 28 00:03:55 2007 -0600
+++ b/tests/test-commit	Fri Dec 28 16:32:14 2007 +0100
@@ -10,6 +10,7 @@
 cd test
 echo foo > foo
 hg add foo
+HGEDITOR=true hg commit -m ""
 hg commit -d '0 0' -m commit-1
 echo foo >> foo
 hg commit -d '1 4444444' -m commit-3
diff -r bc475d1f74ca -r 6183df642f95 tests/test-commit.out
--- a/tests/test-commit.out	Fri Dec 28 00:03:55 2007 -0600
+++ b/tests/test-commit.out	Fri Dec 28 16:32:14 2007 +0100
@@ -1,6 +1,9 @@
 % commit date test
 transaction abort!
 rollback completed
+abort: commit message cannot be left blank
+transaction abort!
+rollback completed
 abort: impossible time zone offset: 4444444
 transaction abort!
 rollback completed
diff -r bc475d1f74ca -r 6183df642f95 tests/test-import.out
--- a/tests/test-import.out	Fri Dec 28 00:03:55 2007 -0600
+++ b/tests/test-import.out	Fri Dec 28 16:32:14 2007 +0100
@@ -22,6 +22,7 @@
 applying ../tip.patch
 transaction abort!
 rollback completed
+abort: commit message cannot be left blank
 % import of plain diff should be ok with message
 requesting all changes
 adding changesets
@@ -91,6 +92,7 @@
 applying patch from stdin
 transaction abort!
 rollback completed
+abort: commit message cannot be left blank
 % hg export in email, should use patch header
 requesting all changes
 adding changesets
diff -r bc475d1f74ca -r 6183df642f95 tests/test-record.out
--- a/tests/test-record.out	Fri Dec 28 00:03:55 2007 -0600
+++ b/tests/test-record.out	Fri Dec 28 16:32:14 2007 +0100
@@ -50,6 +50,7 @@
 new file mode 100644
 examine changes to 'empty-rw'? [Ynsfdaq?]  transaction abort!
 rollback completed
+abort: commit message cannot be left blank
 
 changeset:   -1:000000000000
 tag:         tip