[PATCH] win32text: compact \0 test w/o touching mandatory filter args

Christian Ebert blacktrash at gmx.net
Sat Apr 5 13:26:13 CDT 2008


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1207419863 -7200
# Node ID 85aedc6ce00e661e1b9f48286af0f8f1d0e352b8
# Parent  ab8038bf512719e4d7d17c0660ae988f6fddead6
win32text: compact \0 test w/o touching mandatory filter args

Rename clevertest() to textonly().
Is used only within extension, so doesn't need 2nd argument.
Use textonly() also in forbidnewline.

diff --git a/hgext/win32text.py b/hgext/win32text.py
--- a/hgext/win32text.py
+++ b/hgext/win32text.py
@@ -64,27 +64,26 @@
 def macdumbencode(s, cmd):
     return s.replace('\r', '\n')
 
-def clevertest(s, cmd):
-    if '\0' in s: return False
-    return True
+def textonly(s):
+    return '\0' not in s
 
 def cleverdecode(s, cmd, **kwargs):
-    if clevertest(s, cmd):
+    if textonly(s):
         return dumbdecode(s, cmd, **kwargs)
     return s
 
 def cleverencode(s, cmd):
-    if clevertest(s, cmd):
+    if textonly(s):
         return dumbencode(s, cmd)
     return s
 
 def macdecode(s, cmd, **kwargs):
-    if clevertest(s, cmd):
+    if textonly(s):
         return macdumbdecode(s, cmd, **kwargs)
     return s
 
 def macencode(s, cmd):
-    if clevertest(s, cmd):
+    if textonly(s):
         return macdumbencode(s, cmd)
     return s
 
@@ -107,7 +106,7 @@
             if f not in c:
                 continue
             data = c[f].data()
-            if '\0' not in data and newline in data:
+            if textonly(data) and newline in data:
                 if not halt:
                     ui.warn(_('Attempt to commit or push text file(s) '
                               'using %s line endings\n') %


More information about the Mercurial-devel mailing list