Merge with stable

contrib/mercurial.el

@@ -5,8 +5,8 b''
 ;; Author: Bryan O'Sullivan <[e-mail]>
 
 ;; mercurial.el is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License or any
-;; later version.
+;; modify it under the terms of the GNU General Public License version
+;; 2 or any later version.
 
 ;; mercurial.el is distributed in the hope that it will be useful, but
 ;; WITHOUT ANY WARRANTY; without even the implied warranty of

mercurial/commands.py

@@ -2944,6 +2944,7 b' def summary(ui, repo, **opts):'
             t.append(l % len(s))
 
     t = ', '.join(t)
+    cleanworkdir = False
 
     if len(parents) > 1:
         t += _(' (merge)')
@@ -2951,10 +2952,11 b' def summary(ui, repo, **opts):'
         t += _(' (new branch)')
     elif (not st[0] and not st[1] and not st[2]):
         t += _(' (clean)')
+        cleanworkdir = True
     elif pnode not in bheads:
         t += _(' (new branch head)')
 
-    if 'clean' in t:
+    if cleanworkdir:
         ui.status(_('commit: %s\n') % t.strip())
     else:
         ui.write(_('commit: %s\n') % t.strip())