equal
deleted
inserted
replaced
1137 with repo.wlock(), repo.lock(): |
1137 with repo.wlock(), repo.lock(): |
1138 needsabort = True |
1138 needsabort = True |
1139 try: |
1139 try: |
1140 overrides = {(b'rebase', b'singletransaction'): True} |
1140 overrides = {(b'rebase', b'singletransaction'): True} |
1141 with ui.configoverride(overrides, b'rebase'): |
1141 with ui.configoverride(overrides, b'rebase'): |
1142 _origrebase( |
1142 res = _origrebase( |
1143 ui, |
1143 ui, |
1144 repo, |
1144 repo, |
1145 action, |
1145 action, |
1146 opts, |
1146 opts, |
1147 rbsrt, |
1147 rbsrt, |
1148 ) |
1148 ) |
|
1149 if res == _nothingtorebase(): |
|
1150 needsabort = False |
|
1151 return res |
1149 except error.ConflictResolutionRequired: |
1152 except error.ConflictResolutionRequired: |
1150 ui.status(_(b'hit a merge conflict\n')) |
1153 ui.status(_(b'hit a merge conflict\n')) |
1151 return 1 |
1154 return 1 |
1152 except error.Abort: |
1155 except error.Abort: |
1153 needsabort = False |
1156 needsabort = False |