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

--HG--
extra : convert_revision : 0f4e23007399f9d0e2be5310062bd61f5415550d

diff --cc util/style.py
index 897617779b29ee5ccd18a78e5457a6ed350027ee,7238b980136b7bb7708954ad4850a9af749ad7a5..3d733638838b266a441bf76a5f4496b31fe8b52b
--- 1/util/style.py
--- 2/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()