Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: explicitly honor all diffopts
authorSiddharth Agarwal <sid0@fb.com>
Tue, 18 Nov 2014 22:18:05 -0800
changeset 23456 e1086c7dd3c4
parent 23455 265034f4e27c
child 23457 fc76f55705eb
diff: explicitly honor all diffopts 'hg diff' should naturally honor all diffopts.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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'))
mercurial