[PATCH] win32text: compact clevertest w/o touching mandatory filter args
Christian Ebert
blacktrash at gmx.net
Sat Apr 5 03:05:40 CDT 2008
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1207382594 -7200
# Node ID 354430b3a7462ed83cdb93b94023ce869ad7e8cb
# Parent 301d2441fae22d3d87826b1965e7505ef0a319d6
win32text: compact clevertest w/o touching mandatory filter args
diff --git a/hgext/win32text.py b/hgext/win32text.py
--- a/hgext/win32text.py
+++ b/hgext/win32text.py
@@ -46,17 +46,16 @@
def dumbencode(s, cmd):
return s.replace('\r\n', '\n')
-def clevertest(s, cmd):
- if '\0' in s: return False
- return True
+def clevertest(s):
+ return '\0' not in s
def cleverdecode(s, cmd, **kwargs):
- if clevertest(s, cmd):
+ if clevertest(s):
return dumbdecode(s, cmd, **kwargs)
return s
def cleverencode(s, cmd):
- if clevertest(s, cmd):
+ if clevertest(s):
return dumbencode(s, cmd)
return s
@@ -75,7 +74,7 @@
if f not in c:
continue
data = c[f].data()
- if '\0' not in data and '\r\n' in data:
+ if clevertest(data) and '\r\n' in data:
if not halt:
ui.warn(_('Attempt to commit or push text file(s) '
'using CRLF line endings\n'))
More information about the Mercurial-devel
mailing list