diff -r 776240123525 -r cbc180cfd60b mercurial/store.py
--- a/mercurial/store.py	Tue Sep 18 19:51:48 2012 +0200
+++ b/mercurial/store.py	Tue Sep 18 19:51:59 2012 +0200
@@ -215,10 +215,10 @@
     The string 'data/' at the beginning is replaced with 'dh/', if the hashed
     encoding was used.
     '''
-    ef = encodefilename(path).split('/')
+    path = encodedir(path)
+    ef = _encodefname(path).split('/')
     res = '/'.join(_auxencode(ef, dotencode))
     if len(res) > _maxstorepathlen:
-        path = encodedir(path)
         digest = _sha(path).hexdigest()
         le = lowerencode(path).split('/')[1:]
         parts = _auxencode(le, dotencode)