# HG changeset patch # User Paul Moore # Date 1212776603 -3600 # Node ID 33045179d079860a21fd86d34560bd6c4e9c06a9 # Parent 03a836ca6fdede24dc4f06c4cceb5520ffdc94be Add a new function, fspath The function, given a relative filename and a root, returns the filename modified to use the case actually stored in the filesystem (or None if the file does not exist). The returned name is relative to the root, but retains the path separators used in the input path. (This is not strictly necessary, but retaining the path separators minimises misleading test suite failures). A win32-specific implementation (using win32api.FindFiles) is possible, but it has not been implemented as testing seems to demonstrate that the win32-specific code is not significantly faster (thanks to the caching of results in the generic code). diff -r 03a836ca6fde -r 33045179d079 mercurial/util.py --- a/mercurial/util.py Fri Jun 06 08:29:16 2008 +0100 +++ b/mercurial/util.py Fri Jun 06 19:23:23 2008 +0100 @@ -859,6 +859,53 @@ except: return True +_fspathcache = {} +def fspath(name, root): + '''Get name in the case stored in the filesystem + + The name is either relative to root, or it is an absolute path starting + with root. Note that this function is unnecessary, and should not be + called, for case-sensitive filesystems (simply because it's expensive). + ''' + # If name is absolute, make it relative + if name.lower().startswith(root.lower()): + l = len(root) + if name[l] == os.sep or name[l] == os.altsep: + l = l + 1 + name = name[l:] + + if not os.path.exists(os.path.join(root, name)): + return None + + seps = os.sep + if os.altsep: + seps = seps + os.altsep + # Protect backslashes. This gets silly very quickly. + seps.replace('\\','\\\\') + pattern = re.compile(r'([^%s]+)|([%s]+)' % (seps, seps)) + dir = os.path.normcase(os.path.normpath(root)) + result = [] + for part, sep in pattern.findall(name): + if sep: + result.append(sep) + continue + + if dir not in _fspathcache: + _fspathcache[dir] = os.listdir(dir) + contents = _fspathcache[dir] + + lpart = part.lower() + for n in contents: + if n.lower() == lpart: + result.append(n) + break + else: + # Cannot happen, as the file exists! + result.append(part) + dir = os.path.join(dir, lpart) + + return ''.join(result) + def checkexec(path): """ Check whether the given path is on a filesystem with UNIX-like exec flags