# HG changeset patch # User Pierre-Yves David # Date 1676331101 -3600 # Node ID 6526c2fb777c2c29e31d689de56bf5eaee1cb0e3 # Parent 64b3cc021833b72ca0759d7fbed111768820cd81 dirstate-guard: remove usage in `rebase` Now that the dirstate change and write are clearer, it does not seems we need to use a dirstate-guard here anymore. The transaction already wrap the full operation. diff -r 64b3cc021833 -r 6526c2fb777c hgext/rebase.py --- a/hgext/rebase.py Tue Feb 14 00:31:23 2023 +0100 +++ b/hgext/rebase.py Tue Feb 14 00:31:41 2023 +0100 @@ -1271,15 +1271,9 @@ # one transaction here. Otherwise, transactions are obtained when # committing each node, which is slower but allows partial success. with util.acceptintervention(tr): - # Same logic for the dirstate guard, except we don't create one when - # rebasing in-memory (it's not needed). - dsguard = None - if singletr and not rbsrt.inmemory: - dsguard = dirstateguard.dirstateguard(repo, b'rebase') - with util.acceptintervention(dsguard): - rbsrt._performrebase(tr) - if not rbsrt.dryrun: - rbsrt._finishrebase() + rbsrt._performrebase(tr) + if not rbsrt.dryrun: + rbsrt._finishrebase() def _definedestmap(ui, repo, inmemory, destf, srcf, basef, revf, destspace):