Patchwork [09,of,12,V2] synthrepo: pass a diffopts object to context.diff

login
register
mail settings
Submitter Boris Feld
Date July 3, 2018, 10:32 a.m.
Message ID <d05882e5af1a7d482eed.1530613948@FB-lair>
Download mbox | patch
Permalink /patch/32575/
State Accepted
Headers show

Comments

Boris Feld - July 3, 2018, 10:32 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1529757988 -7200
#      Sat Jun 23 14:46:28 2018 +0200
# Node ID d05882e5af1a7d482eedea7aebc7eb1cba000643
# Parent  d2d2b80cc405fdb1e93c257e7290851069040ca8
# EXP-Topic diff-cleanup
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r d05882e5af1a
synthrepo: pass a diffopts object to context.diff

Patch

diff --git a/contrib/synthrepo.py b/contrib/synthrepo.py
--- a/contrib/synthrepo.py
+++ b/contrib/synthrepo.py
@@ -60,7 +60,10 @@  from mercurial import (
     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
@@ -196,8 +199,9 @@  def analyze(ui, repo, *revs, **opts):
             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: