##// END OF EJS Templates
dirstate-guard: remove usage in `rebase`...
marmoute -
r50957:6526c2fb default
parent child Browse files
Show More
@@ -1271,12 +1271,6 b' def _origrebase(ui, repo, action, opts, '
1271 # one transaction here. Otherwise, transactions are obtained when
1271 # one transaction here. Otherwise, transactions are obtained when
1272 # committing each node, which is slower but allows partial success.
1272 # committing each node, which is slower but allows partial success.
1273 with util.acceptintervention(tr):
1273 with util.acceptintervention(tr):
1274 # Same logic for the dirstate guard, except we don't create one when
1275 # rebasing in-memory (it's not needed).
1276 dsguard = None
1277 if singletr and not rbsrt.inmemory:
1278 dsguard = dirstateguard.dirstateguard(repo, b'rebase')
1279 with util.acceptintervention(dsguard):
1280 rbsrt._performrebase(tr)
1274 rbsrt._performrebase(tr)
1281 if not rbsrt.dryrun:
1275 if not rbsrt.dryrun:
1282 rbsrt._finishrebase()
1276 rbsrt._finishrebase()
General Comments 0
You need to be logged in to leave comments. Login now