summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-07-29 01:38:07 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-07-29 01:38:07 -0700
commitc5c64823fc4eb783b70d57c6c88673dad4548696 (patch)
tree8a7a15a43575f68b0883b85a638b236fb184ac98 /util
parent5e34c62b3b3f54c826730841029a875607824c42 (diff)
parent41a1acd1e957d6856d5d5c0ddad3d39aa700c01d (diff)
downloadgem5-c5c64823fc4eb783b70d57c6c88673dad4548696.tar.xz
Merge with head. style.py was also missing an argument in one call to modified_lines.
--HG-- extra : convert_revision : 0f4e23007399f9d0e2be5310062bd61f5415550d
Diffstat (limited to 'util')
-rw-r--r--util/style.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/util/style.py b/util/style.py
index 897617779..3d7336388 100644
--- a/util/style.py
+++ b/util/style.py
@@ -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