Mercurial > hg-stable

changeset 38566:6ec996e8c9bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: pass an explicit `diffopts` objet to context.diff
author Boris Feld <boris.feld@octobus.net>
date Sat, 23 Jun 2018 14:37:10 +0200
parents 64f15e22f4f8
children 1770416de208
files mercurial/revset.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Sat Jun 23 14:30:31 2018 +0200
+++ b/mercurial/revset.py	Sat Jun 23 14:37:10 2018 +0200
@@ -33,6 +33,7 @@
 )
 from .utils import (
     dateutil,
+    diffutil,
     stringutil,
 )
 
@@ -1803,7 +1804,8 @@
         'phase': lambda r: repo[r].phase(),
         'substate': lambda r: repo[r].substate,
         'summary': lambda r: repo[r].description().splitlines()[0],
-        'diff': lambda r: list(repo[r].diff(opts={'git': True}),)
+        'diff': lambda r: list(repo[r].diff(
+            opts=diffutil.diffopts(repo.ui, {'git': True}))),
     }
     for info in fields:
         getfield = _funcs.get(info, None)