comparison mercurial/scmutil.py @ 33330:ba43e5ee9c6d

scmutil: make cleanupnodes handle filtered node

In some valid usecases, the "mapping" received by scmutil.cleanupnodes have
filtered nodes. Use unfiltered repo to access them correctly.

The added test case will fail with the old cleanupnodes code.

This is important to migrate histedit to use the cleanupnodes API.

33329:e714159860fd

            # without a successor, skip that obssolete request since it's
            # unnecessary. That's the "if s or not isobs(n)" check below.
            # Also sort the node in topology order, that might be useful for
            # some obsstore logic.
            # NOTE: the filtering and sorting might belong to createmarkers.
            isobs = repo.obsstore.successors.__contains__
            sortfunc = lambda ns: repo.changelog.rev(ns[0])
            rels = [(repo[n], (repo[m] for m in s))
                    for n, s in sorted(mapping.items(), key=sortfunc)
                    if s or not isobs(n)]
            obsolete.createmarkers(repo, rels, operation=operation)
        else:
            from . import repair # avoid import cycle

33330:ba43e5ee9c6d

            # without a successor, skip that obssolete request since it's
            # unnecessary. That's the "if s or not isobs(n)" check below.
            # Also sort the node in topology order, that might be useful for
            # some obsstore logic.
            # NOTE: the filtering and sorting might belong to createmarkers.
            # Unfiltered repo is needed since nodes in mapping might be hidden.
            unfi = repo.unfiltered()
            isobs = unfi.obsstore.successors.__contains__
            torev = unfi.changelog.rev
            sortfunc = lambda ns: torev(ns[0])
            rels = [(unfi[n], (unfi[m] for m in s))
                    for n, s in sorted(mapping.items(), key=sortfunc)
                    if s or not isobs(n)]
            obsolete.createmarkers(repo, rels, operation=operation)
        else:
            from . import repair # avoid import cycle