comparison hgext/largefiles/overrides.py @ 47754:4d845260a713

largefile: use `update_file` instead of `add` in `mergerecordupdates` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11196
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 03:19:06 +0200
parents 13e2ce796dcd
children e4c79a1a0b67
comparison
equal deleted inserted replaced
47753:aca197f5ef7d 47754:4d845260a713
656 # before all other actions 656 # before all other actions
657 repo.dirstate.update_file( 657 repo.dirstate.update_file(
658 lfile, p1_tracked=True, wc_tracked=False 658 lfile, p1_tracked=True, wc_tracked=False
659 ) 659 )
660 # make sure lfile doesn't get synclfdirstate'd as normal 660 # make sure lfile doesn't get synclfdirstate'd as normal
661 lfdirstate.add(lfile) 661 lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True)
662 lfdirstate.write() 662 lfdirstate.write()
663 663
664 return orig(repo, actions, branchmerge, getfiledata) 664 return orig(repo, actions, branchmerge, getfiledata)
665 665
666 666