Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 6753:ed5ffb2c12f3
repo.status: eliminate list_
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 26 Jun 2008 14:35:50 -0500 |
parents | fb42030d79d6 |
children | f8299c84b5b6 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Jun 26 14:35:50 2008 -0500 +++ b/mercurial/localrepo.py Thu Jun 26 14:35:50 2008 -0500 @@ -972,7 +972,7 @@ yield fn def status(self, node1=None, node2=None, match=None, - list_ignored=False, list_clean=False, list_unknown=True): + ignored=False, clean=False, unknown=True): """return status of files between two nodes or node and working directory If node1 is None, use the first dirstate parent instead. @@ -994,6 +994,7 @@ if not match: match = match_.always(self.root, self.getcwd()) + listignored, listclean, listunknown = ignored, clean, unknown modified, added, removed, deleted, unknown = [], [], [], [], [] ignored, clean = [], [] @@ -1010,8 +1011,8 @@ # are we comparing the working directory? if not node2: (lookup, modified, added, removed, deleted, unknown, - ignored, clean) = self.dirstate.status(match, list_ignored, - list_clean, list_unknown) + ignored, clean) = self.dirstate.status(match, listignored, + listclean, listunknown) # are we comparing working dir against its parent? if compareworking: if lookup: @@ -1025,7 +1026,7 @@ modified.append(f) else: fixup.append(f) - if list_clean: + if listclean: clean.append(f) # update dirstate for files that are actually clean @@ -1073,7 +1074,7 @@ (mf1[fn] != mf2[fn] and (mf2[fn] != "" or fcmp(fn, getnode)))): modified.append(fn) - elif list_clean: + elif listclean: clean.append(fn) del mf1[fn] else: