mercurial/dirstate.py
branchstable
changeset 16323 0789d1bbf6c1
parent 16313 e785456f9631
child 16472 14a4e17f0817
equal deleted inserted replaced
16322:ba96dd4655a0 16323:0789d1bbf6c1
   404                 folded = path
   404                 folded = path
   405             else:
   405             else:
   406                 # recursively normalize leading directory components
   406                 # recursively normalize leading directory components
   407                 # against dirstate
   407                 # against dirstate
   408                 if '/' in normed:
   408                 if '/' in normed:
   409                     d, f = normed.rsplit('/')
   409                     d, f = normed.rsplit('/', 1)
   410                     d = self._root + "/" + self._normalize(d, isknown)
   410                     d = self._normalize(d, isknown)
   411                     folded = d + "/" + util.fspath(f, d)
   411                     r = self._root + "/" + d
       
   412                     folded = d + "/" + util.fspath(f, r)
   412                 else:
   413                 else:
   413                     folded = util.fspath(normed, self._root)
   414                     folded = util.fspath(normed, self._root)
   414                 self._foldmap[normed] = folded
   415                 self._foldmap[normed] = folded
   415 
   416 
   416         return folded
   417         return folded