Mercurial > public > mercurial-scm > hg
diff hgext/uncommit.py @ 42903:66048f6b5d0d
uncommit: add options to update to the current user or current date
These are also from the evolve extension's version of uncommit.
I tried adding validation that both forms of user or date can't be specified at
the same time, but that fails because these show up in `opts` with a None value
whether or not the option was given on the command line. Presumably that means
the conditional in `resolvecommitoptions` could be simplified. But this is how
both evolve and MQ handle it.
Differential Revision: https://phab.mercurial-scm.org/D6828
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 07 Sep 2019 23:20:11 -0400 |
| parents | ff1ff2aae132 |
| children | 2da754532dd3 |
line wrap: on
line diff
--- a/hgext/uncommit.py Sat Sep 07 13:44:29 2019 -0400 +++ b/hgext/uncommit.py Sat Sep 07 23:20:11 2019 -0400 @@ -112,7 +112,8 @@ [('', 'keep', None, _('allow an empty commit after uncommiting')), ('', 'allow-dirty-working-copy', False, _('allow uncommit with outstanding changes')) - ] + commands.walkopts + commands.commitopts + commands.commitopts2, + ] + commands.walkopts + commands.commitopts + commands.commitopts2 + + commands.commitopts3, _('[OPTION]... [FILE]...'), helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) def uncommit(ui, repo, *pats, **opts): @@ -128,6 +129,8 @@ """ opts = pycompat.byteskwargs(opts) + cmdutil.resolvecommitoptions(ui, opts) + with repo.wlock(), repo.lock(): m, a, r, d = repo.status()[:4]