mercurial/commands.py
changeset 39627 ee7ee0c516ca
parent 39626 6ecfd12f09cd
child 39741 7303ab86431a
--- a/mercurial/commands.py	Sat Sep 01 12:15:02 2018 +0900
+++ b/mercurial/commands.py	Thu Sep 13 22:48:27 2018 -0700
@@ -42,6 +42,7 @@
     help,
     hg,
     logcmdutil,
+    match as matchmod,
     merge as mergemod,
     narrowspec,
     obsolete,
@@ -1909,6 +1910,7 @@
 
     diffopts = patch.diffallopts(ui, opts)
     m = scmutil.match(ctx2, pats, opts)
+    m = matchmod.intersectmatchers(m, repo.narrowmatch())
     ui.pager('diff')
     logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
                               listsubrepos=opts.get('subrepos'),