| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # Mapping between the old revision id and either what is the new rebased | # Mapping between the old revision id and either what is the new rebased | ||||
| # revision or what needs to be done with the old revision. The state | # revision or what needs to be done with the old revision. The state | ||||
| # dict will be what contains most of the rebase progress state. | # dict will be what contains most of the rebase progress state. | ||||
| self.state = {} | self.state = {} | ||||
| self.activebookmark = None | self.activebookmark = None | ||||
| self.destmap = {} | self.destmap = {} | ||||
| self.skipped = set() | self.skipped = set() | ||||
| self.collapsef = opts.get(b'collapse', False) | self.collapsef = opts.get('collapse', False) | ||||
| self.collapsemsg = cmdutil.logmessage(ui, opts) | self.collapsemsg = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) | ||||
| self.date = opts.get(b'date', None) | self.date = opts.get('date', None) | ||||
| e = opts.get(b'extrafn') # internal, used by e.g. hgsubversion | e = opts.get('extrafn') # internal, used by e.g. hgsubversion | ||||
| self.extrafns = [_savegraft] | self.extrafns = [_savegraft] | ||||
| if e: | if e: | ||||
| self.extrafns = [e] | self.extrafns = [e] | ||||
| self.backupf = ui.configbool(b'rewrite', b'backup-bundle') | self.backupf = ui.configbool(b'rewrite', b'backup-bundle') | ||||
| self.keepf = opts.get(b'keep', False) | self.keepf = opts.get('keep', False) | ||||
| self.keepbranchesf = opts.get(b'keepbranches', False) | self.keepbranchesf = opts.get('keepbranches', False) | ||||
| self.skipemptysuccessorf = rewriteutil.skip_empty_successor( | self.skipemptysuccessorf = rewriteutil.skip_empty_successor( | ||||
| repo.ui, b'rebase' | repo.ui, b'rebase' | ||||
| ) | ) | ||||
| self.obsolete_with_successor_in_destination = {} | self.obsolete_with_successor_in_destination = {} | ||||
| self.obsolete_with_successor_in_rebase_set = set() | self.obsolete_with_successor_in_rebase_set = set() | ||||
| self.inmemory = inmemory | self.inmemory = inmemory | ||||
| self.dryrun = dryrun | self.dryrun = dryrun | ||||
| self.stateobj = statemod.cmdstate(repo, b'rebasestate') | self.stateobj = statemod.cmdstate(repo, b'rebasestate') | ||||
| self.state, | self.state, | ||||
| self.skipped, | self.skipped, | ||||
| self.obsolete_with_successor_in_destination, | self.obsolete_with_successor_in_destination, | ||||
| ) | ) | ||||
| if self.resume and self.wctx.p1().rev() == p1: | if self.resume and self.wctx.p1().rev() == p1: | ||||
| repo.ui.debug(b'resuming interrupted rebase\n') | repo.ui.debug(b'resuming interrupted rebase\n') | ||||
| self.resume = False | self.resume = False | ||||
| else: | else: | ||||
| overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} | ||||
| with ui.configoverride(overrides, b'rebase'): | with ui.configoverride(overrides, b'rebase'): | ||||
| try: | try: | ||||
| rebasenode( | rebasenode( | ||||
| repo, | repo, | ||||
| rev, | rev, | ||||
| p1, | p1, | ||||
| p2, | p2, | ||||
| base, | base, | ||||
| p2, | p2, | ||||
| base, | base, | ||||
| self.collapsef, | self.collapsef, | ||||
| wctx=self.wctx, | wctx=self.wctx, | ||||
| ) | ) | ||||
| if not self.collapsef: | if not self.collapsef: | ||||
| merging = p2 != nullrev | merging = p2 != nullrev | ||||
| editform = cmdutil.mergeeditform(merging, b'rebase') | editform = cmdutil.mergeeditform(merging, b'rebase') | ||||
| editor = cmdutil.getcommiteditor( | editor = cmdutil.getcommiteditor(editform=editform, **opts) | ||||
| editform=editform, **pycompat.strkwargs(opts) | |||||
| ) | |||||
| # We need to set parents again here just in case we're continuing | # We need to set parents again here just in case we're continuing | ||||
| # a rebase started with an old hg version (before 9c9cfecd4600), | # a rebase started with an old hg version (before 9c9cfecd4600), | ||||
| # because those old versions would have left us with two dirstate | # because those old versions would have left us with two dirstate | ||||
| # parents, and we don't want to create a merge commit here (unless | # parents, and we don't want to create a merge commit here (unless | ||||
| # we're rebasing a merge commit). | # we're rebasing a merge commit). | ||||
| self.wctx.setparents(repo[p1].node(), repo[p2].node()) | self.wctx.setparents(repo[p1].node(), repo[p2].node()) | ||||
| newnode = self._concludenode(rev, editor) | newnode = self._concludenode(rev, editor) | ||||
| else: | else: | ||||
| # When not using single transaction, store state after each | # When not using single transaction, store state after each | ||||
| # commit is completely done. On InterventionRequired, we thus | # commit is completely done. On InterventionRequired, we thus | ||||
| # won't store the status. Instead, we'll hit the "len(parents) == 2" | # won't store the status. Instead, we'll hit the "len(parents) == 2" | ||||
| # case and realize that the commit was in progress. | # case and realize that the commit was in progress. | ||||
| self.storestatus() | self.storestatus() | ||||
| def _finishrebase(self): | def _finishrebase(self): | ||||
| repo, ui, opts = self.repo, self.ui, self.opts | repo, ui, opts = self.repo, self.ui, self.opts | ||||
| fm = ui.formatter(b'rebase', opts) | fm = ui.formatter(b'rebase', pycompat.byteskwargs(opts)) | ||||
| fm.startitem() | fm.startitem() | ||||
| if self.collapsef: | if self.collapsef: | ||||
| p1, p2, _base = defineparents( | p1, p2, _base = defineparents( | ||||
| repo, | repo, | ||||
| min(self.state), | min(self.state), | ||||
| self.destmap, | self.destmap, | ||||
| self.state, | self.state, | ||||
| self.skipped, | self.skipped, | ||||
| self.obsolete_with_successor_in_destination, | self.obsolete_with_successor_in_destination, | ||||
| ) | ) | ||||
| editopt = opts.get(b'edit') | editopt = opts.get('edit') | ||||
| editform = b'rebase.collapse' | editform = b'rebase.collapse' | ||||
| if self.collapsemsg: | if self.collapsemsg: | ||||
| commitmsg = self.collapsemsg | commitmsg = self.collapsemsg | ||||
| else: | else: | ||||
| commitmsg = b'Collapsed revision' | commitmsg = b'Collapsed revision' | ||||
| for rebased in sorted(self.state): | for rebased in sorted(self.state): | ||||
| if rebased not in self.skipped: | if rebased not in self.skipped: | ||||
| commitmsg += b'\n* %s' % repo[rebased].description() | commitmsg += b'\n* %s' % repo[rebased].description() | ||||
| editopt = True | editopt = True | ||||
| editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
| revtoreuse = max(self.state) | revtoreuse = max(self.state) | ||||
| self.wctx.setparents(repo[p1].node(), repo[self.external].node()) | self.wctx.setparents(repo[p1].node(), repo[self.external].node()) | ||||
| newnode = self._concludenode( | newnode = self._concludenode( | ||||
| revtoreuse, editor, commitmsg=commitmsg | revtoreuse, editor, commitmsg=commitmsg | ||||
| ) | ) | ||||
| if newnode is not None: | if newnode is not None: | ||||
| newrev = repo[newnode].rev() | newrev = repo[newnode].rev() | ||||
| for oldrev in self.state: | for oldrev in self.state: | ||||
| self.state[oldrev] = newrev | self.state[oldrev] = newrev | ||||
| if b'qtip' in repo.tags(): | if b'qtip' in repo.tags(): | ||||
| updatemq(repo, self.state, self.skipped, **pycompat.strkwargs(opts)) | updatemq(repo, self.state, self.skipped, **opts) | ||||
| # restore original working directory | # restore original working directory | ||||
| # (we do this before stripping) | # (we do this before stripping) | ||||
| newwd = self.state.get(self.originalwd, self.originalwd) | newwd = self.state.get(self.originalwd, self.originalwd) | ||||
| if newwd < 0: | if newwd < 0: | ||||
| # original directory is a parent of rebase set root or ignored | # original directory is a parent of rebase set root or ignored | ||||
| newwd = self.originalwd | newwd = self.originalwd | ||||
| if newwd not in [c.rev() for c in repo[None].parents()]: | if newwd not in [c.rev() for c in repo[None].parents()]: | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, 'auto_orphans', disallowed_opts | opts, 'auto_orphans', disallowed_opts | ||||
| ) | ) | ||||
| userrevs = list(repo.revs(opts.get('auto_orphans'))) | userrevs = list(repo.revs(opts.get('auto_orphans'))) | ||||
| opts['rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | opts['rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | ||||
| opts['dest'] = b'_destautoorphanrebase(SRC)' | opts['dest'] = b'_destautoorphanrebase(SRC)' | ||||
| opts = pycompat.byteskwargs(opts) | if opts.get('dry_run') or opts.get('confirm'): | ||||
| if opts.get(b'dry_run') or opts.get(b'confirm'): | |||||
| return _dryrunrebase(ui, repo, action, opts) | return _dryrunrebase(ui, repo, action, opts) | ||||
| elif action == 'stop': | elif action == 'stop': | ||||
| rbsrt = rebaseruntime(repo, ui) | rbsrt = rebaseruntime(repo, ui) | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| rbsrt.restorestatus() | rbsrt.restorestatus() | ||||
| if rbsrt.collapsef: | if rbsrt.collapsef: | ||||
| raise error.StateError(_(b"cannot stop in --collapse session")) | raise error.StateError(_(b"cannot stop in --collapse session")) | ||||
| allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | ||||
| clearcollapsemsg(repo) | clearcollapsemsg(repo) | ||||
| return _dorebase(ui, repo, action, opts, inmemory=False) | return _dorebase(ui, repo, action, opts, inmemory=False) | ||||
| else: | else: | ||||
| return _dorebase(ui, repo, action, opts) | return _dorebase(ui, repo, action, opts) | ||||
| def _dryrunrebase(ui, repo, action, opts): | def _dryrunrebase(ui, repo, action, opts): | ||||
| rbsrt = rebaseruntime(repo, ui, inmemory=True, dryrun=True, opts=opts) | rbsrt = rebaseruntime(repo, ui, inmemory=True, dryrun=True, opts=opts) | ||||
| confirm = opts.get(b'confirm') | confirm = opts.get('confirm') | ||||
| if confirm: | if confirm: | ||||
| ui.status(_(b'starting in-memory rebase\n')) | ui.status(_(b'starting in-memory rebase\n')) | ||||
| else: | else: | ||||
| ui.status( | ui.status( | ||||
| _(b'starting dry-run rebase; repository will not be changed\n') | _(b'starting dry-run rebase; repository will not be changed\n') | ||||
| ) | ) | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| needsabort = True | needsabort = True | ||||
| return 0 | return 0 | ||||
| finally: | finally: | ||||
| if needsabort: | if needsabort: | ||||
| # no need to store backup in case of dryrun | # no need to store backup in case of dryrun | ||||
| rbsrt._prepareabortorcontinue( | rbsrt._prepareabortorcontinue( | ||||
| isabort=True, | isabort=True, | ||||
| backup=False, | backup=False, | ||||
| suppwarns=True, | suppwarns=True, | ||||
| dryrun=opts.get(b'dry_run'), | dryrun=opts.get('dry_run'), | ||||
| ) | ) | ||||
| def _dorebase(ui, repo, action, opts, inmemory=False): | def _dorebase(ui, repo, action, opts, inmemory=False): | ||||
| rbsrt = rebaseruntime(repo, ui, inmemory, opts=opts) | rbsrt = rebaseruntime(repo, ui, inmemory, opts=opts) | ||||
| return _origrebase(ui, repo, action, opts, rbsrt) | return _origrebase(ui, repo, action, opts, rbsrt) | ||||
| def _origrebase(ui, repo, action, opts, rbsrt): | def _origrebase(ui, repo, action, opts, rbsrt): | ||||
| assert action != 'stop' | assert action != 'stop' | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| if opts.get(b'interactive'): | if opts.get('interactive'): | ||||
| try: | try: | ||||
| if extensions.find(b'histedit'): | if extensions.find(b'histedit'): | ||||
| enablehistedit = b'' | enablehistedit = b'' | ||||
| except KeyError: | except KeyError: | ||||
| enablehistedit = b" --config extensions.histedit=" | enablehistedit = b" --config extensions.histedit=" | ||||
| help = b"hg%s help -e histedit" % enablehistedit | help = b"hg%s help -e histedit" % enablehistedit | ||||
| msg = ( | msg = ( | ||||
| _( | _( | ||||
| _(b'message can only be specified with collapse') | _(b'message can only be specified with collapse') | ||||
| ) | ) | ||||
| if action: | if action: | ||||
| if rbsrt.collapsef: | if rbsrt.collapsef: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b'cannot use collapse with continue or abort') | _(b'cannot use collapse with continue or abort') | ||||
| ) | ) | ||||
| if action == 'abort' and opts.get(b'tool', False): | if action == 'abort' and opts.get('tool', False): | ||||
| ui.warn(_(b'tool option will be ignored\n')) | ui.warn(_(b'tool option will be ignored\n')) | ||||
| if action == 'continue': | if action == 'continue': | ||||
| ms = mergestatemod.mergestate.read(repo) | ms = mergestatemod.mergestate.read(repo) | ||||
| mergeutil.checkunresolved(ms) | mergeutil.checkunresolved(ms) | ||||
| retcode = rbsrt._prepareabortorcontinue(isabort=(action == 'abort')) | retcode = rbsrt._prepareabortorcontinue(isabort=(action == 'abort')) | ||||
| if retcode is not None: | if retcode is not None: | ||||
| return retcode | return retcode | ||||
| else: | else: | ||||
| # search default destination in this space | # search default destination in this space | ||||
| # used in the 'hg pull --rebase' case, see issue 5214. | # used in the 'hg pull --rebase' case, see issue 5214. | ||||
| destspace = opts.get(b'_destspace') | destspace = opts.get('_destspace') | ||||
| destmap = _definedestmap( | destmap = _definedestmap( | ||||
| ui, | ui, | ||||
| repo, | repo, | ||||
| rbsrt.inmemory, | rbsrt.inmemory, | ||||
| opts.get(b'dest', None), | opts.get('dest', None), | ||||
| opts.get(b'source', []), | opts.get('source', []), | ||||
| opts.get(b'base', []), | opts.get('base', []), | ||||
| opts.get(b'rev', []), | opts.get('rev', []), | ||||
| destspace=destspace, | 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 | ||||