comparison hgext/rebase.py @ 13733:4e2690a764c1

rebase: allow for rebasing descendants onto ancestors on different named branches

So far we've been denying rebasing descendants onto ancestors, but there are
situations in which this kind of operation makes perfect sense to me.

Let's say we have made a commit (or more), that belongs to branch 'dev', on
top of the named branch 'stable':

... a (stable) - b (dev)

but then we realize that b should belong to branch 'stable'.
In these cases a rebase means: "move these csets from named branch A to named
branch B" and there isn't a valid reason to deny it.

This patch basically doesn't block it, if source and destination are
on different named branches.
The old behaviour still applies for rebases across the same named branch.

Can you think of any tricky corner cases in which this new behaviour could
lead to problems? (I bet there are tons of them...)

By the way, I created a brand new .t because I feel there should be more
tests I can't think of at the moment.

13732:afe9269dccec

                            [s.node for s in repo.mq.applied]):
        raise util.Abort(_('cannot rebase onto an applied mq patch'))

    if src:
        commonbase = repo[src].ancestor(repo[dest])
        if commonbase == repo[src]:
            raise util.Abort(_('source is ancestor of destination'))
        if commonbase == repo[dest]:
            raise util.Abort(_('source is descendant of destination'))
        source = repo[src].rev()
        if detach:
            # We need to keep track of source's ancestors up to the common base
            srcancestors = set(repo.changelog.ancestors(source))

13733:4e2690a764c1

                            [s.node for s in repo.mq.applied]):
        raise util.Abort(_('cannot rebase onto an applied mq patch'))

    if src:
        commonbase = repo[src].ancestor(repo[dest])
        samebranch = repo[src].branch() == repo[dest].branch()
        if commonbase == repo[src]:
            raise util.Abort(_('source is ancestor of destination'))
        if samebranch and commonbase == repo[dest]:
            raise util.Abort(_('source is descendant of destination'))
        source = repo[src].rev()
        if detach:
            # We need to keep track of source's ancestors up to the common base
            srcancestors = set(repo.changelog.ancestors(source))