##// END OF EJS Templates
rename checkfolding to checkcase
Matt Mackall -
r6746:1dca460e default
parent child Browse files
Show More
@@ -118,8 +118,8 b' def _check_fs(ui, repo):'
118 # notice a modified README file if the user ran "hg purge readme"
118 # notice a modified README file if the user ran "hg purge readme"
119 modified, added, removed, deleted = repo.status()[:4]
119 modified, added, removed, deleted = repo.status()[:4]
120 if modified or added or removed or deleted:
120 if modified or added or removed or deleted:
121 if not util.checkfolding(repo.path) and not ui.quiet:
121 if not util.checkcase(repo.path) and not ui.quiet:
122 ui.warn(_("Purging on name mangling filesystems is not "
122 ui.warn(_("Purging on case-insensitive filesystems is not "
123 "fully supported.\n"))
123 "fully supported.\n"))
124 raise util.Abort(_("outstanding uncommitted changes"))
124 raise util.Abort(_("outstanding uncommitted changes"))
125
125
@@ -643,7 +643,7 b' def debugfsinfo(ui, path = "."):'
643 file('.debugfsinfo', 'w').write('')
643 file('.debugfsinfo', 'w').write('')
644 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
644 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
645 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
645 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
646 ui.write('case-sensitive: %s\n' % (util.checkfolding('.debugfsinfo')
646 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
647 and 'yes' or 'no'))
647 and 'yes' or 'no'))
648 os.unlink('.debugfsinfo')
648 os.unlink('.debugfsinfo')
649
649
@@ -76,11 +76,11 b' class dirstate(object):'
76 elif name == '_checkexec':
76 elif name == '_checkexec':
77 self._checkexec = util.checkexec(self._root)
77 self._checkexec = util.checkexec(self._root)
78 return self._checkexec
78 return self._checkexec
79 elif name == '_folding':
79 elif name == '_checkcase':
80 self._folding = not util.checkfolding(self._join('.hg'))
80 self._checkcase = not util.checkcase(self._join('.hg'))
81 return self._folding
81 return self._checkcase
82 elif name == 'normalize':
82 elif name == 'normalize':
83 if self._folding:
83 if self._checkcase:
84 self.normalize = self._normalize
84 self.normalize = self._normalize
85 else:
85 else:
86 self.normalize = lambda x: x
86 self.normalize = lambda x: x
@@ -460,7 +460,7 b' def update(repo, node, branchmerge, forc'
460 action = []
460 action = []
461 if not force:
461 if not force:
462 _checkunknown(wc, p2)
462 _checkunknown(wc, p2)
463 if not util.checkfolding(repo.path):
463 if not util.checkcase(repo.path):
464 _checkcollision(p2)
464 _checkcollision(p2)
465 action += _forgetremoved(wc, p2, branchmerge)
465 action += _forgetremoved(wc, p2, branchmerge)
466 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
466 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
@@ -839,7 +839,7 b' def groupname(gid=None):'
839
839
840 # File system features
840 # File system features
841
841
842 def checkfolding(path):
842 def checkcase(path):
843 """
843 """
844 Check whether the given path is on a case-sensitive filesystem
844 Check whether the given path is on a case-sensitive filesystem
845
845
General Comments 0
You need to be logged in to leave comments. Login now