--- a/mercurial/hgweb/webutil.py	Wed Oct 04 15:27:43 2017 +0200
+++ b/mercurial/hgweb/webutil.py	Thu Oct 05 21:20:08 2017 +0200
@@ -479,7 +479,7 @@
     parity = paritygen(web.stripecount)
 
     diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts)
-    for blockno, (header, hunks) in enumerate(diffhunks, 1):
+    for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1):
         if style != 'raw':
             header = header[1:]
         lines = [h + '\n' for h in header]