bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Don't complain about \r when core.autocrlf is on in Git"

Browse source 
This reverts commit 828afaa2fa.
This commit is contained in:
Patrick Walton 2010-08-18 15:24:44 -07:00
parent 828afaa2fa
commit 724d7235e5
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/etc/tidy.py
View file

@ -1,16 +1,10 @@
#!/usr/bin/python #!/usr/bin/python
import sys, fileinput, subprocess import sys, fileinput
err=0 err=0
cols=78 cols=78
try:
result=subprocess.check_output([ "git", "config", "core.autocrlf" ])
autocrlf=result.strip() == b"true"
except CalledProcessError:
autocrlf=False
def report_err(s): def report_err(s):
global err global err
print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s)) print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s))
@ -20,11 +14,10 @@ for line in fileinput.input(openhook=fileinput.hook_encoded("utf-8")):
if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1: if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1:
report_err("tab character") report_err("tab character")
if not autocrlf and line.find('\r') != -1: if line.find('\r') != -1:
report_err("CR character") report_err("CR character")
line_len = len(line)-2 if autocrlf else len(line)-1 if len(line)-1 > cols:
if line_len > cols:
report_err("line longer than %d chars" % cols) report_err("line longer than %d chars" % cols)