Mercurial > hg
changeset 6746:1dca460e7d1e
rename checkfolding to checkcase
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 26 Jun 2008 13:58:24 -0500 |
| parents | ed01fa8ceaa6 |
| children | f6c00b17387c |
| files | hgext/purge.py mercurial/commands.py mercurial/dirstate.py mercurial/merge.py mercurial/util.py |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/purge.py Thu Jun 26 13:58:22 2008 -0500 +++ b/hgext/purge.py Thu Jun 26 13:58:24 2008 -0500 @@ -118,8 +118,8 @@ # notice a modified README file if the user ran "hg purge readme" modified, added, removed, deleted = repo.status()[:4] if modified or added or removed or deleted: - if not util.checkfolding(repo.path) and not ui.quiet: - ui.warn(_("Purging on name mangling filesystems is not " + if not util.checkcase(repo.path) and not ui.quiet: + ui.warn(_("Purging on case-insensitive filesystems is not " "fully supported.\n")) raise util.Abort(_("outstanding uncommitted changes"))
--- a/mercurial/commands.py Thu Jun 26 13:58:22 2008 -0500 +++ b/mercurial/commands.py Thu Jun 26 13:58:24 2008 -0500 @@ -643,7 +643,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.checkcase('.debugfsinfo') and 'yes' or 'no')) os.unlink('.debugfsinfo')
--- a/mercurial/dirstate.py Thu Jun 26 13:58:22 2008 -0500 +++ b/mercurial/dirstate.py Thu Jun 26 13:58:24 2008 -0500 @@ -76,11 +76,11 @@ elif name == '_checkexec': self._checkexec = util.checkexec(self._root) return self._checkexec - elif name == '_folding': - self._folding = not util.checkfolding(self._join('.hg')) - return self._folding + elif name == '_checkcase': + self._checkcase = not util.checkcase(self._join('.hg')) + return self._checkcase elif name == 'normalize': - if self._folding: + if self._checkcase: self.normalize = self._normalize else: self.normalize = lambda x: x
--- a/mercurial/merge.py Thu Jun 26 13:58:22 2008 -0500 +++ b/mercurial/merge.py Thu Jun 26 13:58:24 2008 -0500 @@ -460,7 +460,7 @@ action = [] if not force: _checkunknown(wc, p2) - if not util.checkfolding(repo.path): + if not util.checkcase(repo.path): _checkcollision(p2) action += _forgetremoved(wc, p2, branchmerge) action += manifestmerge(repo, wc, p2, pa, overwrite, partial)