mercurial/hg.py

42970:1ad3ebb39c61

    return stats.unresolvedcount > 0

# naming conflict in updatetotally()
_clean = clean

def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
    """Update the working directory with extra care for non-file components

    This takes care of non-file components below:

    This returns whether conflict is detected at updating or not.
    """
    if updatecheck is None:
        updatecheck = ui.config('commands', 'update.check')
        if updatecheck not in (mergemod.UPDATECHECK_ABORT,
                               mergemod.UPDATECHECK_NONE,
                               mergemod.UPDATECHECK_LINEAR,
                               mergemod.UPDATECHECK_NO_CONFLICT):
            # If not configured, or invalid value configured
            updatecheck = mergemod.UPDATECHECK_LINEAR
    with repo.wlock():
        movemarkfrom = None
        warndest = False
        if checkout is None:
            updata = destutil.destupdate(repo, clean=clean)

42971:ee1ef76d7339

    return stats.unresolvedcount > 0

# naming conflict in updatetotally()
_clean = clean

_VALID_UPDATECHECKS = {mergemod.UPDATECHECK_ABORT,
                       mergemod.UPDATECHECK_NONE,
                       mergemod.UPDATECHECK_LINEAR,
                       mergemod.UPDATECHECK_NO_CONFLICT,
}

def updatetotally(ui, repo, checkout, brev, clean=False, updatecheck=None):
    """Update the working directory with extra care for non-file components

    This takes care of non-file components below:

    This returns whether conflict is detected at updating or not.
    """
    if updatecheck is None:
        updatecheck = ui.config('commands', 'update.check')
        if updatecheck not in _VALID_UPDATECHECKS:
            # If not configured, or invalid value configured
            updatecheck = mergemod.UPDATECHECK_LINEAR
    if updatecheck not in _VALID_UPDATECHECKS:
        raise ValueError(r'Invalid updatecheck value %r (can accept %r)' % (
            updatecheck, _VALID_UPDATECHECKS))
    with repo.wlock():
        movemarkfrom = None
        warndest = False
        if checkout is None:
            updata = destutil.destupdate(repo, clean=clean)