Mercurial > public > mercurial-scm > hg-stable
diff hgext/win32text.py @ 6508:4b2c266bf059
Get rid of reimplementations of util.binary
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 09 Apr 2008 15:49:20 -0700 |
parents | ab8038bf5127 |
children | 37ab2331b94c |
line wrap: on
line diff
--- a/hgext/win32text.py Tue Apr 08 13:19:36 2008 +0200 +++ b/hgext/win32text.py Wed Apr 09 15:49:20 2008 -0700 @@ -64,27 +64,23 @@ def macdumbencode(s, cmd): return s.replace('\r', '\n') -def clevertest(s, cmd): - if '\0' in s: return False - return True - def cleverdecode(s, cmd, **kwargs): - if clevertest(s, cmd): + if not util.binary(s): return dumbdecode(s, cmd, **kwargs) return s def cleverencode(s, cmd): - if clevertest(s, cmd): + if not util.binary(s): return dumbencode(s, cmd) return s def macdecode(s, cmd, **kwargs): - if clevertest(s, cmd): + if not util.binary(s): return macdumbdecode(s, cmd, **kwargs) return s def macencode(s, cmd): - if clevertest(s, cmd): + if not util.binary(s): return macdumbencode(s, cmd) return s @@ -107,7 +103,7 @@ if f not in c: continue data = c[f].data() - if '\0' not in data and newline in data: + if not util.binary(data) and newline in data: if not halt: ui.warn(_('Attempt to commit or push text file(s) ' 'using %s line endings\n') %