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

Remove the pointless, repository destroying assertion and just have the script check every line in the file if it cannot get context information.

Browse source
This commit is contained in:
Clint Smullen 2008-11-15 00:21:31 -05:00
parent 640b415688
commit ba8936120e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
util/style.py
View file

@ -314,14 +314,16 @@ def do_check_whitespace(ui, repo, *files, **args):
fctx = wctx.filectx(fname)
pctx = fctx.parents()
assert len(pctx) in (1, 2)
file_data = fctx.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, len(lines))
mod_lines = mod_lines & m2 # only the lines that are new in both
if len(pctx) in (1, 2):
mod_lines = modified_lines(pctx[0].data(), file_data, len(lines))
if len(pctx) == 2:
m2 = modified_lines(pctx[1].data(), file_data, len(lines))
mod_lines = mod_lines & m2 # only the lines that are new in both
else:
mod_lines = xrange(0, len(lines))
fixonly = set()
for i,line in enumerate(lines):