diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_aGdleHQvd2luMzJtYmNzLnB5..6f447b9ec2634873a60c871a2067325745553af2_aGdleHQvd2luMzJtYmNzLnB5 100644 --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -148,8 +148,8 @@ # NOTE: os.path.dirname() and os.path.basename() are safe because # they use result of os.path.split() funcs = '''os.path.join os.path.split os.path.splitext - os.path.normpath os.makedirs - mercurial.util.endswithsep mercurial.util.splitpath mercurial.util.checkcase + os.path.normpath os.makedirs mercurial.util.endswithsep + mercurial.util.splitpath mercurial.util.fscasesensitive mercurial.util.fspath mercurial.util.pconvert mercurial.util.normpath mercurial.util.checkwinfilename mercurial.util.checkosfilename mercurial.util.split''' diff --git a/mercurial/commands.py b/mercurial/commands.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2449,7 +2449,7 @@ ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) - ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') + ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo') and 'yes' or 'no')) os.unlink('.debugfsinfo') diff --git a/mercurial/context.py b/mercurial/context.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL2NvbnRleHQucHk=..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL2NvbnRleHQucHk= 100644 --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1501,7 +1501,7 @@ # Only a case insensitive filesystem needs magic to translate user input # to actual case in the filesystem. - if not util.checkcase(r.root): + if not util.fscasesensitive(r.root): return matchmod.icasefsmatcher(r.root, r.getcwd(), pats, include, exclude, default, r.auditor, self, listsubrepos=listsubrepos, diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL2RpcnN0YXRlLnB5..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL2RpcnN0YXRlLnB5 100644 --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -227,7 +227,7 @@ @propertycache def _checkcase(self): - return not util.checkcase(self._join('.hg')) + return not util.fscasesensitive(self._join('.hg')) def _join(self, f): # much faster than os.path.join() diff --git a/mercurial/merge.py b/mercurial/merge.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL21lcmdlLnB5..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL21lcmdlLnB5 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1586,7 +1586,7 @@ actions[m] = [] actions[m].append((f, args, msg)) - if not util.checkcase(repo.path): + if not util.fscasesensitive(repo.path): # check collision between files only in p2 for clean update if (not branchmerge and (force or not wc.dirty(missing=True, branch=False))): diff --git a/mercurial/pathutil.py b/mercurial/pathutil.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL3BhdGh1dGlsLnB5..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL3BhdGh1dGlsLnB5 100644 --- a/mercurial/pathutil.py +++ b/mercurial/pathutil.py @@ -40,7 +40,7 @@ self.root = root self._realfs = realfs self.callback = callback - if os.path.lexists(root) and not util.checkcase(root): + if os.path.lexists(root) and not util.fscasesensitive(root): self.normcase = util.normcase else: self.normcase = lambda x: x diff --git a/mercurial/util.py b/mercurial/util.py index 8a84347b9907ada91f9f3a21aca1fb62cac0fed5_bWVyY3VyaWFsL3V0aWwucHk=..6f447b9ec2634873a60c871a2067325745553af2_bWVyY3VyaWFsL3V0aWwucHk= 100644 --- a/mercurial/util.py +++ b/mercurial/util.py @@ -1213,7 +1213,7 @@ # File system features -def checkcase(path): +def fscasesensitive(path): """ Return true if the given path is on a case-sensitive filesystem