view mercurial/stack.py @ 42522:d29db0a0c4eb

update: fix spurious unclean status bug shown by previous commit

The crux of the problem is:
- the dirstate is corrupted (the sizes/dates are assigned to the wrong files)
- because when worker.worker is used with a return value (batchget in
  merge.py here), the return value when worker.worker effectively parallelizes
  is permuted
- this is because worker.worker's partition of input and combination of output
  values are not inverses of one another: it split [1,2,3,4,5,6] into
  [[1,3,5],[2,4,6]], but combines that into [1,3,5,2,4,6].

Given that worker.worker doesn't call its function argument on contiguous
chunks on the input arguments, sticking with lists means we'd need to
know the relation between the inputs of worker.worker function argument
(for instance, requiring that every input element is mapped to exactly
one output element). It seems better to instead switch return values to
dicts, which can combined reliably with a straighforward restriction.

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

# 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