mercurial/context.py
changeset 43106 d783f945a701
parent 43089 c59eb1560c44
child 43117 8ff1ecfadcd1
equal deleted inserted replaced
43105:649d3ac37a12 43106:d783f945a701
   124         removed = []
   124         removed = []
   125         clean = []
   125         clean = []
   126         deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
   126         deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
   127         deletedset = set(deleted)
   127         deletedset = set(deleted)
   128         d = mf1.diff(mf2, match=match, clean=listclean)
   128         d = mf1.diff(mf2, match=match, clean=listclean)
   129         for fn, value in d.iteritems():
   129         for fn, value in pycompat.iteritems(d):
   130             if fn in deletedset:
   130             if fn in deletedset:
   131                 continue
   131                 continue
   132             if value is None:
   132             if value is None:
   133                 clean.append(fn)
   133                 clean.append(fn)
   134                 continue
   134                 continue