This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11612

largefiles: partially undo 61e526585b20e2ff15f19497d0451d18fea02db8 and child
ClosedPublic

Authored by pulkit on Oct 5 2021, 7:44 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG941fbaab5aff: largefiles: partially undo 61e526585b20e2ff15f19497d0451d18fea02db8 and child
Summary

Since the largefiles dirstate is now part of transaction, we get rid of this
temporary fix which lived for ~7 years.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 5 2021, 7:44 AM
martinvonz accepted this revision.Oct 8 2021, 4:54 PM
This revision is now accepted and ready to land.Oct 8 2021, 4:54 PM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/overrides.py (12 lines)

Diff 30693

hgext/largefiles/overrides.py

repo.wwrite(f, fctx.data(), fctx.flags()) repo.wwrite(f, fctx.data(), fctx.flags())
else: else:
# content of standin is not so important in 'a', # content of standin is not so important in 'a',
# 'm' or 'n' (coming from the 2nd parent) cases # 'm' or 'n' (coming from the 2nd parent) cases
lfutil.writestandin(repo, f, b'', False) lfutil.writestandin(repo, f, b'', False)
for standin in orphans: for standin in orphans:
repo.wvfs.unlinkpath(standin, ignoremissing=True) repo.wvfs.unlinkpath(standin, ignoremissing=True)
lfdirstate = lfutil.openlfdirstate(ui, repo)
with lfdirstate.parentchange():
orphans = set(lfdirstate)
lfiles = lfutil.listlfiles(repo)
for file in lfiles:
lfutil.synclfdirstate(repo, lfdirstate, file, True)
orphans.discard(file)
for lfile in orphans:
lfdirstate.update_file(
lfile, p1_tracked=False, wc_tracked=False
)
lfdirstate.write()
return result return result
@eh.wrapcommand(b'transplant', extension=b'transplant') @eh.wrapcommand(b'transplant', extension=b'transplant')
def overridetransplant(orig, ui, repo, *revs, **opts): def overridetransplant(orig, ui, repo, *revs, **opts):
resuming = opts.get('continue') resuming = opts.get('continue')
repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
repo._lfstatuswriters.append(lambda *msg, **opts: None) repo._lfstatuswriters.append(lambda *msg, **opts: None)