Mercurial > evolve
changeset 4707:ea84a151fa62
touch: let's not use util.acceptintervention() as it's not required
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 14 Jun 2019 22:46:58 +0530 |
parents | de194ed973ba |
children | cc3569da7150 |
files | hgext3rd/evolve/cmdrewrite.py |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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']