--- a/hgext3rd/evolve/__init__.py Thu Mar 22 00:56:48 2018 +0100
+++ b/hgext3rd/evolve/__init__.py Thu Mar 15 00:09:24 2018 +0530
@@ -1266,33 +1266,6 @@
kwargs['biject'] = False
return cmdrewrite.cmdprune(ui, repo, *revs, **kwargs)
-@eh.wrapcommand('graft')
-def graftwrapper(orig, ui, repo, *revs, **kwargs):
- kwargs = dict(kwargs)
- revs = list(revs) + kwargs.get('rev', [])
- kwargs['rev'] = []
- obsoleted = kwargs.setdefault('obsolete', [])
-
- wlock = lock = None
- try:
- wlock = repo.wlock()
- lock = repo.lock()
- if kwargs.get('old_obsolete'):
- if kwargs.get('continue'):
- obsoleted.extend(repo.vfs.read('graftstate').splitlines())
- else:
- obsoleted.extend(revs)
- # convert obsolete target into revs to avoid alias joke
- obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)]
- if obsoleted and len(revs) > 1:
-
- raise error.Abort(_('cannot graft multiple revisions while '
- 'obsoleting (for now).'))
-
- return commitwrapper(orig, ui, repo, *revs, **kwargs)
- finally:
- lockmod.release(lock, wlock)
-
@eh.extsetup
def oldevolveextsetup(ui):
for cmd in ['prune', 'uncommit', 'touch', 'fold']:
@@ -1306,11 +1279,6 @@
entry = cmdutil.findcmd('commit', commands.table)[1]
entry[1].append(('o', 'obsolete', [],
_("make commit obsolete this revision (DEPRECATED)")))
- entry = cmdutil.findcmd('graft', commands.table)[1]
- entry[1].append(('o', 'obsolete', [],
- _("make graft obsoletes this revision (DEPRECATED)")))
- entry[1].append(('O', 'old-obsolete', False,
- _("make graft obsoletes its source (DEPRECATED)")))
@eh.wrapfunction(obsolete, '_checkinvalidmarkers')
def _checkinvalidmarkers(orig, markers):