comparison mercurial/merge.py @ 44270:f546d2170b0f

merge: introduce a clean_update() for that use-case

I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.

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

44269:48a1a974a92c

            b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
        )
    return stats


def graft(
    repo,
    ctx,
    base=None,
    labels=None,

44270:f546d2170b0f

            b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
        )
    return stats


def clean_update(ctx, wc=None):
    """Do a clean update to the given commit.

    This involves updating to the commit and discarding any changes in the
    working copy.
    """
    return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)


def graft(
    repo,
    ctx,
    base=None,
    labels=None,