This is an archive of the discontinued Mercurial Phabricator instance.

Differential D683

largefiles: force an on-disk merge
ClosedPublic

Authored by phillco on Sep 11 2017, 4:25 PM.

Details

Reviewers
durham
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG575097b4dce0: largefiles: force an on-disk merge
Summary

Largefiles isn't a good candidate for in-memory merge (it uses a custom
dirstate, matcher, and the files might not fit in memory) so have it always
run an old-style merge.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Sep 11 2017, 4:25 PM
durham accepted this revision.Sep 15 2017, 11:56 AM
martinvonz accepted this revision.Sep 22 2017, 2:09 PM
This revision is now accepted and ready to land.Sep 22 2017, 2:09 PM
Closed by commit rHG575097b4dce0: largefiles: force an on-disk merge (authored by phillco). · Explain WhySep 22 2017, 2:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 1727

hgext/largefiles/overrides.py

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:
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
lfdirstate.write() lfdirstate.write()
oldstandins = lfutil.getstandinsstate(repo) oldstandins = lfutil.getstandinsstate(repo)
# Make sure the merge runs on disk, not in-memory. largefiles is not a
# good candidate for in-memory merge (large files, custom dirstate,
# matcher usage).
kwargs['wc'] = repo[None]
result = orig(repo, node, branchmerge, force, *args, **kwargs) result = orig(repo, node, branchmerge, force, *args, **kwargs)
newstandins = lfutil.getstandinsstate(repo) newstandins = lfutil.getstandinsstate(repo)
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
# to avoid leaving all largefiles as dirty and thus rehash them, mark # to avoid leaving all largefiles as dirty and thus rehash them, mark
# all the ones that didn't change as clean # all the ones that didn't change as clean
for lfile in oldclean.difference(filelist): for lfile in oldclean.difference(filelist):