This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11511

dirstate: drop some safety assert in largefile
ClosedPublic

Authored by marmoute on Sep 29 2021, 4:36 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe4c79a1a0b67: dirstate: drop some safety assert in largefile
Summary

The code involved in set_possibly_dirty is now simpler and safe to use even
in the cases that the assert covered. So we can drop this assert.

It was the last user of merged_removed and from_p2_removed.

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

marmoute created this revision.Sep 29 2021, 4:36 AM
Alphare accepted this revision.Sep 29 2021, 4:56 AM
This revision is now accepted and ready to land.Sep 29 2021, 4:56 AM
marmoute added a commit: rHGe4c79a1a0b67: dirstate: drop some safety assert in largefile.Oct 1 2021, 9:18 AM
Closed by commit rHGe4c79a1a0b67: dirstate: drop some safety assert in largefile (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 30481

hgext/largefiles/overrides.py

if fstandin not in dctx: if fstandin not in dctx:
# in this case, content of standin file is meaningless # in this case, content of standin file is meaningless
# (in dctx, lfile is unknown, or normal file) # (in dctx, lfile is unknown, or normal file)
continue continue
lfutil.updatestandin(repo, lfile, fstandin) lfutil.updatestandin(repo, lfile, fstandin)
# mark all clean largefiles as dirty, just in case the update gets # mark all clean largefiles as dirty, just in case the update gets
# interrupted before largefiles and lfdirstate are synchronized # interrupted before largefiles and lfdirstate are synchronized
for lfile in oldclean: for lfile in oldclean:
entry = lfdirstate._map.get(lfile)
assert not (entry.merged_removed or entry.from_p2_removed)
lfdirstate.set_possibly_dirty(lfile) lfdirstate.set_possibly_dirty(lfile)
lfdirstate.write() lfdirstate.write()
oldstandins = lfutil.getstandinsstate(repo) oldstandins = lfutil.getstandinsstate(repo)
wc = kwargs.get('wc') wc = kwargs.get('wc')
if wc and wc.isinmemory(): if wc and wc.isinmemory():
# largefiles is not a good candidate for in-memory merge (large # largefiles is not a good candidate for in-memory merge (large
# files, custom dirstate, matcher usage). # files, custom dirstate, matcher usage).