Don't complain about \r when core.autocrlf is on in Git (now working with Python 2.6).
This commit is contained in:
parent
724d7235e5
commit
b4f92774d0
1 changed files with 9 additions and 3 deletions
|
@ -1,10 +1,15 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
|
||||||
import sys, fileinput
|
import sys, fileinput, subprocess
|
||||||
|
|
||||||
err=0
|
err=0
|
||||||
cols=78
|
cols=78
|
||||||
|
|
||||||
|
config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],
|
||||||
|
stdout=subprocess.PIPE)
|
||||||
|
result=config_proc.communicate()[0]
|
||||||
|
autocrlf=result.strip() == b"true" if result is not None else 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))
|
||||||
|
@ -14,10 +19,11 @@ 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 line.find('\r') != -1:
|
if not autocrlf and line.find('\r') != -1:
|
||||||
report_err("CR character")
|
report_err("CR character")
|
||||||
|
|
||||||
if len(line)-1 > cols:
|
line_len = len(line)-2 if autocrlf else len(line)-1
|
||||||
|
if line_len > cols:
|
||||||
report_err("line longer than %d chars" % cols)
|
report_err("line longer than %d chars" % cols)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue