sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge with head. style.py was also missing an argument in one call to modified_lines.

Browse source 
--HG--
extra : convert_revision : 0f4e23007399f9d0e2be5310062bd61f5415550d
This commit is contained in:
Gabe Black 2007-07-29 01:38:07 -07:00
parent 5e34c62b3b 41a1acd1e9
commit c5c64823fc
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
util/style.py
View file

@ -244,7 +244,7 @@ def validate(filename, stats, verbose, exit_code):
msg(i, line, 'improper spacing after %s' % match.group(1))
bad()
def modified_lines(old_data, new_data):
def modified_lines(old_data, new_data, max_lines):
from itertools import count
from mercurial import bdiff, mdiff
@ -256,6 +256,8 @@ def modified_lines(old_data, new_data):
modified.add(i)
elif i + 1 >= fend:
break
elif i > max_lines:
break
return modified
def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
@ -301,13 +303,14 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
assert len(pctx) in (1, 2)
file_data = fctx.data()
mod_lines = modified_lines(pctx[0].data(), file_data)
lines = mdiff.splitnewlines(file_data)
mod_lines = modified_lines(pctx[0].data(), file_data, len(lines))
if len(pctx) == 2:
m2 = modified_lines(pctx[1].data(), file_data)
m2 = modified_lines(pctx[1].data(), file_data, len(lines))
mod_lines = mod_lines & m2 # only the lines that are new in both
fixonly = set()
for i,line in enumerate(mdiff.splitnewlines(file_data)):
for i,line in enumerate(lines):
if i not in mod_lines:
continue