diff --git a/mercurial/merge.py b/mercurial/merge.py index 2a7fa7c641d80430659d589cf3316cfe6a7f81d9_bWVyY3VyaWFsL21lcmdlLnB5..5402fd9dd13ee73e66a732ad3d2f40dad1d0a221_bWVyY3VyaWFsL21lcmdlLnB5 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -7,7 +7,7 @@ from node import nullid, nullrev, hex, bin from i18n import _ -import scmutil, util, filemerge, copies, subrepo, encoding +import scmutil, util, filemerge, copies, subrepo import errno, os, shutil class mergestate(object): @@ -100,7 +100,7 @@ "check for case folding collisions in the destination context" folded = {} for fn in mctx: - fold = encoding.lower(fn) + fold = util.normcase(fn) if fold in folded: raise util.Abort(_("case-folding collision between %s and %s") % (fn, folded[fold])) diff --git a/mercurial/windows.py b/mercurial/windows.py index 2a7fa7c641d80430659d589cf3316cfe6a7f81d9_bWVyY3VyaWFsL3dpbmRvd3MucHk=..5402fd9dd13ee73e66a732ad3d2f40dad1d0a221_bWVyY3VyaWFsL3dpbmRvd3MucHk= 100644 --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -140,7 +140,7 @@ ''' # TODO: There may be a more clever way to do this that also handles other, # less common file systems. - return os.path.normpath(os.path.normcase(os.path.realpath(path))) + return os.path.normpath(normcase(os.path.realpath(path))) def samestat(s1, s2): return False @@ -216,6 +216,5 @@ def statfiles(files): '''Stat each file in files and yield stat or None if file does not exist. Cluster and cache stat per directory to minimize number of OS stat calls.''' - ncase = os.path.normcase dircache = {} # dirname -> filename -> status | None if file does not exist for nf in files: @@ -220,9 +219,9 @@ dircache = {} # dirname -> filename -> status | None if file does not exist for nf in files: - nf = ncase(nf) + nf = normcase(nf) dir, base = os.path.split(nf) if not dir: dir = '.' cache = dircache.get(dir, None) if cache is None: try: @@ -223,10 +222,10 @@ dir, base = os.path.split(nf) if not dir: dir = '.' cache = dircache.get(dir, None) if cache is None: try: - dmap = dict([(ncase(n), s) + dmap = dict([(normcase(n), s) for n, k, s in osutil.listdir(dir, True)]) except OSError, err: # handle directory not found in Python version prior to 2.5