view mercurial/stack.py @ 38756:91c405f84cf7 stable

sparse: add test showing `hg merge` is broken while using sparse extension

This patch adds a test to demonstrate that `hg merge` is broken in some cases
while using sparse extension.

The case is when you have a file which is:

  * modified between current wdir parent and merge base
  * deleted between merge base and merge destination
  * excluded from sparse checkout

Doing `hg merge` results in file not found error. Next patch will fix this.

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

# 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