From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 29 Jul 2007 08:38:07 +0000 (-0700)
Subject: Merge with head. style.py was also missing an argument in one call to modified_lines.
X-Git-Tag: m5_2.0_beta4~253
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5c64823fc4eb783b70d57c6c88673dad4548696;p=gem5.git

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

--HG--
extra : convert_revision : 0f4e23007399f9d0e2be5310062bd61f5415550d
---

c5c64823fc4eb783b70d57c6c88673dad4548696
diff --cc util/style.py
index 897617779,7238b9801..3d7336388
--- a/util/style.py
+++ b/util/style.py
@@@ -301,9 -303,10 +303,10 @@@ def check_whitespace(ui, repo, hooktype
          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()