diff mercurial/cmdutil.py @ 17932:c8ffde272653

Merge with crew-stable.

--- a/mercurial/cmdutil.py	Tue Nov 13 13:09:42 2012 -0800
+++ b/mercurial/cmdutil.py	Tue Nov 13 19:32:53 2012 -0600
@@ -1715,7 +1715,9 @@
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
+            editmsg = False
             if not message:
+                editmsg = True
                 message = old.description()
 
             pureextra = extra.copy()
@@ -1729,7 +1731,8 @@
                                  user=user,
                                  date=date,
                                  extra=extra)
-            new._text = commitforceeditor(repo, new, [])
+            if editmsg:
+                new._text = commitforceeditor(repo, new, [])
 
             newdesc =  changelog.stripdesc(new.description())
             if ((not node)