comparison hgext/fix.py @ 44129:84a0102c05c7 stable 5.3rc0

merge to stable for 5.3 release freeze

44048:61881b170140

    copies,
    error,
    match as matchmod,
    mdiff,
    merge,
    obsolete,
    pycompat,
    registrar,
    scmutil,
    util,
    worker,
)

    set of revisions being fixed is considered, so that fixes to earlier
    revisions are not forgotten in later ones. The --base flag can be used to
    override this default behavior, though it is not usually desirable to do so.
    """
    opts = pycompat.byteskwargs(opts)
    if opts[b'all']:
        if opts[b'rev']:
            raise error.Abort(_(b'cannot specify both "--rev" and "--all"'))
        opts[b'rev'] = [b'not public() and not obsolete()']
        opts[b'working_dir'] = True
    with repo.wlock(), repo.lock(), repo.transaction(b'fix'):
        revstofix = getrevstofix(ui, repo, opts)
        basectxs = getbasectxs(repo, opts, revstofix)

    revs = set(scmutil.revrange(repo, opts[b'rev']))
    for rev in revs:
        checkfixablectx(ui, repo, repo[rev])
    if revs:
        cmdutil.checkunfinished(repo)
        checknodescendants(repo, revs)
    if opts.get(b'working_dir'):
        revs.add(wdirrev)
        if list(merge.mergestate.read(repo).unresolved()):
            raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
    if not revs:

            b'no changesets specified', hint=b'use --rev or --working-dir'
        )
    return revs


def checknodescendants(repo, revs):
    if not obsolete.isenabled(repo, obsolete.allowunstableopt) and repo.revs(
        b'(%ld::) - (%ld)', revs, revs
    ):
        raise error.Abort(
            _(b'can only fix a changeset together with all its descendants')
        )


def checkfixablectx(ui, repo, ctx):
    """Aborts if the revision shouldn't be replaced with a fixed one."""
    if not ctx.mutable():
        raise error.Abort(
            b'can\'t fix immutable changeset %s'
            % (scmutil.formatchangeid(ctx),)
        )
    if ctx.obsolete():
        # It would be better to actually check if the revision has a successor.
        allowdivergence = ui.configbool(
            b'experimental', b'evolution.allowdivergence'
        )

        if line:
            ui.warn(b'[')
            if rev is None:
                ui.warn(_(b'wdir'), label=b'evolve.rev')
            else:
                ui.warn((str(rev)), label=b'evolve.rev')
            ui.warn(b'] %s: %s\n' % (fixername, line))


def writeworkingdir(repo, ctx, filedata, replacements):
    """Write new content to the working copy and check out the new p1 if any

        and p1ctx.node() not in replacements
        and p2ctx.node() not in replacements
    ):
        return

    def filectxfn(repo, memctx, path):
        if path not in ctx:
            return None
        fctx = ctx[path]
        copysource = fctx.copysource()
        return context.memfilectx(
            repo,
            memctx,
            path=fctx.path(),
            data=filedata.get(path, fctx.data()),
            islink=fctx.islink(),
            isexec=fctx.isexec(),
            copysource=copysource,
        )

    extra = ctx.extra().copy()
    extra[b'fix_source'] = ctx.hex()

    memctx = context.memctx(
        repo,
        parents=(newp1node, newp2node),
        text=ctx.description(),
        files=set(ctx.files()) | set(filedata.keys()),
        filectxfn=filectxfn,
        user=ctx.user(),
        date=ctx.date(),
        extra=extra,
        branch=ctx.branch(),
        editor=None,
    )
    sucnode = memctx.commit()
    prenode = ctx.node()
    if prenode == sucnode:
        ui.debug(b'node %s already existed\n' % (ctx.hex()))
    else:

44129:84a0102c05c7

    copies,
    error,
    match as matchmod,
    mdiff,
    merge,
    pycompat,
    registrar,
    rewriteutil,
    scmutil,
    util,
    worker,
)

    set of revisions being fixed is considered, so that fixes to earlier
    revisions are not forgotten in later ones. The --base flag can be used to
    override this default behavior, though it is not usually desirable to do so.
    """
    opts = pycompat.byteskwargs(opts)
    cmdutil.check_at_most_one_arg(opts, b'all', b'rev')
    if opts[b'all']:
        opts[b'rev'] = [b'not public() and not obsolete()']
        opts[b'working_dir'] = True
    with repo.wlock(), repo.lock(), repo.transaction(b'fix'):
        revstofix = getrevstofix(ui, repo, opts)
        basectxs = getbasectxs(repo, opts, revstofix)

    revs = set(scmutil.revrange(repo, opts[b'rev']))
    for rev in revs:
        checkfixablectx(ui, repo, repo[rev])
    if revs:
        cmdutil.checkunfinished(repo)
        rewriteutil.precheck(repo, revs, b'fix')
    if opts.get(b'working_dir'):
        revs.add(wdirrev)
        if list(merge.mergestate.read(repo).unresolved()):
            raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
    if not revs:

            b'no changesets specified', hint=b'use --rev or --working-dir'
        )
    return revs


def checkfixablectx(ui, repo, ctx):
    """Aborts if the revision shouldn't be replaced with a fixed one."""
    if ctx.obsolete():
        # It would be better to actually check if the revision has a successor.
        allowdivergence = ui.configbool(
            b'experimental', b'evolution.allowdivergence'
        )

        if line:
            ui.warn(b'[')
            if rev is None:
                ui.warn(_(b'wdir'), label=b'evolve.rev')
            else:
                ui.warn(b'%d' % rev, label=b'evolve.rev')
            ui.warn(b'] %s: %s\n' % (fixername, line))


def writeworkingdir(repo, ctx, filedata, replacements):
    """Write new content to the working copy and check out the new p1 if any

        and p1ctx.node() not in replacements
        and p2ctx.node() not in replacements
    ):
        return

    extra = ctx.extra().copy()
    extra[b'fix_source'] = ctx.hex()

    wctx = context.overlayworkingctx(repo)
    wctx.setbase(repo[newp1node])
    merge.update(
        repo,
        ctx.rev(),
        branchmerge=False,
        force=True,
        ancestor=p1rev,
        mergeancestor=False,
        wc=wctx,
    )
    copies.graftcopies(wctx, ctx, ctx.p1())

    for path in filedata.keys():
        fctx = ctx[path]
        copysource = fctx.copysource()
        wctx.write(path, filedata[path], flags=fctx.flags())
        if copysource:
            wctx.markcopied(path, copysource)

    memctx = wctx.tomemctx(
        text=ctx.description(),
        branch=ctx.branch(),
        extra=extra,
        date=ctx.date(),
        parents=(newp1node, newp2node),
        user=ctx.user(),
    )

    sucnode = memctx.commit()
    prenode = ctx.node()
    if prenode == sucnode:
        ui.debug(b'node %s already existed\n' % (ctx.hex()))
    else: