comparison hgext/rebase.py @ 44347:9c9cfecd4600

rebase: don't use rebased node as dirstate p2 (BC)

When rebasing a node, we currently use the rebased node as p2 in the
dirstate until just before we commit it (we then change to the desired
parents). This p2 is visible to the user when the rebase gets
interrupted because of merge conflicts. That can be useful to the user
as a reminder of which commit is currently being rebased, but I
believe it's incorrect for a few reasons:

 * I think the dirstate parents should be the ones that will be set
   when the commit is created.

 * I think having two parents means that you're merging those two
   commits, but when rebasing, you're generally grafting, not merging.

 * When rebasing a merge commit, we should use the two desired parents
   as dirstate parents (and we clearly can't have the rebased node as
   a third dirstate parent).

 * `hg graft` (and `hg update --merge`) sets only one parent and `hg
   rebase` should be consistent with that.

I realize that this is a somewhat large user-visible change, but I
think it's worth it because it will simplify things quite a bit.

Differential Revision: https://phab.mercurial-scm.org/D7827

44346:b42ce825308e

                with ui.configoverride(overrides, b'rebase'):
                    stats = rebasenode(
                        repo,
                        rev,
                        p1,
                        base,
                        self.collapsef,
                        dest,
                        wctx=self.wctx,
                    )

                    editform=editform, **pycompat.strkwargs(opts)
                )
                newnode = self._concludenode(rev, p1, p2, editor)
            else:
                # Skip commit if we are collapsing
                if self.inmemory:
                    self.wctx.setbase(repo[p1])
                else:
                    repo.setparents(repo[p1].node())
                newnode = None
            # Update the state
            if newnode is not None:
                self.state[rev] = repo[newnode].rev()
                ui.debug(b'rebased as %s\n' % short(newnode))

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode


def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
    """Rebase a single revision rev on top of p1 using base as merge ancestor"""
    # Merge phase
    # Update to destination and merge it with local
    p1ctx = repo[p1]
    if wctx.isinmemory():

        ancestor=base,
        mergeancestor=mergeancestor,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    if collapse:
        copies.graftcopies(wctx, ctx, repo[dest])
    else:
        # If we're not using --collapse, we need to
        # duplicate copies between the revision we're

44347:9c9cfecd4600

                with ui.configoverride(overrides, b'rebase'):
                    stats = rebasenode(
                        repo,
                        rev,
                        p1,
                        p2,
                        base,
                        self.collapsef,
                        dest,
                        wctx=self.wctx,
                    )

                    editform=editform, **pycompat.strkwargs(opts)
                )
                newnode = self._concludenode(rev, p1, p2, editor)
            else:
                # Skip commit if we are collapsing
                newnode = None
            # Update the state
            if newnode is not None:
                self.state[rev] = repo[newnode].rev()
                ui.debug(b'rebased as %s\n' % short(newnode))

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode


def rebasenode(repo, rev, p1, p2, base, collapse, dest, wctx):
    """Rebase a single revision rev on top of p1 using base as merge ancestor"""
    # Merge phase
    # Update to destination and merge it with local
    p1ctx = repo[p1]
    if wctx.isinmemory():

        ancestor=base,
        mergeancestor=mergeancestor,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    wctx.setparents(p1ctx.node(), repo[p2].node())
    if collapse:
        copies.graftcopies(wctx, ctx, repo[dest])
    else:
        # If we're not using --collapse, we need to
        # duplicate copies between the revision we're