Show More
@@ -1163,14 +1163,6 def _origrebase( | |||||
1163 | ): |
|
1163 | ): | |
1164 | assert action != b'stop' |
|
1164 | assert action != b'stop' | |
1165 | with repo.wlock(), repo.lock(): |
|
1165 | with repo.wlock(), repo.lock(): | |
1166 | # Validate input and define rebasing points |
|
|||
1167 | destf = opts.get(b'dest', None) |
|
|||
1168 | srcf = opts.get(b'source', None) |
|
|||
1169 | basef = opts.get(b'base', None) |
|
|||
1170 | revf = opts.get(b'rev', []) |
|
|||
1171 | # search default destination in this space |
|
|||
1172 | # used in the 'hg pull --rebase' case, see issue 5214. |
|
|||
1173 | destspace = opts.get(b'_destspace') |
|
|||
1174 | if opts.get(b'interactive'): |
|
1166 | if opts.get(b'interactive'): | |
1175 | try: |
|
1167 | try: | |
1176 | if extensions.find(b'histedit'): |
|
1168 | if extensions.find(b'histedit'): | |
@@ -1207,14 +1199,17 def _origrebase( | |||||
1207 | if retcode is not None: |
|
1199 | if retcode is not None: | |
1208 | return retcode |
|
1200 | return retcode | |
1209 | else: |
|
1201 | else: | |
|
1202 | # search default destination in this space | |||
|
1203 | # used in the 'hg pull --rebase' case, see issue 5214. | |||
|
1204 | destspace = opts.get(b'_destspace') | |||
1210 | destmap = _definedestmap( |
|
1205 | destmap = _definedestmap( | |
1211 | ui, |
|
1206 | ui, | |
1212 | repo, |
|
1207 | repo, | |
1213 | inmemory, |
|
1208 | inmemory, | |
1214 |
|
|
1209 | opts.get(b'dest', None), | |
1215 |
|
|
1210 | opts.get(b'source', None), | |
1216 |
|
|
1211 | opts.get(b'base', None), | |
1217 |
|
|
1212 | opts.get(b'rev', []), | |
1218 | destspace=destspace, |
|
1213 | destspace=destspace, | |
1219 | ) |
|
1214 | ) | |
1220 | retcode = rbsrt._preparenewrebase(destmap) |
|
1215 | retcode = rbsrt._preparenewrebase(destmap) |
General Comments 0
You need to be logged in to leave comments.
Login now