equal
deleted
inserted
replaced
939 |
939 |
940 results are yielded in a tuple (src, filename), where src |
940 results are yielded in a tuple (src, filename), where src |
941 is one of: |
941 is one of: |
942 'f' the file was found in the directory tree |
942 'f' the file was found in the directory tree |
943 'm' the file was only in the dirstate and not in the tree |
943 'm' the file was only in the dirstate and not in the tree |
944 'b' file was not found and matched badmatch |
|
945 ''' |
944 ''' |
946 |
945 |
947 if node: |
946 if node: |
948 fdict = dict.fromkeys(match.files()) |
947 fdict = dict.fromkeys(match.files()) |
949 # for dirstate.walk, files=['.'] means "walk the whole tree". |
948 # for dirstate.walk, files=['.'] means "walk the whole tree". |
963 ffiles = fdict.keys() |
962 ffiles = fdict.keys() |
964 ffiles.sort() |
963 ffiles.sort() |
965 for fn in ffiles: |
964 for fn in ffiles: |
966 if match.bad(fn, 'No such file in rev ' + short(node)) \ |
965 if match.bad(fn, 'No such file in rev ' + short(node)) \ |
967 and match(fn): |
966 and match(fn): |
968 yield 'b', fn |
967 yield 'f', fn |
969 else: |
968 else: |
970 for src, fn in self.dirstate.walk(match): |
969 for src, fn in self.dirstate.walk(match): |
971 yield src, fn |
970 yield src, fn |
972 |
971 |
973 def status(self, node1=None, node2=None, files=[], match=util.always, |
972 def status(self, node1=None, node2=None, files=[], match=util.always, |