comparison mercurial/commands.py @ 23456:e1086c7dd3c4

diff: explicitly honor all diffopts 'hg diff' should naturally honor all diffopts.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 18 Nov 2014 22:18:05 -0800
parents 265034f4e27c
children bd5dbb8a05c8
comparison
equal deleted inserted replaced
23455:265034f4e27c 23456:e1086c7dd3c4
3071 node1, node2 = scmutil.revpair(repo, revs) 3071 node1, node2 = scmutil.revpair(repo, revs)
3072 3072
3073 if reverse: 3073 if reverse:
3074 node1, node2 = node2, node1 3074 node1, node2 = node2, node1
3075 3075
3076 diffopts = patch.diffopts(ui, opts) 3076 diffopts = patch.diffallopts(ui, opts)
3077 m = scmutil.match(repo[node2], pats, opts) 3077 m = scmutil.match(repo[node2], pats, opts)
3078 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, 3078 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3079 listsubrepos=opts.get('subrepos')) 3079 listsubrepos=opts.get('subrepos'))
3080 3080
3081 @command('^export', 3081 @command('^export',