comparison hgext/largefiles/overrides.py @ 47703:7d2f0e14da4c

largefile: use `update_file` instead of `normal` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11145
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 00:04:24 +0200
parents 0149d17da91b
children d46d3aefd00b
comparison
equal deleted inserted replaced
47702:0149d17da91b 47703:7d2f0e14da4c
1803 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) 1803 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1804 1804
1805 # to avoid leaving all largefiles as dirty and thus rehash them, mark 1805 # to avoid leaving all largefiles as dirty and thus rehash them, mark
1806 # all the ones that didn't change as clean 1806 # all the ones that didn't change as clean
1807 for lfile in oldclean.difference(filelist): 1807 for lfile in oldclean.difference(filelist):
1808 lfdirstate.normal(lfile) 1808 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
1809 lfdirstate.write() 1809 lfdirstate.write()
1810 1810
1811 if branchmerge or force or partial: 1811 if branchmerge or force or partial:
1812 filelist.extend(s.deleted + s.removed) 1812 filelist.extend(s.deleted + s.removed)
1813 1813