diff -r ff1ff2aae132 -r 66048f6b5d0d hgext/uncommit.py --- 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]