Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/fileset.py @ 14700:848a6658069e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fileset: use correct function name for hgignore in docstring docstring refereed to "resolved" instead of "hgignore"
author Ollie Rutherfurd <orutherfurd@gmail.com>
date Sun, 19 Jun 2011 22:33:25 -0400
parents 15faf0e66909
children 4b93bd041772
comparison
equal deleted inserted replaced
14699:388af80c058b 14700:848a6658069e
226 return [] 226 return []
227 ms = merge.mergestate(mctx.ctx._repo) 227 ms = merge.mergestate(mctx.ctx._repo)
228 return [f for f in mctx.subset if f in ms and ms[f] == 'u'] 228 return [f for f in mctx.subset if f in ms and ms[f] == 'u']
229 229
230 def hgignore(mctx, x): 230 def hgignore(mctx, x):
231 """``resolved()`` 231 """``hgignore()``
232 File that matches the active .hgignore pattern. 232 File that matches the active .hgignore pattern.
233 """ 233 """
234 getargs(x, 0, 0, _("hgignore takes no arguments")) 234 getargs(x, 0, 0, _("hgignore takes no arguments"))
235 ignore = mctx.ctx._repo.dirstate._ignore 235 ignore = mctx.ctx._repo.dirstate._ignore
236 return [f for f in mctx.subset if ignore(f)] 236 return [f for f in mctx.subset if ignore(f)]