comparison mercurial/merge.py @ 33146:7017567ebdf2

obsutil: move 'foreground' to the new modules

We have a new 'obsutil' module now. We move the high level utility there to
bring 'obsolete.py' back to a more reasonable size.

33145:0a370b93cca2

from . import (
    copies,
    error,
    filemerge,
    match as matchmod,
    obsolete,
    pycompat,
    scmutil,
    subrepo,
    util,
    worker,

            if (updatecheck == 'linear' and
                    pas not in ([p1], [p2])):  # nonlinear
                dirty = wc.dirty(missing=True)
                if dirty:
                    # Branching is a bit strange to ensure we do the minimal
                    # amount of call to obsolete.foreground.
                    foreground = obsolete.foreground(repo, [p1.node()])
                    # note: the <node> variable contains a random identifier
                    if repo[node].node() in foreground:
                        pass # allow updating to successors
                    else:
                        msg = _("uncommitted changes")

33146:7017567ebdf2

from . import (
    copies,
    error,
    filemerge,
    match as matchmod,
    obsutil,
    pycompat,
    scmutil,
    subrepo,
    util,
    worker,

            if (updatecheck == 'linear' and
                    pas not in ([p1], [p2])):  # nonlinear
                dirty = wc.dirty(missing=True)
                if dirty:
                    # Branching is a bit strange to ensure we do the minimal
                    # amount of call to obsutil.foreground.
                    foreground = obsutil.foreground(repo, [p1.node()])
                    # note: the <node> variable contains a random identifier
                    if repo[node].node() in foreground:
                        pass # allow updating to successors
                    else:
                        msg = _("uncommitted changes")