# HG changeset patch # User Sushil khanchi # Date 1560532618 -19800 # Node ID ea84a151fa62129d032a7650280e9f1ffbfea599 # Parent de194ed973ba756692c209c2d3dda49f90f55c63 touch: let's not use util.acceptintervention() as it's not required diff -r de194ed973ba -r ea84a151fa62 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Thu Jul 04 16:55:57 2019 +0200 +++ b/hgext3rd/evolve/cmdrewrite.py Fri Jun 14 22:46:58 2019 +0530 @@ -1355,10 +1355,8 @@ rewriteutil.precheck(repo, revs, 'touch') tmpl = utility.shorttemplate displayer = compat.changesetdisplayer(ui, repo, {'template': tmpl}) - with repo.wlock(), repo.lock(): - tr = repo.transaction('touch') - with util.acceptintervention(tr): - touchnodes(ui, repo, revs, displayer, **opts) + with repo.wlock(), repo.lock(), repo.transaction('touch'): + touchnodes(ui, repo, revs, displayer, **opts) def touchnodes(ui, repo, revs, displayer, **opts): duplicate = opts['duplicate']