# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1529757988 -7200
# Node ID 97469c5430cd2cf760d8f8d3e78998d32d8bfe25
# Parent  1770416de208ccd84f3fbfd50d2e40b0c54655df
synthrepo: pass a diffopts object to context.diff

diff -r 1770416de208 -r 97469c5430cd contrib/synthrepo.py
--- a/contrib/synthrepo.py	Sat Jun 23 14:42:58 2018 +0200
+++ b/contrib/synthrepo.py	Sat Jun 23 14:46:28 2018 +0200
@@ -60,7 +60,10 @@
     registrar,
     scmutil,
 )
-from mercurial.utils import dateutil
+from mercurial.utils import (
+    dateutil,
+    diffutil,
+)
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
@@ -193,8 +196,9 @@
             if lastctx.rev() != nullrev:
                 timedelta = ctx.date()[0] - lastctx.date()[0]
                 interarrival[roundto(timedelta, 300)] += 1
+            diffopts = diffutil.diffopts(ctx._repo.ui, {'git': True})
             diff = sum((d.splitlines()
-                       for d in ctx.diff(pctx, opts={'git': True})), [])
+                       for d in ctx.diff(pctx, opts=diffopts)), [])
             fileadds, diradds, fileremoves, filechanges = 0, 0, 0, 0
             for filename, mar, lineadd, lineremove, isbin in parsegitdiff(diff):
                 if isbin: