Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 21940:9209c02f1f25 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: report no argument warning using a hint With this change resolve and revert produce consistent output when run with no arguments: $ hg resolve abort: no files or directories specified (use --all to remerge all files) $ hg revert abort: no files or directories specified (use --all to revert all files)
author Nathan Goldbaum <ngoldbau@ucsc.edu>
date Thu, 24 Jul 2014 14:29:08 -0700
parents 54ff2789d75e
children 0483ff40e326
comparison
equal deleted inserted replaced
21939:f486001f9d6f 21940:9209c02f1f25
4992 if (show and (mark or unmark)) or (mark and unmark): 4992 if (show and (mark or unmark)) or (mark and unmark):
4993 raise util.Abort(_("too many options specified")) 4993 raise util.Abort(_("too many options specified"))
4994 if pats and all: 4994 if pats and all:
4995 raise util.Abort(_("can't specify --all and patterns")) 4995 raise util.Abort(_("can't specify --all and patterns"))
4996 if not (all or pats or show or mark or unmark): 4996 if not (all or pats or show or mark or unmark):
4997 raise util.Abort(_('no files or directories specified; ' 4997 raise util.Abort(_('no files or directories specified'),
4998 'use --all to remerge all files')) 4998 hint=('use --all to remerge all files'))
4999 4999
5000 wlock = repo.wlock() 5000 wlock = repo.wlock()
5001 try: 5001 try:
5002 ms = mergemod.mergestate(repo) 5002 ms = mergemod.mergestate(repo)
5003 5003