Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9451:3e673c988c85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: expand -c and -C in update error message
author Martin Geisler <mg@lazybytes.net>
date Thu, 17 Sep 2009 21:50:12 +0200
parents e78967d3dd6f
children c564dbb2a6d5 a23ee0208f77
comparison
equal deleted inserted replaced
9450:e78967d3dd6f 9451:3e673c988c85
3039 3039
3040 if not rev: 3040 if not rev:
3041 rev = node 3041 rev = node
3042 3042
3043 if check and clean: 3043 if check and clean:
3044 raise util.Abort(_("cannot specify both -c and -C")) 3044 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3045 3045
3046 if check: 3046 if check:
3047 # we could use dirty() but we can ignore merge and branch trivia 3047 # we could use dirty() but we can ignore merge and branch trivia
3048 c = repo[None] 3048 c = repo[None]
3049 if c.modified() or c.added() or c.removed(): 3049 if c.modified() or c.added() or c.removed():