rebase: fix IMM restarting on general exceptions

Summary: It didn't properly turn off IMM after D6817683, but ran the rebase with IMM again.

Reviewed By: singhsrb

Differential Revision: D7072951

fbshipit-source-id: 9f9386fbd5748ff002de2c60132d5d5708380714
This commit is contained in:
Phil Cohen 2018-02-25 22:54:23 -08:00 committed by Saurabh Singh
parent 57b60abde8
commit 65b96951f2

View File

@ -860,6 +860,7 @@ def rebase(ui, repo, **opts):
'(%s)\n' % e))
ui.log("rebase", "", rebase_imm_restart=True,
rebase_imm_exception=str(e))
rbsrt.inmemory = False
_origrebase(ui, repo, rbsrt, **{'abort': True})
return _origrebase(ui, repo, rbsrt, **opts)
else: