GNU logs - #29139, boring messages

Message sent to bug-diffutils@HIDDEN:

Subject: bug#29139: add --include for recursive searches
Resent-From: Kevin Hunter Kesling <hunteke@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Fri, 03 Nov 2017 20:16:01 +0000
Resent-Message-ID: <handler.29139.B.150974013010231 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 29139 <at> debbugs.gnu.org
From: Kevin Hunter Kesling <hunteke@HIDDEN>
Message-ID: <a654916a-502c-f1dc-d115-2672aced4d29@HIDDEN>
Date: Fri, 3 Nov 2017 16:13:57 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------F5C7DDBEDF82FA878CE0B3E8"
Content-Language: en-US
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

This is a multi-part message in MIME format.
--------------F5C7DDBEDF82FA878CE0B3E8
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hello List,

I've been annoyed and confused when I'm on autopilot and attempting to 
recursively compare directory trees.  I've become accustomed to Grep's 
--include functionality, and have more than a few times been surprised 
(to the tune of "What? Unrecognized option??") that diff does not have 
it.  Well, with the attached patch, it now does.

Thanks to diff and grep both using gnulib, and the expressiveness of 
add_exclude(), this was a much easier change that I was expecting when I 
embarked on this a couple of hours ago.

Further, in the past hour since implementing it, this patch has already 
saved me a ton of time (no thanks to an unfortunately slow VPN setup and 
other beleaguered business requirements).

Use is exactly like with grep.  For example:

     $ diff --recursive --brief -w --include="*.c" --include="*.h"  \
         dir1/   \
         dir2/

Would this be of use to the community?

Thanks,

Kevin

--------------F5C7DDBEDF82FA878CE0B3E8
Content-Type: text/x-patch;
 name="diff-Add-include-command-line-option.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="diff-Add-include-command-line-option.patch"

From 9b5ff988f8c49a179ee64dbb075cb289b0c1868c Mon Sep 17 00:00:00 2001
From: Kevin Hunter Kesling <hunteke@HIDDEN>
Date: Fri, 3 Nov 2017 11:36:03 -0400
Subject: [PATCH] diff: Add include command line option

Referencing a number of requests, both public[1] and internal, this
patch now enables --include, in a similar vein to grep's --include.
Heavy thanks to grep's sourcecode for having already solved this wheel.

[1] "Only include files that match a given pattern in a recursive diff"
https://stackoverflow.com/questions/10131908/
---
 NEWS                  |  3 +++
 doc/diffutils.texi    |  6 ++++++
 src/diff.c            | 14 +++++++++++---
 tests/Makefile.am     |  3 ++-
 tests/include-exclude | 23 +++++++++++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100755 tests/include-exclude

diff --git a/NEWS b/NEWS
index 949136c..89afd91 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ GNU diffutils NEWS                                    -*- outline -*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** New features
+
+ With --include, diff now can include file patterns, like grep.
 
 * Noteworthy changes in release 3.6 (2017-05-21) [stable]
 
diff --git a/doc/diffutils.texi b/doc/diffutils.texi
index 8479b3f..5bca8ee 100644
--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -3842,6 +3842,12 @@ comparison of @file{d} to @file{e} might compare the contents of
 might compare the contents of @file{d/Init} and @file{inIt}.
 @xref{Comparing Directories}.
 
+@item --include=@var{glob}
+@cindex include files
+@cindex searching directory trees
+When comparing directories, only compare files whose name matches @var{glob}.
+@xref{Comparing Directories}.
+
 @item -l
 @itemx --paginate
 Pass the output through @command{pr} to paginate it.  @xref{Pagination}.
diff --git a/src/diff.c b/src/diff.c
index df3338c..8252264 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -144,6 +144,7 @@ enum
   COLOR_PALETTE_OPTION,
 
   PRESUME_OUTPUT_TTY_OPTION,
+  INCLUDE_OPTION,
 };
 
 static char const group_format_option[][sizeof "--unchanged-group-format"] =
@@ -185,6 +186,7 @@ static struct option const longopts[] =
   {"ignore-space-change", 0, 0, 'b'},
   {"ignore-tab-expansion", 0, 0, 'E'},
   {"ignore-trailing-space", 0, 0, 'Z'},
+  {"include", 1, 0, INCLUDE_OPTION},
   {"inhibit-hunk-merge", 0, 0, INHIBIT_HUNK_MERGE_OPTION},
   {"initial-tab", 0, 0, 'T'},
   {"label", 1, 0, 'L'},
