comparison mercurial/destutil.py @ 26629:ae5f7be2b4ab

destupdate: include the 'check' logic

After moving logic from 'merge.update' into 'destutil.destupdate', we are now
moving logic from 'command.update' in 'destutil.destupdate'. This will make the
function actually useful in predicting (and altering) the update behavior.

26628:45b86dbabbda

from . import (
    error,
    obsolete,
)

def destupdate(repo, clean=False):
    """destination for bare update operation
    """
    # Here is where we should consider bookmarks, divergent bookmarks, and tip
    # of current branch; but currently we are only checking the branch tips.
    node = None

                if dirty:
                    msg = _("uncommitted changes")
                    hint = _("commit and merge, or update --clean to"
                             " discard changes")
                    raise error.Abort(msg, hint=hint)
                else:  # destination is not a descendant.
                    msg = _("not a linear update")
                    hint = _("merge or update --check to force update")
                    raise error.Abort(msg, hint=hint)

    return rev

26629:ae5f7be2b4ab

from . import (
    error,
    obsolete,
)

def destupdate(repo, clean=False, check=False):
    """destination for bare update operation
    """
    # Here is where we should consider bookmarks, divergent bookmarks, and tip
    # of current branch; but currently we are only checking the branch tips.
    node = None

                if dirty:
                    msg = _("uncommitted changes")
                    hint = _("commit and merge, or update --clean to"
                             " discard changes")
                    raise error.Abort(msg, hint=hint)
                elif not check:  # destination is not a descendant.
                    msg = _("not a linear update")
                    hint = _("merge or update --check to force update")
                    raise error.Abort(msg, hint=hint)

    return rev