| pulkit |
| hg-reviewers |
Unused since a0192a03216d (rebase: remove now unnecessary logic to
allow empty commit when branch changes, 2020-07-09).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| self.obsoletewithoutsuccessorindestination, | self.obsoletewithoutsuccessorindestination, | ||||
| self.obsoletewithoutsuccessorindestination, | self.obsoletewithoutsuccessorindestination, | ||||
| ) | ) | ||||
| for rev in sortedrevs: | for rev in sortedrevs: | ||||
| self._rebasenode(tr, rev, allowdivergence, progress) | self._rebasenode(tr, rev, allowdivergence, progress) | ||||
| p.complete() | p.complete() | ||||
| ui.note(_(b'rebase merging completed\n')) | ui.note(_(b'rebase merging completed\n')) | ||||
| def _concludenode(self, rev, p1, editor, commitmsg=None): | def _concludenode(self, rev, editor, commitmsg=None): | ||||
| '''Commit the wd changes with parents p1 and p2. | '''Commit the wd changes with parents p1 and p2. | ||||
| Reuse commit info from rev but also store useful information in extra. | Reuse commit info from rev but also store useful information in extra. | ||||
| Return node of committed revision.''' | Return node of committed revision.''' | ||||
| repo = self.repo | repo = self.repo | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| if commitmsg is None: | if commitmsg is None: | ||||
| commitmsg = ctx.description() | commitmsg = ctx.description() | ||||
| editform=editform, **pycompat.strkwargs(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, p1, editor) | newnode = self._concludenode(rev, editor) | ||||
| else: | else: | ||||
| # Skip commit if we are collapsing | # Skip commit if we are collapsing | ||||
| newnode = None | newnode = None | ||||
| # Update the state | # Update the state | ||||
| if newnode is not None: | if newnode is not None: | ||||
| self.state[rev] = repo[newnode].rev() | self.state[rev] = repo[newnode].rev() | ||||
| ui.debug(b'rebased as %s\n' % short(newnode)) | ui.debug(b'rebased as %s\n' % short(newnode)) | ||||
| if repo[newnode].isempty(): | if repo[newnode].isempty(): | ||||
| 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, p1, 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(): | ||||