comparison mercurial/commands.py @ 26641:5c57d01fe64e

destupdate: also include bookmark related logic

For the same reason, we move the bookmark related update logic into the
'destupdate' function. This requires to extend the returns of the function to
include the bookmark that needs to move (more or less) and the bookmark to
activate at the end of the function. See function documentation for details on
this returns.

26640:b13fdcc4e700

    See :hg:`help dates` for a list of formats valid for -d/--date.

    Returns 0 on success, 1 if there are unresolved files.
    """
    if rev and node:
        raise error.Abort(_("please specify just one revision"))

    if rev is None or rev == '':
        rev = node

        if date:
            if rev is not None:
                raise error.Abort(_("you can't specify a revision and a date"))
            rev = cmdutil.finddate(ui, repo, date)

        # with no argument, we also move the active bookmark, if any
        rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)

        # if we defined a bookmark, we have to remember the original name
        brev = rev
        rev = scmutil.revsingle(repo, rev, rev).rev()

        if check and clean:

                             )

        if check:
            cmdutil.bailifchanged(repo, merge=False)
        if rev is None:
            rev = destutil.destupdate(repo, clean=clean, check=check)

        repo.ui.setconfig('ui', 'forcemerge', tool, 'update')

        if clean:
            ret = hg.clean(repo, rev)

26641:5c57d01fe64e

    See :hg:`help dates` for a list of formats valid for -d/--date.

    Returns 0 on success, 1 if there are unresolved files.
    """
    movemarkfrom = None
    if rev and node:
        raise error.Abort(_("please specify just one revision"))

    if rev is None or rev == '':
        rev = node

        if date:
            if rev is not None:
                raise error.Abort(_("you can't specify a revision and a date"))
            rev = cmdutil.finddate(ui, repo, date)

        # if we defined a bookmark, we have to remember the original name
        brev = rev
        rev = scmutil.revsingle(repo, rev, rev).rev()

        if check and clean:

                             )

        if check:
            cmdutil.bailifchanged(repo, merge=False)
        if rev is None:
            updata =  destutil.destupdate(repo, clean=clean, check=check)
            rev, movemarkfrom, brev = updata

        repo.ui.setconfig('ui', 'forcemerge', tool, 'update')

        if clean:
            ret = hg.clean(repo, rev)