comparison hgext/largefiles/lfutil.py @ 50050:22cd517bc6b0

largefiles: rely on main scoping for writing dirstate in `markcommitted`

Yeah, cleaner code.

50049:088ee6adfb09

def markcommitted(orig, ctx, node):
    repo = ctx.repo()

    lfdirstate = openlfdirstate(repo.ui, repo)
    with lfdirstate.changing_parents(repo):
        orig(node)

        # ATTENTION: "ctx.files()" may differ from "repo[node].files()"
        # because files coming from the 2nd parent are omitted in the latter.
        #

        # because such files:
        # - are marked as "a" by "patch.patch()" (e.g. via transplant), and
        # - have to be marked as "n" after commit, but
        # - aren't listed in "repo[node].files()"

        for f in ctx.files():
            lfile = splitstandin(f)
            if lfile is not None:
                synclfdirstate(repo, lfdirstate, lfile, False)
    lfdirstate.write(repo.currenttransaction())

    # As part of committing, copy all of the largefiles into the cache.
    #
    # Using "node" instead of "ctx" implies additional "repo[node]"
    # lookup while copyalltostore(), but can omit redundant check for

50050:22cd517bc6b0

def markcommitted(orig, ctx, node):
    repo = ctx.repo()

    with repo.dirstate.changing_parents(repo):
        orig(node)

        # ATTENTION: "ctx.files()" may differ from "repo[node].files()"
        # because files coming from the 2nd parent are omitted in the latter.
        #

        # because such files:
        # - are marked as "a" by "patch.patch()" (e.g. via transplant), and
        # - have to be marked as "n" after commit, but
        # - aren't listed in "repo[node].files()"

        lfdirstate = openlfdirstate(repo.ui, repo)
        for f in ctx.files():
            lfile = splitstandin(f)
            if lfile is not None:
                synclfdirstate(repo, lfdirstate, lfile, False)

    # As part of committing, copy all of the largefiles into the cache.
    #
    # Using "node" instead of "ctx" implies additional "repo[node]"
    # lookup while copyalltostore(), but can omit redundant check for