narrow: allow merging non-conflicting change outside of the narrow spec We use the mergestate to carry information about these merge action and reprocess them at commit time to apply the necessary update. The dirstate itself is never affected and remains "pure", with content only in the narrow-spec. This file involved in such merge are therefor not listed in `hg status`. The current testing is based on a modification of the previous testing, that refused to do such merges. As a result it is a bit simple and more extensive code and testing testing will have to be introduced later. I am planning to do this extra testing, soon. In addition, this only works for flat manifest. Support for tree manifest will need more work. I am not currently planning to do this work. Differential Revision: https://phab.mercurial-scm.org/D12119

     1

# stack.py - Mercurial functions for stack definition

     2

#

     3

#  Copyright Olivia Mackall <olivia@selenic.com> and other

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

from __future__ import absolute_import

     9

    10

    11

def getstack(repo, rev=None):

    12

    """return a sorted smartrev of the stack containing either rev if it is

    13

    not None or the current working directory parent.

    14

    15

    The stack will always contain all drafts changesets which are ancestors to

    16

    the revision and are not merges.

    17

    """

    18

    if rev is None:

    19

        rev = b'.'

    20

    21

    revspec = b'only(%s) and not public() and not ::merge()'

    22

    revisions = repo.revs(revspec, rev)

    23

    revisions.sort()

    24

    return revisions