comparison hgext/rebase.py @ 34354:2f427b57bf90 stable 4.3.3

rebase: move bookmarks with --keep (issue5682)

This is a regression caused by 3b7cb3d17137. We have documented the behavior
in rebase help:

    Rebase will destroy original commits unless you use "--keep". It will
    also move your bookmarks (even if you do).

So let's restore the old behavior.

It is done by changing `scmutil.cleanupnodes` to accept more information so
a node could have different "movement destination" from "successors". It
also helps simplifying the callsite as a side effect - the special bookmark
movement logic in rebase is removed.

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

34353:2dbd6d259cd2

            newwd = self.originalwd
        if newwd not in [c.rev() for c in repo[None].parents()]:
            ui.note(_("update back to initial working directory parent\n"))
            hg.updaterepo(repo, newwd, False)

        if not self.keepf:
            collapsedas = None
            if self.collapsef:
                collapsedas = newnode
            clearrebased(ui, repo, self.dest, self.state, self.skipped,
                         collapsedas)

        clearstatus(repo)
        clearcollapsemsg(repo)

        ui.note(_("rebase completed\n"))

            state[r] = revpruned
        else:
            state[r] = revprecursor
    return originalwd, dest.rev(), state

def clearrebased(ui, repo, dest, state, skipped, collapsedas=None):
    """dispose of rebased revision at the end of the rebase

    If `collapsedas` is not None, the rebase was a collapse whose result if the
    `collapsedas` node."""
    tonode = repo.changelog.node
    # Move bookmark of skipped nodes to destination. This cannot be handled
    # by scmutil.cleanupnodes since it will treat rev as removed (no successor)
    # and move bookmark backwards.
    bmchanges = [(name, tonode(max(adjustdest(repo, rev, dest, state))))
                 for rev in skipped
                 for name in repo.nodebookmarks(tonode(rev))]
    if bmchanges:
        with repo.transaction('rebase') as tr:
            repo._bookmarks.applychanges(repo, tr, bmchanges)
    mapping = {}
    for rev, newrev in sorted(state.items()):
        if newrev >= 0 and newrev != rev:
            if rev in skipped:
                succs = ()
            elif collapsedas is not None:
                succs = (collapsedas,)
            else:
                succs = (tonode(newrev),)
            mapping[tonode(rev)] = succs
    scmutil.cleanupnodes(repo, mapping, 'rebase')

def pullrebase(orig, ui, repo, *args, **opts):
    'Call rebase after pull if the latter has been invoked with --rebase'
    ret = None
    if opts.get('rebase'):

34354:2f427b57bf90

            newwd = self.originalwd
        if newwd not in [c.rev() for c in repo[None].parents()]:
            ui.note(_("update back to initial working directory parent\n"))
            hg.updaterepo(repo, newwd, False)

        collapsedas = None
        if not self.keepf:
            if self.collapsef:
                collapsedas = newnode
        clearrebased(ui, repo, self.dest, self.state, self.skipped,
                     collapsedas, self.keepf)

        clearstatus(repo)
        clearcollapsemsg(repo)

        ui.note(_("rebase completed\n"))

            state[r] = revpruned
        else:
            state[r] = revprecursor
    return originalwd, dest.rev(), state

def clearrebased(ui, repo, dest, state, skipped, collapsedas=None, keepf=False):
    """dispose of rebased revision at the end of the rebase

    If `collapsedas` is not None, the rebase was a collapse whose result if the
    `collapsedas` node.

    If `keepf` is not True, the rebase has --keep set and no nodes should be
    removed (but bookmarks still need to be moved).
    """
    tonode = repo.changelog.node
    replacements = {}
    moves = {}
    for rev, newrev in sorted(state.items()):
        if newrev >= 0 and newrev != rev:
            oldnode = tonode(rev)
            newnode = collapsedas or tonode(newrev)
            moves[oldnode] = newnode
            if not keepf:
                if rev in skipped:
                    succs = ()
                else:
                    succs = (newnode,)
                replacements[oldnode] = succs
    scmutil.cleanupnodes(repo, replacements, 'rebase', moves)

def pullrebase(orig, ui, repo, *args, **opts):
    'Call rebase after pull if the latter has been invoked with --rebase'
    ret = None
    if opts.get('rebase'):