[PATCH 2 of 3] Rename util.checkfolding to util.case_sensitive_fs

[Gilles Moris]

4 files changed, 4 insertions(+), 4 deletions(-)
hgext/purge.py        |    2 +-
mercurial/commands.py |    2 +-
mercurial/merge.py    |    2 +-
mercurial/util.py     |    2 +-


# HG changeset patch
# User Gilles Moris <gilles.moris at free.fr>
# Date 1207810213 -7200
# Node ID c0d7019014b4a2f605c78853aabfc03a243938d3
# Parent  1bd769993474e4b9131e228658f9d113adbedc97
Rename util.checkfolding to util.case_sensitive_fs

diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -92,7 +92,7 @@
 
     # We can't use (files, match) to do a partial walk here - we wouldn't
     # notice a modified README file if the user ran "hg purge readme"
-    if not util.checkfolding(repo.path):
+    if not util.case_sensitive_fs(repo.path):
         modified, added, removed, deleted = repo.status()[:4]
         if modified or added or removed or deleted:
             if not ui.quiet:
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -633,7 +633,7 @@
     file('.debugfsinfo', 'w').write('')
     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('case-sensitive: %s\n' % (util.checkfolding('.debugfsinfo')
+    ui.write('case-sensitive: %s\n' % (util.case_sensitive_fs('.debugfsinfo')
                                 and 'yes' or 'no'))
     os.unlink('.debugfsinfo')
 
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -388,7 +388,7 @@
         action = []
         if not force:
             _checkunknown(wc, p2)
-        if not util.checkfolding(repo.path):
+        if not util.case_sensitive_fs(repo.path):
             _checkcollision(p2)
         action += _forgetremoved(wc, p2, branchmerge)
         action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -849,7 +849,7 @@
 
 # File system features
 
-def checkfolding(path):
+def case_sensitive_fs(path):
     """
     Check whether the given path is on a case-sensitive filesystem