comparison mercurial/revset.py @ 38566:6ec996e8c9bc

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 54d7aaa243cc
children 152f4822d210
comparison
equal deleted inserted replaced
38565:64f15e22f4f8 38566:6ec996e8c9bc
31 stack as stackmod, 31 stack as stackmod,
32 util, 32 util,
33 ) 33 )
34 from .utils import ( 34 from .utils import (
35 dateutil, 35 dateutil,
36 diffutil,
36 stringutil, 37 stringutil,
37 ) 38 )
38 39
39 # helpers for processing parsed tree 40 # helpers for processing parsed tree
40 getsymbol = revsetlang.getsymbol 41 getsymbol = revsetlang.getsymbol
1801 'files': lambda r: repo[r].files(), 1802 'files': lambda r: repo[r].files(),
1802 'parents': lambda r: repo[r].parents(), 1803 'parents': lambda r: repo[r].parents(),
1803 'phase': lambda r: repo[r].phase(), 1804 'phase': lambda r: repo[r].phase(),
1804 'substate': lambda r: repo[r].substate, 1805 'substate': lambda r: repo[r].substate,
1805 'summary': lambda r: repo[r].description().splitlines()[0], 1806 'summary': lambda r: repo[r].description().splitlines()[0],
1806 'diff': lambda r: list(repo[r].diff(opts={'git': True}),) 1807 'diff': lambda r: list(repo[r].diff(
1808 opts=diffutil.diffopts(repo.ui, {'git': True}))),
1807 } 1809 }
1808 for info in fields: 1810 for info in fields:
1809 getfield = _funcs.get(info, None) 1811 getfield = _funcs.get(info, None)
1810 if getfield is None: 1812 if getfield is None:
1811 raise error.ParseError( 1813 raise error.ParseError(