[PATCH 2 of 5] kill scmutil.showportabilityalert

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


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1304199090 -7200
# Node ID 9ff4c9a7345d9f6755dea7b4804271bc3b550566
# Parent  000abf5b57252058dcc330725c7645132d001be7
kill scmutil.showportabilityalert

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1316,7 +1316,8 @@
     wctx = repo[None]
     wctx.status(clean=True)
     existing = None
-    if scmutil.showportabilityalert(ui):
+    abort, warn = scmutil.checkportabilityalert(ui)
+    if abort or warn:
         existing = dict([(fn.lower(), fn) for fn in
                          wctx.added() + wctx.clean() + wctx.modified()])
     for f in repo.walk(match):
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -17,7 +17,8 @@
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''
     checkfilename(f)
-    if showportabilityalert(ui):
+    abort, warn = checkportabilityalert(ui)
+    if abort or warn:
         msg = util.checkwinfilename(f)
         if msg:
             portabilityalert(ui, "%s: %r" % (msg, f))
@@ -35,11 +36,6 @@
             _("ui.portablefilenames value is invalid ('%s')") % val)
     return abort, warn
 
-def showportabilityalert(ui):
-    '''check if the user wants any notification of portability problems'''
-    abort, warn = checkportabilityalert(ui)
-    return abort or warn
-
 def portabilityalert(ui, msg):
     if not msg:
         return


More information about the Mercurial-devel mailing list