equal
deleted
inserted
replaced
540 if any(fn == s or fn.startswith(s + '/') |
540 if any(fn == s or fn.startswith(s + '/') |
541 for s in self.substate): |
541 for s in self.substate): |
542 return |
542 return |
543 match.bad(fn, _('no such file in rev %s') % self) |
543 match.bad(fn, _('no such file in rev %s') % self) |
544 |
544 |
545 m = matchmod.badmatch(match, bad) |
545 m = matchmod.badmatch(self._repo.narrowmatch(match), bad) |
546 return self._manifest.walk(m) |
546 return self._manifest.walk(m) |
547 |
547 |
548 def matches(self, match): |
548 def matches(self, match): |
549 return self.walk(match) |
549 return self.walk(match) |
550 |
550 |
1166 """return the "best" ancestor context of self and c2""" |
1166 """return the "best" ancestor context of self and c2""" |
1167 return self._parents[0].ancestor(c2) # punt on two parents for now |
1167 return self._parents[0].ancestor(c2) # punt on two parents for now |
1168 |
1168 |
1169 def walk(self, match): |
1169 def walk(self, match): |
1170 '''Generates matching file names.''' |
1170 '''Generates matching file names.''' |
1171 return sorted(self._repo.dirstate.walk(match, |
1171 return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), |
1172 subrepos=sorted(self.substate), |
1172 subrepos=sorted(self.substate), |
1173 unknown=True, ignored=False)) |
1173 unknown=True, ignored=False)) |
1174 |
1174 |
1175 def matches(self, match): |
1175 def matches(self, match): |
1176 ds = self._repo.dirstate |
1176 ds = self._repo.dirstate |