@@ -648,9 +650,14 @@ main (int argc, char **argv)
 	  set_color_palette (optarg);
 	  break;
 
-        case PRESUME_OUTPUT_TTY_OPTION:
-          presume_output_tty = true;
-          break;
+	case PRESUME_OUTPUT_TTY_OPTION:
+	  presume_output_tty = true;
+	  break;
+
+	case INCLUDE_OPTION:
+	  add_exclude (excluded, optarg, 0);
+	  add_exclude (excluded, optarg, EXCLUDE_WILDCARDS | EXCLUDE_INCLUDE | EXCLUDE_ANCHORED);
+	  break;
 
 	default:
 	  try_help (NULL, NULL);
@@ -919,6 +926,7 @@ static char const * const option_help_msgid[] = {
   N_("    --no-ignore-file-name-case  consider case when comparing file names"),
   N_("-x, --exclude=PAT               exclude files that match PAT"),
   N_("-X, --exclude-from=FILE         exclude files that match any pattern in FILE"),
+  N_("    --include=PAT               include files that match PAT"),
   N_("-S, --starting-file=FILE        start with FILE when comparing directories"),
   N_("    --from-file=FILE1           compare FILE1 to all operands;\n"
      "                                  FILE1 can be a directory"),
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6668863..ef236c7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,8 @@ TESTS = \
   invalid-re	\
   function-line-vs-leading-space \
   ignore-matching-lines \
-  label-vs-func	\
+  include-exclude       \
+  label-vs-func         \
   new-file \
   no-dereference \
   no-newline-at-eof \
diff --git a/tests/include-exclude b/tests/include-exclude
new file mode 100755
index 0000000..260d552
--- /dev/null
+++ b/tests/include-exclude
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Use of any --include or --exclude* option would segfault in 2.6 and 2.6.1
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir -p x1/dir x2/dir || framework_failure_
+echo aaa > x1/a     || framework_failure_
+echo bbb > x1/b     || framework_failure_
+echo ddd > x1/dir/d || framework_failure_
+echo aaa > x2/a     || framework_failure_
+echo bbb > x2/c     || framework_failure_
+echo ddd > x2/dir/d || framework_failure_
+
+printf '%s\n' "Only in x1: b" "Only in x2: c" > only-in-b-c   || framework_failure_
+
+diff -r --exclude='a*' x1 x2 > out
+sort -o out out || framework_failure_
+compare only-in-b-c out > /tmp/t
+
+diff -r --include='a*' x1 x2 > out
+sort -o out out || framework_failure_
+compare only-in-b-c out || fail=1
+
+Exit $fail
-- 
2.7.4


--------------F5C7DDBEDF82FA878CE0B3E8--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Kevin Hunter Kesling <hunteke@HIDDEN>
Subject: bug#29139: Acknowledgement (add --include for recursive searches)
Message-ID: <handler.29139.B.150974013010231.ack <at> debbugs.gnu.org>
References: <a654916a-502c-f1dc-d115-2672aced4d29@HIDDEN>
X-Gnu-PR-Message: ack 29139
X-Gnu-PR-Package: diffutils
Reply-To: 29139 <at> debbugs.gnu.org
Date: Fri, 03 Nov 2017 20:16:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-diffutils@HIDDEN

If you wish to submit further information on this problem, please
send it to 29139 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
29139: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D29139
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-diffutils@HIDDEN:

Subject: bug#29139: Never mind
References: <a654916a-502c-f1dc-d115-2672aced4d29@HIDDEN>
In-Reply-To: <a654916a-502c-f1dc-d115-2672aced4d29@HIDDEN>
Resent-From: Kevin Hunter Kesling <hunteke@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Fri, 03 Nov 2017 20:42:01 +0000
Resent-Message-ID: <handler.29139.B29139.150974171312632 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 29139 <at> debbugs.gnu.org
From: Kevin Hunter Kesling <hunteke@HIDDEN>
Message-ID: <555c9646-5356-1962-a110-5a6787df86e3@HIDDEN>
Date: Fri, 3 Nov 2017 16:41:45 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Having used it in a couple of ways which at first appeared to work, I've 
had a couple of use cases (of course, after I email the list) since 
surprise me.

Please ignore or delete; this patch has some more baking to do ...

Sorry for the noise.

Kevin

Last modified: Mon, 25 Nov 2019 12:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.