Show More
@@ -565,7 +565,6 b' class rebaseruntime(object):' | |||
|
565 | 565 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |
|
566 | 566 | revtoreuse = max(self.state) |
|
567 | 567 | |
|
568 | dsguard = None | |
|
569 | 568 | if self.inmemory: |
|
570 | 569 | newnode = concludememorynode(repo, revtoreuse, p1, |
|
571 | 570 | self.external, |
@@ -575,6 +574,7 b' class rebaseruntime(object):' | |||
|
575 | 574 | keepbranches=self.keepbranchesf, |
|
576 | 575 | date=self.date, wctx=self.wctx) |
|
577 | 576 | else: |
|
577 | dsguard = None | |
|
578 | 578 | if ui.configbool('rebase', 'singletransaction'): |
|
579 | 579 | dsguard = dirstateguard.dirstateguard(repo, 'rebase') |
|
580 | 580 | with util.acceptintervention(dsguard): |
@@ -849,7 +849,6 b' def _origrebase(ui, repo, inmemory=False' | |||
|
849 | 849 | return retcode |
|
850 | 850 | |
|
851 | 851 | tr = None |
|
852 | dsguard = None | |
|
853 | 852 | |
|
854 | 853 | singletr = ui.configbool('rebase', 'singletransaction') |
|
855 | 854 | if singletr: |
@@ -861,6 +860,7 b' def _origrebase(ui, repo, inmemory=False' | |||
|
861 | 860 | with util.acceptintervention(tr): |
|
862 | 861 | # Same logic for the dirstate guard, except we don't create one when |
|
863 | 862 | # rebasing in-memory (it's not needed). |
|
863 | dsguard = None | |
|
864 | 864 | if singletr and not inmemory: |
|
865 | 865 | dsguard = dirstateguard.dirstateguard(repo, 'rebase') |
|
866 | 866 | with util.acceptintervention(dsguard): |
General Comments 0
You need to be logged in to leave comments.
Login now