view mercurial/stack.py @ 45585:479cce8c9882

commit: force create a new filenode if it was set in mergestate by merge

For reasons mentioned in previous commits, we will like to forcefully create a
new filenode sometimes.

Combination of this patch and previous one, we fixed a case in
`test-merge-combination.t`.

This does not yet results in conflict where it should, I need to investigate
more about what's happening as it should be a change-delete conflict now.

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

# 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


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 = b'.'

    revspec = b'only(%s) and not public() and not ::merge()'
    revisions = repo.revs(revspec, rev)
    revisions.sort()
    return revisions