mercurial/context.py
changeset 22942 03602f76deee
parent 22932 d81792872984
child 23012 bdb3349cf7ab
equal deleted inserted replaced
22941:da2758c0aca0 22942:03602f76deee
  1061         for i, l in (("a", self._status.added), ("m", self._status.modified)):
  1061         for i, l in (("a", self._status.added), ("m", self._status.modified)):
  1062             for f in l:
  1062             for f in l:
  1063                 orig = copied.get(f, f)
  1063                 orig = copied.get(f, f)
  1064                 man[f] = getman(orig).get(orig, nullid) + i
  1064                 man[f] = getman(orig).get(orig, nullid) + i
  1065                 try:
  1065                 try:
  1066                     man.set(f, ff(f))
  1066                     man.setflag(f, ff(f))
  1067                 except OSError:
  1067                 except OSError:
  1068                     pass
  1068                     pass
  1069 
  1069 
  1070         for f in self._status.deleted + self._status.removed:
  1070         for f in self._status.deleted + self._status.removed:
  1071             if f in man:
  1071             if f in man:
  1387         """
  1387         """
  1388         mf = self._repo['.']._manifestmatches(match, s)
  1388         mf = self._repo['.']._manifestmatches(match, s)
  1389         modified, added, removed = s[0:3]
  1389         modified, added, removed = s[0:3]
  1390         for f in modified + added:
  1390         for f in modified + added:
  1391             mf[f] = None
  1391             mf[f] = None
  1392             mf.set(f, self.flags(f))
  1392             mf.setflag(f, self.flags(f))
  1393         for f in removed:
  1393         for f in removed:
  1394             if f in mf:
  1394             if f in mf:
  1395                 del mf[f]
  1395                 del mf[f]
  1396         return mf
  1396         return mf
  1397 
  1397