# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1416377885 28800
# Node ID e1086c7dd3c42f70fd347dd90742637f1579e364
# Parent  265034f4e27cfcf85000b3235a1481ac233c9e62
diff: explicitly honor all diffopts

'hg diff' should naturally honor all diffopts.

diff -r 265034f4e27c -r e1086c7dd3c4 mercurial/commands.py
--- a/mercurial/commands.py	Tue Nov 18 22:16:46 2014 -0800
+++ b/mercurial/commands.py	Tue Nov 18 22:18:05 2014 -0800
@@ -3073,7 +3073,7 @@
     if reverse:
         node1, node2 = node2, node1
 
-    diffopts = patch.diffopts(ui, opts)
+    diffopts = patch.diffallopts(ui, opts)
     m = scmutil.match(repo[node2], pats, opts)
     cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
                            listsubrepos=opts.get('subrepos'))