| yuja |
| hg-reviewers |
We no longer reassign rbsrt.inmemory in _definedestmap(), so we don't
need to pass the whole rebase runtime instance anymore, thus
making it clear that it won't be updated.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| if contf: | if contf: | ||||
| ms = mergemod.mergestate.read(repo) | ms = mergemod.mergestate.read(repo) | ||||
| mergeutil.checkunresolved(ms) | mergeutil.checkunresolved(ms) | ||||
| retcode = rbsrt._prepareabortorcontinue(abortf) | retcode = rbsrt._prepareabortorcontinue(abortf) | ||||
| if retcode is not None: | if retcode is not None: | ||||
| return retcode | return retcode | ||||
| else: | else: | ||||
| destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf, | destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef, | ||||
| destspace=destspace) | revf, destspace=destspace) | ||||
| retcode = rbsrt._preparenewrebase(destmap) | retcode = rbsrt._preparenewrebase(destmap) | ||||
| if retcode is not None: | if retcode is not None: | ||||
| return retcode | return retcode | ||||
| storecollapsemsg(repo, rbsrt.collapsemsg) | storecollapsemsg(repo, rbsrt.collapsemsg) | ||||
| tr = None | tr = None | ||||
| singletr = ui.configbool('rebase', 'singletransaction') | singletr = ui.configbool('rebase', 'singletransaction') | ||||
| if singletr: | if singletr: | ||||
| tr = repo.transaction('rebase') | tr = repo.transaction('rebase') | ||||
| # If `rebase.singletransaction` is enabled, wrap the entire operation in | # If `rebase.singletransaction` is enabled, wrap the entire operation in | ||||
| # one transaction here. Otherwise, transactions are obtained when | # one transaction here. Otherwise, transactions are obtained when | ||||
| # committing each node, which is slower but allows partial success. | # committing each node, which is slower but allows partial success. | ||||
| with util.acceptintervention(tr): | with util.acceptintervention(tr): | ||||
| # Same logic for the dirstate guard, except we don't create one when | # Same logic for the dirstate guard, except we don't create one when | ||||
| # rebasing in-memory (it's not needed). | # rebasing in-memory (it's not needed). | ||||
| dsguard = None | dsguard = None | ||||
| if singletr and not inmemory: | if singletr and not inmemory: | ||||
| dsguard = dirstateguard.dirstateguard(repo, 'rebase') | dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
| with util.acceptintervention(dsguard): | with util.acceptintervention(dsguard): | ||||
| rbsrt._performrebase(tr) | rbsrt._performrebase(tr) | ||||
| rbsrt._finishrebase() | rbsrt._finishrebase() | ||||
| def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, | def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None, | ||||
| revf=None, destspace=None): | revf=None, destspace=None): | ||||
| """use revisions argument to define destmap {srcrev: destrev}""" | """use revisions argument to define destmap {srcrev: destrev}""" | ||||
| if revf is None: | if revf is None: | ||||
| revf = [] | revf = [] | ||||
| # destspace is here to work around issues with `hg pull --rebase` see | # destspace is here to work around issues with `hg pull --rebase` see | ||||
| # issue5214 for details | # issue5214 for details | ||||
| if srcf and basef: | if srcf and basef: | ||||
| raise error.Abort(_('cannot specify both a source and a base')) | raise error.Abort(_('cannot specify both a source and a base')) | ||||
| if revf and basef: | if revf and basef: | ||||
| raise error.Abort(_('cannot specify both a revision and a base')) | raise error.Abort(_('cannot specify both a revision and a base')) | ||||
| if revf and srcf: | if revf and srcf: | ||||
| raise error.Abort(_('cannot specify both a revision and a source')) | raise error.Abort(_('cannot specify both a revision and a source')) | ||||
| if not rbsrt.inmemory: | if not inmemory: | ||||
| cmdutil.checkunfinished(repo) | cmdutil.checkunfinished(repo) | ||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| if ui.configbool('commands', 'rebase.requiredest') and not destf: | if ui.configbool('commands', 'rebase.requiredest') and not destf: | ||||
| raise error.Abort(_('you must specify a destination'), | raise error.Abort(_('you must specify a destination'), | ||||
| hint=_('use: hg rebase -d REV')) | hint=_('use: hg rebase -d REV')) | ||||
| dest = None | dest = None | ||||
| 'ancestor of destination %s\n') % dest) | 'ancestor of destination %s\n') % dest) | ||||
| else: # can it happen? | else: # can it happen? | ||||
| ui.status(_('nothing to rebase from %s to %s\n') % | ui.status(_('nothing to rebase from %s to %s\n') % | ||||
| ('+'.join(bytes(repo[r]) for r in base), dest)) | ('+'.join(bytes(repo[r]) for r in base), dest)) | ||||
| return None | return None | ||||
| rebasingwcp = repo['.'].rev() in rebaseset | rebasingwcp = repo['.'].rev() in rebaseset | ||||
| ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) | ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) | ||||
| if rbsrt.inmemory and rebasingwcp: | if inmemory and rebasingwcp: | ||||
| # Check these since we did not before. | # Check these since we did not before. | ||||
| cmdutil.checkunfinished(repo) | cmdutil.checkunfinished(repo) | ||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| if not destf: | if not destf: | ||||
| dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | ||||
| destf = bytes(dest) | destf = bytes(dest) | ||||