comparison hgext/largefiles/overrides.py @ 47702:0149d17da91b

largefile: adjust the dirstate post update within a `parentchange` context

This is doing an update, so this seems more appropriate. No other change have been made, but the next changeset will :-)

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

47701:0e87c90f1cd5

            # largefiles is not a good candidate for in-memory merge (large
            # files, custom dirstate, matcher usage).
            raise error.ProgrammingError(
                b'largefiles is not compatible with in-memory merge'
            )
        result = orig(repo, node, branchmerge, force, *args, **kwargs)

        newstandins = lfutil.getstandinsstate(repo)
        filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)

        # to avoid leaving all largefiles as dirty and thus rehash them, mark
        # all the ones that didn't change as clean
        for lfile in oldclean.difference(filelist):
            lfdirstate.normal(lfile)
        lfdirstate.write()

        if branchmerge or force or partial:
            filelist.extend(s.deleted + s.removed)

        lfcommands.updatelfiles(
            repo.ui, repo, filelist=filelist, normallookup=partial
        )

        return result


@eh.wrapfunction(scmutil, b'marktouched')

47702:0149d17da91b

            # largefiles is not a good candidate for in-memory merge (large
            # files, custom dirstate, matcher usage).
            raise error.ProgrammingError(
                b'largefiles is not compatible with in-memory merge'
            )
        with lfdirstate.parentchange():
            result = orig(repo, node, branchmerge, force, *args, **kwargs)

            newstandins = lfutil.getstandinsstate(repo)
            filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)

            # to avoid leaving all largefiles as dirty and thus rehash them, mark
            # all the ones that didn't change as clean
            for lfile in oldclean.difference(filelist):
                lfdirstate.normal(lfile)
            lfdirstate.write()

            if branchmerge or force or partial:
                filelist.extend(s.deleted + s.removed)

            lfcommands.updatelfiles(
                repo.ui, repo, filelist=filelist, normallookup=partial
            )

        return result


@eh.wrapfunction(scmutil, b'marktouched')