##// END OF EJS Templates
narrow: intersect provided matcher with narrowmatcher in `hg diff`...
spectral -
r39918:ee7ee0c5 default
parent child Browse files
Show More
@@ -42,6 +42,7 b' from . import ('
42 help,
42 help,
43 hg,
43 hg,
44 logcmdutil,
44 logcmdutil,
45 match as matchmod,
45 merge as mergemod,
46 merge as mergemod,
46 narrowspec,
47 narrowspec,
47 obsolete,
48 obsolete,
@@ -1909,6 +1910,7 b' def diff(ui, repo, *pats, **opts):'
1909
1910
1910 diffopts = patch.diffallopts(ui, opts)
1911 diffopts = patch.diffallopts(ui, opts)
1911 m = scmutil.match(ctx2, pats, opts)
1912 m = scmutil.match(ctx2, pats, opts)
1913 m = matchmod.intersectmatchers(m, repo.narrowmatch())
1912 ui.pager('diff')
1914 ui.pager('diff')
1913 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1915 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1914 listsubrepos=opts.get('subrepos'),
1916 listsubrepos=opts.get('subrepos'),
General Comments 0
You need to be logged in to leave comments. Login now