mercurial/context.py
changeset 48913 f254fc73d956
parent 48875 6000f5b25c9b
child 48946 642e31cb55f0
equal deleted inserted replaced
48912:a0674e916fb6 48913:f254fc73d956
   121         removed = []
   121         removed = []
   122         clean = []
   122         clean = []
   123         deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
   123         deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
   124         deletedset = set(deleted)
   124         deletedset = set(deleted)
   125         d = mf1.diff(mf2, match=match, clean=listclean)
   125         d = mf1.diff(mf2, match=match, clean=listclean)
   126         for fn, value in pycompat.iteritems(d):
   126         for fn, value in d.items():
   127             if fn in deletedset:
   127             if fn in deletedset:
   128                 continue
   128                 continue
   129             if value is None:
   129             if value is None:
   130                 clean.append(fn)
   130                 clean.append(fn)
   131                 continue
   131                 continue