comparison mercurial/scmutil.py @ 33331:4bae3c117b57

scmutil: make cleanupnodes delete divergent bookmarks

cleanupnodes takes care of bookmark movement, and bookmark movement could
cause bookmark divergent resolution as a side effect. This patch adds such
bookmark divergent resolution logic so future rebase migration will be
easier.

The revset is carefully written to be equivalent to what rebase does today.
Although I think it might make sense to remove divergent bookmarks more
aggressively, for example:

    F   book@1
    |
    E   book@2
    |
    | D book
    | |
    | C
    |/
    B   book@3
    |
    A

When rebase -s C -d E, "book@1" will be removed, "book@3" will be kept,
and the end result is:

    D   book
    |
    C
    |
    F
    |
    E   book@2 (?)
    |
    B   book@3
    |
    A

The question is should we keep book@2? The current logic keeps it. If we
choose not to (makes some sense to me), the "deleterevs" revset could be
simplified to "newnode % oldnode".

For now, I just make it compatible with the existing behavior. If we want to
make the "deleterevs" revset simpler, we can always do it in the future.

33330:ba43e5ee9c6d

        ui.note(_('creating directory: %s\n') % origbackupdir)
        util.makedirs(origbackupdir)

    return fullorigpath + ".orig"

def cleanupnodes(repo, mapping, operation):
    """do common cleanups when old nodes are replaced by new nodes

    That includes writing obsmarkers or stripping nodes, and moving bookmarks.
    (we might also want to move working directory parent in the future)

    with repo.transaction('cleanup') as tr:
        # Move bookmarks
        bmarks = repo._bookmarks
        bmarkchanged = False
        for oldnode, newnodes in mapping.items():
            oldbmarks = repo.nodebookmarks(oldnode)
            if not oldbmarks:
                continue
            bmarkchanged = True
            if len(newnodes) > 1:
                heads = list(repo.set('heads(%ln)', newnodes))
                if len(heads) != 1:
                    raise error.ProgrammingError(
                        'cannot figure out bookmark movement')
                newnode = heads[0].node()
            elif len(newnodes) == 0:
                # move bookmark backwards
                roots = list(repo.set('max((::%n) - %ln)', oldnode,
                                      list(mapping)))
                if roots:

                    newnode = nullid
            else:
                newnode = newnodes[0]
            repo.ui.debug('moving bookmarks %r from %s to %s\n' %
                          (oldbmarks, hex(oldnode), hex(newnode)))
            for name in oldbmarks:
                bmarks[name] = newnode
        if bmarkchanged:
            bmarks.recordchange(tr)

        # Obsolete or strip nodes
        if obsolete.isenabled(repo, obsolete.createmarkersopt):

33331:4bae3c117b57

        ui.note(_('creating directory: %s\n') % origbackupdir)
        util.makedirs(origbackupdir)

    return fullorigpath + ".orig"

class _containsnode(object):
    """proxy __contains__(node) to container.__contains__ which accepts revs"""

    def __init__(self, repo, revcontainer):
        self._torev = repo.changelog.rev
        self._revcontains = revcontainer.__contains__

    def __contains__(self, node):
        return self._revcontains(self._torev(node))

def cleanupnodes(repo, mapping, operation):
    """do common cleanups when old nodes are replaced by new nodes

    That includes writing obsmarkers or stripping nodes, and moving bookmarks.
    (we might also want to move working directory parent in the future)

    with repo.transaction('cleanup') as tr:
        # Move bookmarks
        bmarks = repo._bookmarks
        bmarkchanged = False
        allnewnodes = [n for ns in mapping.values() for n in ns]
        for oldnode, newnodes in mapping.items():
            oldbmarks = repo.nodebookmarks(oldnode)
            if not oldbmarks:
                continue
            from . import bookmarks # avoid import cycle
            bmarkchanged = True
            if len(newnodes) > 1:
                # usually a split, take the one with biggest rev number
                newnode = next(repo.set('max(%ln)', newnodes)).node()
            elif len(newnodes) == 0:
                # move bookmark backwards
                roots = list(repo.set('max((::%n) - %ln)', oldnode,
                                      list(mapping)))
                if roots:

                    newnode = nullid
            else:
                newnode = newnodes[0]
            repo.ui.debug('moving bookmarks %r from %s to %s\n' %
                          (oldbmarks, hex(oldnode), hex(newnode)))
            # Delete divergent bookmarks being parents of related newnodes
            deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
                                   allnewnodes, newnode, oldnode)
            deletenodes = _containsnode(repo, deleterevs)
            for name in oldbmarks:
                bmarks[name] = newnode
                bookmarks.deletedivergent(repo, deletenodes, name)
        if bmarkchanged:
            bmarks.recordchange(tr)

        # Obsolete or strip nodes
        if obsolete.isenabled(repo, obsolete.createmarkersopt):