windows: force specified path to be audited in localpath form stable
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 24 Dec 2011 19:01:07 +0900
branchstable
changeset 15721 4751d5133f15
parent 15701 32a6e00e4cfe
child 15722 417127af3996
windows: force specified path to be audited in localpath form pathauditor is invoked not only for localpath form using "os.sep" as separator, but also for normalized form using "/": for example, hg internal path like "store/data" under ".hg", or ones normalized by match object this causes insufficient repository nesting check, because current pathauditor implementation divides specified path into components by "os.sep", and this causes to treat multiple path components joined by "/" as single one on Windows environment. this patch applies "util.localpath()" on specified path to force it to be divided into components correctly. in fact, root for pathauditor also uses multiple path separator on Windows. but this does not affect audit itself, so "util.localpath()" is not applied on it.
mercurial/scmutil.py
--- a/mercurial/scmutil.py	Tue Dec 20 14:11:14 2011 -0600
+++ b/mercurial/scmutil.py	Sat Dec 24 19:01:07 2011 +0900
@@ -85,6 +85,7 @@
         '''Check the relative path.
         path may contain a pattern (e.g. foodir/**.txt)'''
 
+        path = util.localpath(path)
         normpath = self.normcase(path)
         if normpath in self.audited:
             return