view mercurial/stack.py @ 39069:4c4825db29e1

shortest: don't include nullid in disambigution revset

As noted by Yuya in the review of D4118, the fact that the nodetree
always contains the nullid is not what we want for the disambiguation
case. It's not what the pure version of the code does.

Note that the updated test also passes before this patch, but it
wouldn't have passed in native-code mode once we start using the
nodetree for disambiguating nodeid prefixes.

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

# stack.py - Mercurial functions for stack definition
#
#  Copyright Matt Mackall <[e-mail]> and other
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

from . import (
    revsetlang,
    scmutil,
)

def getstack(repo, rev=None):
    """return a sorted smartrev of the stack containing either rev if it is
    not None or the current working directory parent.

    The stack will always contain all drafts changesets which are ancestors to
    the revision and are not merges.
    """
    if rev is None:
        rev = '.'

    revspec = 'reverse(only(%s) and not public() and not ::merge())'
    revset = revsetlang.formatspec(revspec, rev)
    revisions = scmutil.revrange(repo, [revset])
    revisions.sort()
    return revisions