[PATCH 1 of 5] inline scmutil.checkcasecollision at its single call place
Adrian Buehlmann
adrian at cadifra.com
Sat Apr 30 18:20:08 CDT 2011
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1304198820 -7200
# Node ID 000abf5b57252058dcc330725c7645132d001be7
# Parent e83ced8b6464ff8f4c6cd9e4b780ba4b5d6208e0
inline scmutil.checkcasecollision at its single call place
and kill it
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1323,7 +1323,10 @@
exact = match.exact(f)
if exact or f not in repo.dirstate:
if existing:
- scmutil.checkcasecollision(ui, f, existing)
+ if f.lower() in existing and existing[f.lower()] != f:
+ scmutil.portabilityalert(
+ ui, _('possible case-folding collision for %s') % f)
+ existing[f.lower()] = f
names.append(f)
if ui.verbose or not exact:
ui.status(_('adding %s\n') % match.rel(join(f)))
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -22,11 +22,6 @@
if msg:
portabilityalert(ui, "%s: %r" % (msg, f))
-def checkcasecollision(ui, f, files):
- if f.lower() in files and files[f.lower()] != f:
- portabilityalert(ui, _('possible case-folding collision for %s') % f)
- files[f.lower()] = f
-
def checkportabilityalert(ui):
'''check if the user's config requests nothing, a warning, or abort for
non-portable filenames'''
More information about the Mercurial-devel
mailing list