[PATCH 7 of 7] diff: explicitly honor all diffopts
Siddharth Agarwal
sid0 at fb.com
Tue Dec 2 12:30:18 CST 2014
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1416377885 28800
# Tue Nov 18 22:18:05 2014 -0800
# Node ID 5df493747317f59f7dd583e4fb1a769d4ea5aa3a
# Parent 59ce174f5a6af8ed82baa4f7da0ede3329547c1d
diff: explicitly honor all diffopts
'hg diff' should naturally honor all diffopts.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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'))
More information about the Mercurial-devel
mailing list