Mercurial > hg
changeset 2159:5c34b98ad6b1
Small cleanups to backout command:
- Accept -m for --message (like commit and similar commands), too.
- Don't ignore --logfile option.
- Fix command table entry (synopsis, group commit related option)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 30 Apr 2006 18:40:30 +0200 |
| parents | ec96c4518236 |
| children | 858df1f354c1 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Apr 29 20:56:46 2006 -0700 +++ b/mercurial/commands.py Sun Apr 30 18:40:30 2006 +0200 @@ -962,7 +962,7 @@ revert(ui, repo, **revert_opts) commit_opts = opts.copy() commit_opts['addremove'] = False - if not commit_opts['message']: + if not commit_opts['message'] and not commit_opts['logfile']: commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) commit(ui, repo, **commit_opts) def nice(node): @@ -2940,17 +2940,17 @@ ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], _('hg archive [OPTION]... DEST')), - 'backout': + "backout": (backout, - [('', 'message', '', _('use <text> as commit message')), - ('', 'merge', None, _('merge with old dirstate parent after backout')), + [('', 'merge', None, + _('merge with old dirstate parent after backout')), + ('m', 'message', '', _('use <text> as commit message')), ('l', 'logfile', '', _('read commit message from <file>')), ('d', 'date', '', _('record datecode as commit date')), ('u', 'user', '', _('record user as committer')), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], - _('hg backout [OPTION]... [FILE]...')), - + _('hg backout [OPTION]... REV')), "bundle": (bundle, [('f', 'force', None,