D4587: narrow: intersect provided matcher with narrowmatcher in `hg diff`

[spectral (Kyle Lippincott)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGee7ee0c516ca: narrow: intersect provided matcher with narrowmatcher in `hg diff` (authored by spectral, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D4587?vs=11041&id=11056#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4587?vs=11041&id=11056

REVISION DETAIL
  https://phab.mercurial-scm.org/D4587

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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'),



To: spectral, #hg-reviewers
Cc: mercurial-devel