comparison mercurial/cmdutil.py @ 50023:7a8bfc05b691

dirstate: rename parentchange to changing_parents

Since the new argument breaks the API anyway, we can rename it to a better name.

The previous name `parentchange` might be seen as something active, a function
that would directly change the parents, however this is just a context manager
to frame the operation that will change the parents and adjust the
dirstate content accordingly.

In addition, the future sister method that will be about changes to tracking and
files would have a hard time fitting in the same naming scheme in a clear way.

The new naming uses a clear prefix will make it more distinct from other
dirstate methods and easier to extend with other similar contexts.

50022:c166b212bdee

                        # XXX-PENDINGCHANGE: We should clarify the context in
                        # which this function is called  to make sure it
                        # already called within a `pendingchange`, However we
                        # are taking a shortcut here in order to be able to
                        # quickly deprecated the older API.
                        with dirstate.parentchange(repo):
                            dirstate.update_file(
                                realname,
                                p1_tracked=True,
                                wc_tracked=True,
                                possibly_dirty=True,

            with repo.lock():
                mem_ctx = new_ctx.tomemctx_for_amend(ctx)
                new_node = mem_ctx.commit()

                if repo.dirstate.p1() == ctx.node():
                    with repo.dirstate.parentchange(repo):
                        scmutil.movedirstate(repo, repo[new_node])
                replacements = {ctx.node(): [new_node]}
                scmutil.cleanupnodes(
                    repo, replacements, b'uncopy', fixphase=True
                )

        with repo.lock():
            mem_ctx = new_ctx.tomemctx_for_amend(ctx)
            new_node = mem_ctx.commit()

            if repo.dirstate.p1() == ctx.node():
                with repo.dirstate.parentchange(repo):
                    scmutil.movedirstate(repo, repo[new_node])
            replacements = {ctx.node(): [new_node]}
            scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)

        return

        elif opts.get(b'draft'):
            commitphase = phases.draft
        newid = repo.commitctx(new)
        ms.reset()

        with repo.dirstate.parentchange(repo):
            # Reroute the working copy parent to the new changeset
            repo.setparents(newid, repo.nullid)

            # Fixing the dirstate because localrepo.commitctx does not update
            # it. This is rather convenient because we did not need to update

50023:7a8bfc05b691

                        # XXX-PENDINGCHANGE: We should clarify the context in
                        # which this function is called  to make sure it
                        # already called within a `pendingchange`, However we
                        # are taking a shortcut here in order to be able to
                        # quickly deprecated the older API.
                        with dirstate.changing_parents(repo):
                            dirstate.update_file(
                                realname,
                                p1_tracked=True,
                                wc_tracked=True,
                                possibly_dirty=True,

            with repo.lock():
                mem_ctx = new_ctx.tomemctx_for_amend(ctx)
                new_node = mem_ctx.commit()

                if repo.dirstate.p1() == ctx.node():
                    with repo.dirstate.changing_parents(repo):
                        scmutil.movedirstate(repo, repo[new_node])
                replacements = {ctx.node(): [new_node]}
                scmutil.cleanupnodes(
                    repo, replacements, b'uncopy', fixphase=True
                )

        with repo.lock():
            mem_ctx = new_ctx.tomemctx_for_amend(ctx)
            new_node = mem_ctx.commit()

            if repo.dirstate.p1() == ctx.node():
                with repo.dirstate.changing_parents(repo):
                    scmutil.movedirstate(repo, repo[new_node])
            replacements = {ctx.node(): [new_node]}
            scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)

        return

        elif opts.get(b'draft'):
            commitphase = phases.draft
        newid = repo.commitctx(new)
        ms.reset()

        with repo.dirstate.changing_parents(repo):
            # Reroute the working copy parent to the new changeset
            repo.setparents(newid, repo.nullid)

            # Fixing the dirstate because localrepo.commitctx does not update
            # it. This is rather convenient because we did not need to update