changeset 24522 | 18085e46caa9 |
parent 24521 | 489026bffbf6 |
child 24523 | a4b81dbe73c1 |
--- a/mercurial/dirstate.py Sun Mar 29 23:27:25 2015 -0700 +++ b/mercurial/dirstate.py Sun Mar 29 23:28:30 2015 -0700 @@ -599,7 +599,6 @@ matchedir = match.explicitdir badfn = match.bad dmap = self._map - normpath = util.normpath lstat = os.lstat getkind = stat.S_IFMT dirkind = stat.S_IFDIR @@ -636,9 +635,9 @@ alldirs = None for ff in files: if normalize: - nf = normalize(normpath(ff), False, True) + nf = normalize(ff, False, True) else: - nf = normpath(ff) + nf = ff if nf in results: continue