e9a040016017 obsolete — Jordi Gutiérrez Hermoso 1 year, 2 months ago 
grep: restore usage of --include/--exclude options

The refactor in 4a73df6eb67d accidentally forgot to transform the opts
argument for walkopts into a byteskwargs. This resulted in its options
being ignored. In particular, the -X/-I pair of options was missing.

A simple fix restores its usage. Tests included, of course.
patch browse 
2 files changed, 18 insertions(+), 1 deletions(-)

M mercurial/commands.py
M tests/test-grep.t

M mercurial/commands.py +1 -1
@@ 3680,7 3680,7 @@ def grep(ui, repo, pattern, *pats, **opt
 
     wopts = logcmdutil.walkopts(
         pats=pats,
-        opts=opts,
+        opts=pycompat.byteskwargs(opts),
         revspec=opts['rev'],
         include_pats=opts['include'],
         exclude_pats=opts['exclude'],

          
M tests/test-grep.t +17 -0
@@ 525,6 525,23 @@ Test wdir
   port2:2147483647:deport
   port2:2147483647:wport
 
+Testing include/exclude
+
+  $ hg cp port tort
+  $ hg grep port -X tort
+  port:export
+  port:vaportight
+  port:import/export
+  port2:export
+  port2:vaportight
+  port2:import/export
+  port2:deport
+  port2:wport
+  $ hg grep port -I tort
+  tort:export
+  tort:vaportight
+  tort:import/export
+
   $ cd ..
   $ hg init t2
   $ cd t2