Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 11697:efcdf6a953a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Jul 2010 16:04:00 -0500
parents fc360de66217 52e4ac3e63f7
children 3e979f47a4c9
comparison
equal deleted inserted replaced
11696:708291e9389c 11697:efcdf6a953a0
3648 if len(names) != len(set(names)): 3648 if len(names) != len(set(names)):
3649 raise util.Abort(_('tag names must be unique')) 3649 raise util.Abort(_('tag names must be unique'))
3650 for n in names: 3650 for n in names:
3651 if n in ['tip', '.', 'null']: 3651 if n in ['tip', '.', 'null']:
3652 raise util.Abort(_('the name \'%s\' is reserved') % n) 3652 raise util.Abort(_('the name \'%s\' is reserved') % n)
3653 if not n:
3654 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
3653 if opts.get('rev') and opts.get('remove'): 3655 if opts.get('rev') and opts.get('remove'):
3654 raise util.Abort(_("--rev and --remove are incompatible")) 3656 raise util.Abort(_("--rev and --remove are incompatible"))
3655 if opts.get('rev'): 3657 if opts.get('rev'):
3656 rev_ = opts['rev'] 3658 rev_ = opts['rev']
3657 message = opts.get('message') 3659 message = opts.get('message')