--- a/hgext/rebase.py Tue Jun 27 17:39:55 2017 +0200
+++ b/hgext/rebase.py Tue Jun 27 17:40:24 2017 +0200
@@ -343,7 +343,7 @@
if dest.closesbranch() and not self.keepbranchesf:
self.ui.status(_('reopening closed branch head %s\n') % dest)
- def _performrebase(self, tr):
+ def _performrebase(self):
repo, ui, opts = self.repo, self.ui, self.opts
if self.keepbranchesf:
# insert _savebranch at the start of extrafns so if
@@ -393,7 +393,7 @@
self.state,
self.targetancestors,
self.obsoletenotrebased)
- self.storestatus(tr=tr)
+ self.storestatus()
storecollapsemsg(repo, self.collapsemsg)
if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n')
@@ -721,12 +721,7 @@
if retcode is not None:
return retcode
- with repo.transaction('rebase') as tr:
- try:
- rbsrt._performrebase(tr)
- except error.InterventionRequired:
- tr.close()
- raise
+ rbsrt._performrebase()
rbsrt._finishrebase()
finally:
release(lock, wlock)