--- a/hgext/uncommit.py Wed Oct 10 12:25:28 2018 -0400
+++ b/hgext/uncommit.py Mon Oct 22 14:46:06 2018 -0400
@@ -138,7 +138,8 @@
@command('uncommit',
[('', 'keep', False, _('allow an empty commit after uncommiting')),
] + commands.walkopts,
- _('[OPTION]... [FILE]...'))
+ _('[OPTION]... [FILE]...'),
+ helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def uncommit(ui, repo, *pats, **opts):
"""uncommit part or all of a local changeset
@@ -182,7 +183,7 @@
with repo.dirstate.parentchange():
repo.dirstate.setparents(newid, node.nullid)
- s = repo.status(old.p1(), old, match=match)
+ s = old.p1().status(old, match=match)
_fixdirstate(repo, old, repo[newid], s)
def predecessormarkers(ctx):
@@ -190,7 +191,8 @@
for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
yield obsutil.marker(ctx.repo(), data)
-@command('^unamend', [])
+@command('unamend', [], helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
+ helpbasic=True)
def unamend(ui, repo, **opts):
"""undo the most recent amend operation on a current changeset