This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11108

largefile: use `parentchange` during rollback
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG12300ee6840b: largefile: use `parentchange` during rollback
Summary

rollback is updating parent without touching the working copy. It should wrapped
in a parentchange context.

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:52 PM
pulkit accepted this revision.Jul 18 2021, 6:26 PM
This revision is now accepted and ready to land.Jul 18 2021, 6:26 PM
marmoute updated this revision to Diff 29376.Jul 19 2021, 3:31 AM
marmoute added a commit: rHG12300ee6840b: largefile: use `parentchange` during rollback.Jul 19 2021, 9:16 AM
Closed by commit rHG12300ee6840b: largefile: use `parentchange` during rollback (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute updated this revision to Diff 29467.Jul 19 2021, 10:50 AM

Revision Contents
Changeset List

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

Diff 29467

hgext/largefiles/overrides.py

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) lfdirstate = lfutil.openlfdirstate(ui, repo)
with lfdirstate.parentchange():
orphans = set(lfdirstate) orphans = set(lfdirstate)
lfiles = lfutil.listlfiles(repo) lfiles = lfutil.listlfiles(repo)
for file in lfiles: for file in lfiles:
lfutil.synclfdirstate(repo, lfdirstate, file, True) lfutil.synclfdirstate(repo, lfdirstate, file, True)
orphans.discard(file) orphans.discard(file)
for lfile in orphans: for lfile in orphans:
lfdirstate.drop(lfile) lfdirstate.drop(lfile)
lfdirstate.write() 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))