commit: edit text fixups

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

commit: edit text fixups

if given text, don't call editor
if editor returned only whitespace, abort

manifest hash: 7b6158a37568d91be1443b487d0a2cea1ba55dd3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCp4zXywK+sNU5EO8RAqCrAJ921nNgI/akM8oacXewkIYdxaoiAgCffOP5
UOIl4GzvkOkcqd5YFS83pa8=
=seZT
-----END PGP SIGNATURE-----

mercurial/hg.py

@@ -493,15 +493,16 b' class localrepository:'
         new = new.keys()
         new.sort()
 
-        edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn)
-        edittext += "".join(["HG: changed %s\n" % f for f in new])
-        edittext += "".join(["HG: removed %s\n" % f for f in remove])
-        edittext = self.ui.edit(edittext)
+        if not text:
+            edittext = "\n" + "HG: manifest hash %s\n" % hex(mn)
+            edittext += "".join(["HG: changed %s\n" % f for f in new])
+            edittext += "".join(["HG: removed %s\n" % f for f in remove])
+            edittext = self.ui.edit(edittext)
+            if not edittext.rstrip():
+                return 1
+            text = edittext
 
-        if not edittext:
-            return 1
-
-        n = self.changelog.add(mn, new, edittext, tr, p1, p2)
+        n = self.changelog.add(mn, new, text, tr, p1, p2)
         tr.close()
 
         self.dirstate.setparents(n)