view mercurial/stack.py @ 46160:1d6aac94e6d5

copies: explain the "arbitrary" copy source pick in case of conflict

They are a logic and it is easy to explain, so lets explain it.

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

# 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