equal
deleted
inserted
replaced
596 def ancestor(self, c2): |
596 def ancestor(self, c2): |
597 """return the ancestor context of self and c2""" |
597 """return the ancestor context of self and c2""" |
598 return self._parents[0].ancestor(c2) # punt on two parents for now |
598 return self._parents[0].ancestor(c2) # punt on two parents for now |
599 |
599 |
600 def walk(self, match): |
600 def walk(self, match): |
601 for src, fn, st in self._repo.dirstate.walk(match, True, False): |
601 for fn, st in self._repo.dirstate.walk(match, True, False): |
602 yield fn |
602 yield fn |
603 |
603 |
604 class workingfilectx(filectx): |
604 class workingfilectx(filectx): |
605 """A workingfilectx object makes access to data related to a particular |
605 """A workingfilectx object makes access to data related to a particular |
606 file in the working directory convenient.""" |
606 file in the working directory convenient.""" |