diff -r 52e9310626a8 -r 2e32c6a31cc7 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Mon Oct 02 02:34:47 2017 -0700
+++ b/mercurial/hgweb/webcommands.py	Mon Oct 02 02:34:47 2017 -0700
@@ -906,7 +906,8 @@
 
         previousrev = None
         blockparitygen = paritygen(1)
-        for lineno, ((f, targetline), l) in enumerate(lines):
+        for lineno, (aline, l) in enumerate(lines):
+            f = aline.fctx
             rev = f.rev()
             if rev != previousrev:
                 blockhead = True
@@ -924,7 +925,7 @@
                    "file": f.path(),
                    "blockhead": blockhead,
                    "blockparity": blockparity,
-                   "targetline": targetline,
+                   "targetline": aline.lineno,
                    "line": l,
                    "lineno": lineno + 1,
                    "lineid": "l%d" % (lineno + 1),