comparison hgext/largefiles/overrides.py @ 45345:e5b4061f32be

mergeresult: add `files()` and use it `files()` will return a list of files on which an action needs to be performed. This is a step to stop exposing the underlying map to the user of this object. Differential Revision: https://phab.mercurial-scm.org/D8887
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 15:41:23 +0530
parents 4c6004afd836
children 490607efc992
comparison
equal deleted inserted replaced
45344:4c6004afd836 45345:e5b4061f32be
560 if overwrite: 560 if overwrite:
561 return mresult 561 return mresult
562 562
563 # Convert to dictionary with filename as key and action as value. 563 # Convert to dictionary with filename as key and action as value.
564 lfiles = set() 564 lfiles = set()
565 for f in mresult.actions: 565 for f in mresult.files():
566 splitstandin = lfutil.splitstandin(f) 566 splitstandin = lfutil.splitstandin(f)
567 if splitstandin is not None and splitstandin in p1: 567 if splitstandin is not None and splitstandin in p1:
568 lfiles.add(splitstandin) 568 lfiles.add(splitstandin)
569 elif lfutil.standin(f) in p1: 569 elif lfutil.standin(f) in p1:
570 lfiles.add(f) 570 lfiles.add(f)