Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/dirstate.py @ 1610:84e9b3484ff6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
if hgignore contains errors, print message that is not confusing.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 02 Jan 2006 15:48:16 -0800
parents 34579a67fa71
children ece5d785e87a
line wrap: on
line diff
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -68,7 +68,8 @@ class dirstate(object):
                     try:
                         syntax = syntaxes[s]
                     except KeyError:
-                        self.ui.warn(_("ignoring invalid syntax '%s'\n") % s)
+                        self.ui.warn(_(".hgignore: ignoring invalid "
+                                       "syntax '%s'\n") % s)
                     continue
                 pat = syntax + line
                 for s in syntaxes.values():
@@ -88,7 +89,8 @@ class dirstate(object):
             ignore = self.hgignore()
             if ignore:
                 files, self.ignorefunc, anypats = util.matcher(self.root,
-                                                               inc=ignore)
+                                                               inc=ignore,
+                                                               src='.hgignore')
             else:
                 self.ignorefunc = util.never
         return self.ignorefunc(fn)