comparison mercurial/localrepo.py @ 6201:305d4450036a

Extend/correct acc40572da5b regarding -qA and ignored files. hg status -qA will now hide untracked files as described in the doc string.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 02 Mar 2008 13:52:34 +0100
parents d500aeb8092e
children 942287cb1f57
comparison
equal deleted inserted replaced
6200:acc40572da5b 6201:305d4450036a
957 else: 957 else:
958 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch): 958 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch):
959 yield src, fn 959 yield src, fn
960 960
961 def status(self, node1=None, node2=None, files=[], match=util.always, 961 def status(self, node1=None, node2=None, files=[], match=util.always,
962 list_ignored=False, list_clean=False): 962 list_ignored=False, list_clean=False, list_unknown=True):
963 """return status of files between two nodes or node and working directory 963 """return status of files between two nodes or node and working directory
964 964
965 If node1 is None, use the first dirstate parent instead. 965 If node1 is None, use the first dirstate parent instead.
966 If node2 is None, compare node1 with working directory. 966 If node2 is None, compare node1 with working directory.
967 """ 967 """
993 993
994 # are we comparing the working directory? 994 # are we comparing the working directory?
995 if not node2: 995 if not node2:
996 (lookup, modified, added, removed, deleted, unknown, 996 (lookup, modified, added, removed, deleted, unknown,
997 ignored, clean) = self.dirstate.status(files, match, 997 ignored, clean) = self.dirstate.status(files, match,
998 list_ignored, list_clean) 998 list_ignored, list_clean,
999 list_unknown)
999 1000
1000 # are we comparing working dir against its parent? 1001 # are we comparing working dir against its parent?
1001 if compareworking: 1002 if compareworking:
1002 if lookup: 1003 if lookup:
1003 fixup = [] 1004 fixup = []