Skip to content
Snippets Groups Projects
Commit da3329fe01e3 authored by Denis Laxalde's avatar Denis Laxalde
Browse files

templatefuncs: account for user's diffopts in diff() (BC)

parent a614f26d4897
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,7 @@
)
from . import (
color,
diffutil,
encoding,
error,
minirst,
......@@ -86,7 +87,8 @@
for k, v in args['kwargs'].iteritems())
return templateutil.hybriddict(data)
@templatefunc('diff([includepattern [, excludepattern]])', requires={'ctx'})
@templatefunc('diff([includepattern [, excludepattern]])',
requires={'ctx', 'ui'})
def diff(context, mapping, args):
"""Show a diff, optionally
specifying files to include or exclude."""
......@@ -102,7 +104,10 @@
return []
ctx = context.resource(mapping, 'ctx')
chunks = ctx.diff(match=ctx.match([], getpatterns(0), getpatterns(1)))
ui = context.resource(mapping, 'ui')
diffopts = diffutil.diffallopts(ui)
chunks = ctx.diff(match=ctx.match([], getpatterns(0), getpatterns(1)),
opts=diffopts)
return ''.join(chunks)
......
......@@ -370,6 +370,17 @@
@@ -0,0 +1,1 @@
+second
$ hg --config diff.git=true log -r 8 -T "{diff()}"
diff --git a/second b/fourth
rename from second
rename to fourth
diff --git a/third b/third
new file mode 100644
--- /dev/null
+++ b/third
@@ -0,0 +1,1 @@
+third
$ cd ..
latesttag() function:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment