Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 20033:f962870712da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pathutil: tease out a new library to break an import cycle from canonpath use
author Augie Fackler <raf@durin42.com>
date Wed, 06 Nov 2013 18:19:04 -0500
parents 601944f41257
children e40520642e64
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Nov 06 14:38:34 2013 -0500
+++ b/mercurial/dirstate.py	Wed Nov 06 18:19:04 2013 -0500
@@ -8,7 +8,7 @@
 
 from node import nullid
 from i18n import _
-import scmutil, util, ignore, osutil, parsers, encoding
+import scmutil, util, ignore, osutil, parsers, encoding, pathutil
 import os, stat, errno, gc
 
 propertycache = util.propertycache
@@ -736,7 +736,7 @@
                 # unknown == True means we walked the full directory tree above.
                 # So if a file is not seen it was either a) not matching matchfn
                 # b) ignored, c) missing, or d) under a symlink directory.
-                audit_path = scmutil.pathauditor(self._root)
+                audit_path = pathutil.pathauditor(self._root)
 
                 for nf in iter(visit):
                     # Report ignored items in the dmap as long as they are not