[PATCH 3 of 5] scmutil: eliminate checkportabilityalert call in portabilityalert

Adrian Buehlmann adrian at cadifra.com
Sat Apr 30 18:20:10 CDT 2011


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1304199436 -7200
# Node ID e4ad6b8376cf7dcf8826173b6e308bf85c5b9d0f
# Parent  9ff4c9a7345d9f6755dea7b4804271bc3b550566
scmutil: eliminate checkportabilityalert call in portabilityalert

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1325,8 +1325,8 @@
         if exact or f not in repo.dirstate:
             if existing:
                 if f.lower() in existing and existing[f.lower()] != f:
-                    scmutil.portabilityalert(
-                        ui, _('possible case-folding collision for %s') % f)
+                    scmutil.portabilityalert(ui, abort, warn,
+                        _('possible case-folding collision for %s') % f)
                 existing[f.lower()] = f
             names.append(f)
             if ui.verbose or not exact:
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -21,7 +21,7 @@
     if abort or warn:
         msg = util.checkwinfilename(f)
         if msg:
-            portabilityalert(ui, "%s: %r" % (msg, f))
+            portabilityalert(ui, abort, warn, "%s: %r" % (msg, f))
 
 def checkportabilityalert(ui):
     '''check if the user's config requests nothing, a warning, or abort for
@@ -36,10 +36,7 @@
             _("ui.portablefilenames value is invalid ('%s')") % val)
     return abort, warn
 
-def portabilityalert(ui, msg):
-    if not msg:
-        return
-    abort, warn = checkportabilityalert(ui)
+def portabilityalert(ui, abort, warn, msg):
     if abort:
         raise util.Abort("%s" % msg)
     elif warn:


More information about the Mercurial-devel mailing list