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 fn, st in util.sort(self._repo.dirstate.walk(match, True, False)): |
601 return util.sort(self._repo.dirstate.walk(match, True, False).keys()) |
602 yield fn |
|
603 |
602 |
604 class workingfilectx(filectx): |
603 class workingfilectx(filectx): |
605 """A workingfilectx object makes access to data related to a particular |
604 """A workingfilectx object makes access to data related to a particular |
606 file in the working directory convenient.""" |
605 file in the working directory convenient.""" |
607 def __init__(self, repo, path, filelog=None, workingctx=None): |
606 def __init__(self, repo, path, filelog=None, workingctx=None): |