This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11112

largefile: use `parentchange` markcommitted
ClosedPublic

Authored by marmoute on Jul 18 2021, 5:53 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb1b6d0cad455: largefile: use `parentchange` markcommitted

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jul 18 2021, 5:53 PM
pulkit accepted this revision.Jul 18 2021, 6:36 PM
This revision is now accepted and ready to land.Jul 18 2021, 6:36 PM
marmoute added a commit: rHGb1b6d0cad455: largefile: use `parentchange` markcommitted.Jul 19 2021, 9:16 AM
Closed by commit rHGb1b6d0cad455: largefile: use `parentchange` markcommitted (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute updated this revision to Diff 29471.Jul 19 2021, 10:50 AM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfutil.py (4 lines)

Diff 29471

hgext/largefiles/lfutil.py

lfdirstate.add(lfile) lfdirstate.add(lfile)
elif state == b'?': elif state == b'?':
lfdirstate.drop(lfile) lfdirstate.drop(lfile)
def markcommitted(orig, ctx, node): def markcommitted(orig, ctx, node):
repo = ctx.repo() repo = ctx.repo()
with ctx._repo.dirstate.parentchange(): lfdirstate = openlfdirstate(repo.ui, repo)
with lfdirstate.parentchange():
orig(node) orig(node)
# ATTENTION: "ctx.files()" may differ from "repo[node].files()" # ATTENTION: "ctx.files()" may differ from "repo[node].files()"
# because files coming from the 2nd parent are omitted in the latter. # because files coming from the 2nd parent are omitted in the latter.
# #
# The former should be used to get targets of "synclfdirstate", # The former should be used to get targets of "synclfdirstate",
# because such files: # because such files:
# - are marked as "a" by "patch.patch()" (e.g. via transplant), and # - are marked as "a" by "patch.patch()" (e.g. via transplant), and
# - have to be marked as "n" after commit, but # - have to be marked as "n" after commit, but
# - aren't listed in "repo[node].files()" # - aren't listed in "repo[node].files()"
lfdirstate = openlfdirstate(repo.ui, repo)
for f in ctx.files(): for f in ctx.files():
lfile = splitstandin(f) lfile = splitstandin(f)
if lfile is not None: if lfile is not None:
synclfdirstate(repo, lfdirstate, lfile, False) synclfdirstate(repo, lfdirstate, lfile, False)
lfdirstate.write() lfdirstate.write()
# As part of committing, copy all of the largefiles into the cache. # As part of committing, copy all of the largefiles into the cache.
# #