mercurial/cmdutil.py

35852:9639c433be54

    error,
    formatter,
    graphmod,
    match as matchmod,
    mdiff,
    obsolete,
    patch,
    pathutil,
    pycompat,
    registrar,

            # amend should abort if commitsubrepos is enabled
            assert not commitsubs
            if subs:
                subrepo.writestate(repo, newsubstate)

        filestoamend = set(f for f in wctx.files() if matcher(f))

        changes = (len(filestoamend) > 0)
        if changes:
            # Recompute copies (avoid recording a -> b -> a)

35853:eeb87b24aea7

    error,
    formatter,
    graphmod,
    match as matchmod,
    mdiff,
    mergeutil,
    obsolete,
    patch,
    pathutil,
    pycompat,
    registrar,

            # amend should abort if commitsubrepos is enabled
            assert not commitsubs
            if subs:
                subrepo.writestate(repo, newsubstate)

        # avoid cycle (TODO: should be removed in default branch)
        from . import merge as mergemod
        ms = mergemod.mergestate.read(repo)
        mergeutil.checkunresolved(ms)

        filestoamend = set(f for f in wctx.files() if matcher(f))

        changes = (len(filestoamend) > 0)
        if changes:
            # Recompute copies (avoid recording a -> b -> a)