# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1264003128 -3600
# Node ID c2e27f7966a7a6ba41b2c593a1f258467b8f643b
# Parent  7e3a685be2f3da1109e5a30a6597d500e52aabc0# Parent  acf001ee5ef80c698b75d437d9685ed926a3e2fc
Merge with stable

diff -r 7e3a685be2f3 -r c2e27f7966a7 contrib/mercurial.el
--- a/contrib/mercurial.el	Sun Jan 17 01:53:04 2010 +0100
+++ b/contrib/mercurial.el	Wed Jan 20 16:58:48 2010 +0100
@@ -5,8 +5,8 @@
 ;; Author: Bryan O'Sullivan <bos@serpentine.com>
 
 ;; 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
diff -r 7e3a685be2f3 -r c2e27f7966a7 mercurial/commands.py
--- a/mercurial/commands.py	Sun Jan 17 01:53:04 2010 +0100
+++ b/mercurial/commands.py	Wed Jan 20 16:58:48 2010 +0100
@@ -2944,6 +2944,7 @@
             t.append(l % len(s))
 
     t = ', '.join(t)
+    cleanworkdir = False
 
     if len(parents) > 1:
         t += _(' (merge)')
@@ -2951,10 +2952,11 @@
         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())