Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 16600:b54f3c502e63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: remark on empty graft
author Matt Mackall <mpm@selenic.com>
date Sun, 06 May 2012 14:15:17 -0500
parents 46e9ed223d2c
children ddd4996740c7
comparison
equal deleted inserted replaced
16599:4b73f4ba27ca 16600:b54f3c502e63
2717 if opts.get('user'): 2717 if opts.get('user'):
2718 user = opts['user'] 2718 user = opts['user']
2719 date = ctx.date() 2719 date = ctx.date()
2720 if opts.get('date'): 2720 if opts.get('date'):
2721 date = opts['date'] 2721 date = opts['date']
2722 repo.commit(text=ctx.description(), user=user, 2722 node = repo.commit(text=ctx.description(), user=user,
2723 date=date, extra=extra, editor=editor) 2723 date=date, extra=extra, editor=editor)
2724 if node is None:
2725 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2724 finally: 2726 finally:
2725 wlock.release() 2727 wlock.release()
2726 2728
2727 # remove state when we complete successfully 2729 # remove state when we complete successfully
2728 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')): 2730 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):