Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 10270:c2e27f7966a7
Merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 20 Jan 2010 16:58:48 +0100 |
parents | d6512b3e9ac0 acf001ee5ef8 |
children | 08a0f04b56bd |
line wrap: on
line diff
--- 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())