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

merge: style.py fix

Browse source 
--HG--
extra : convert_revision : 2bb456f292a862e1615c370c1d14a3f709860c38
This commit is contained in:
Nathan Binkert 2007-07-28 21:57:24 -07:00
commit 398f6a70a7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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