Mercurial > hg-stable

changeset 9323:f6683a7011e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 26fa0e31011d. On OS X, it broke test-issue322, test-issue660, test-permissions, test-symlink-addremove, and test-walk.
author Brendan Cully <brendan@kublai.com>
date Wed, 05 Aug 2009 22:51:30 -0700
parents 26fa0e31011d
children 19d07553d1b2
files mercurial/dirstate.py tests/test-path-normalization tests/test-path-normalization.hg
diffstat 3 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Sun Jul 26 18:02:06 2009 +0200
+++ b/mercurial/dirstate.py	Wed Aug 05 22:51:30 2009 -0700
@@ -59,7 +59,7 @@
     def _foldmap(self):
         f = {}
         for name in self._map:
-            f[util.realpath(self._join(name))] = name
+            f[os.path.normcase(name)] = name
         return f
 
     @propertycache
@@ -340,7 +340,7 @@
             self._ui.warn(_("not in dirstate: %s\n") % f)
 
     def _normalize(self, path, knownpath):
-        norm_path = util.realpath(self._join(path))
+        norm_path = os.path.normcase(path)
         fold_path = self._foldmap.get(norm_path, None)
         if fold_path is None:
             if knownpath or not os.path.exists(os.path.join(self._root, path)):
--- a/tests/test-path-normalization	Sun Jul 26 18:02:06 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-hg clone --quiet $TESTDIR/test-path-normalization.hg t
-exec hg st -R t
Binary file tests/test-path-normalization.hg has changed