comparison mercurial/sparse.py @ 47708:7bdfd88251c0

sparse: apply update with in a `parentchange` context

We are changing the reference so we should be within such context manager.

This seems make the actual dirstate content a bit flaky with content being
sometime ambigous (but maybe it was flaky before?)

So I increased the matching.

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

47707:61753b1ba96f

                    mergestatemod.ACTION_GET,
                    (fctx.flags(), False),
                    message,
                )

        mergemod.applyupdates(
            repo, tmresult, repo[None], repo[b'.'], False, wantfiledata=False
        )

        dirstate = repo.dirstate
        for file, flags, msg in tmresult.getactions([mergestatemod.ACTION_GET]):
            dirstate.normal(file)

    profiles = activeconfig(repo)[2]
    changedprofiles = profiles & files
    # If an active profile changed during the update, refresh the checkout.
    # Don't do this during a branch merge, since all incoming changes should

47708:7bdfd88251c0

                    mergestatemod.ACTION_GET,
                    (fctx.flags(), False),
                    message,
                )

        with repo.dirstate.parentchange():
            mergemod.applyupdates(
                repo,
                tmresult,
                repo[None],
                repo[b'.'],
                False,
                wantfiledata=False,
            )

            dirstate = repo.dirstate
            for file, flags, msg in tmresult.getactions(
                [mergestatemod.ACTION_GET]
            ):
                dirstate.normal(file)

    profiles = activeconfig(repo)[2]
    changedprofiles = profiles & files
    # If an active profile changed during the update, refresh the checkout.
    # Don't do this during a branch merge, since all incoming changes should