equal
deleted
inserted
replaced
929 finally: |
929 finally: |
930 if not valid: # don't save our updated dirstate |
930 if not valid: # don't save our updated dirstate |
931 self.dirstate.invalidate() |
931 self.dirstate.invalidate() |
932 del tr, lock, wlock |
932 del tr, lock, wlock |
933 |
933 |
934 def walk(self, node=None, files=[], match=util.always, badmatch=None): |
934 def walk(self, node, files, match, badmatch): |
935 ''' |
935 ''' |
936 walk recursively through the directory tree or a given |
936 walk recursively through the directory tree or a given |
937 changeset, finding all files matched by the match |
937 changeset, finding all files matched by the match |
938 function |
938 function |
939 |
939 |
968 yield 'b', fn |
968 yield 'b', fn |
969 else: |
969 else: |
970 self.ui.warn(_('%s: No such file in rev %s\n') |
970 self.ui.warn(_('%s: No such file in rev %s\n') |
971 % (self.pathto(fn), short(node))) |
971 % (self.pathto(fn), short(node))) |
972 else: |
972 else: |
973 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch): |
973 for src, fn in self.dirstate.walk(files, match, badmatch): |
974 yield src, fn |
974 yield src, fn |
975 |
975 |
976 def status(self, node1=None, node2=None, files=[], match=util.always, |
976 def status(self, node1=None, node2=None, files=[], match=util.always, |
977 list_ignored=False, list_clean=False, list_unknown=True): |
977 list_ignored=False, list_clean=False, list_unknown=True): |
978 """return status of files between two nodes or node and working directory |
978 """return status of files between two nodes or node and working directory |