Commit b96349ae authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

metaedit: add support for the -D and -U options

parent 85e5a56db776
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
(same as uncommit, but accessible through the amend commit) (same as uncommit, but accessible through the amend commit)
- uncommit: add support for --current-date and --current-user option - uncommit: add support for --current-date and --current-user option
- fold: add support for --current-date and --current-user option - fold: add support for --current-date and --current-user option
- metaedit: add support for --current-date and --current-user option
- topic: add --age option to sort topic by the most recently touched, - topic: add --age option to sort topic by the most recently touched,
- topic: add a 't0' to access the root of a topic while keeping it active, - topic: add a 't0' to access the root of a topic while keeping it active,
......
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
'^metaedit', '^metaedit',
[('r', 'rev', [], _("revision to edit")), [('r', 'rev', [], _("revision to edit")),
('', 'fold', None, _("also fold specified revisions into one")), ('', 'fold', None, _("also fold specified revisions into one")),
] + commitopts + commitopts2, ] + commitopts + commitopts2 + commitopts3,
_('hg metaedit [OPTION]... [-r] [REV]')) _('hg metaedit [OPTION]... [-r] [REV]'))
def metaedit(ui, repo, *revs, **opts): def metaedit(ui, repo, *revs, **opts):
"""edit commit information """edit commit information
...@@ -462,6 +462,7 @@ ...@@ -462,6 +462,7 @@
See :hg:`help phases` for more about draft revisions, and See :hg:`help phases` for more about draft revisions, and
:hg:`help revsets` for more about the `draft()` and `only()` keywords. :hg:`help revsets` for more about the `draft()` and `only()` keywords.
""" """
_resolveoptions(ui, opts)
revs = list(revs) revs = list(revs)
revs.extend(opts['rev']) revs.extend(opts['rev'])
if not revs: if not revs:
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
$ hg diff -r "10" -r "11" --hidden $ hg diff -r "10" -r "11" --hidden
'fold' one commit 'fold' one commit
$ hg metaedit "desc(D2)" --fold --user foobar3 $ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U --config
1 changesets folded 1 changesets folded
$ hg log -r "tip" --template '{rev}: {author}\n' $ hg log -r "tip" --template '{rev}: {author}\n'
13: foobar3 13: foobar3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment