comparison hgext/largefiles/lfutil.py @ 47725:1f3a87a7a9b1

largefile: use `update_file` for `synclfdirstate` "m" case This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11167
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 05:47:54 +0200
parents b0a39b666e2d
children 068e09499d4e
comparison
equal deleted inserted replaced
47724:b0a39b666e2d 47725:1f3a87a7a9b1
567 lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True 567 lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True
568 ) 568 )
569 else: 569 else:
570 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) 570 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
571 elif state == b'm': 571 elif state == b'm':
572 lfdirstate.normallookup(lfile) 572 lfdirstate.update_file(
573 lfile, p1_tracked=True, wc_tracked=True, merged=True
574 )
573 elif state == b'r': 575 elif state == b'r':
574 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) 576 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False)
575 elif state == b'a': 577 elif state == b'a':
576 lfdirstate.add(lfile) 578 lfdirstate.add(lfile)
577 579