GNU logs - #24397, boring messages

Message sent to bug-diffutils@HIDDEN:

Subject: bug#24397: Binary files and --label option
Resent-From: Jean Delvare <jdelvare@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Fri, 09 Sep 2016 15:35:02 +0000
Resent-Message-ID: <handler.24397.B.147343526425128 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 24397 <at> debbugs.gnu.org
Date: Fri, 9 Sep 2016 11:30:32 +0200
From: Jean Delvare <jdelvare@HIDDEN>
Message-ID: <20160909113032.683e77fc@endymion>
Organization: SUSE Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
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>

Hi all,

I am maintaining quilt [1]. Up to diffutils version 3.3, diff would
return an error for binary files. This made it easy for us to detect
binary files and exclude them from the patches generated by quilt.

However since version 3.4 of diffutils, binary files no longer trigger
an error. This causes quilt to add the output of the command to the
generated patch. In my example, it looks like this:

Binary files w.orig/test.bin    2016-09-09 10:19:10.621752409 +0200 and w/test.bin      2016-09-09 10:19:24.349917252 +0200 differ

The reason for this strange output is that we use the --label option to
fine-tune the generated patches. It works fine for text files, but as
you can see, for binary files the result isn't as expected. Timestamps
are not supposed to be printed in the output in this case. Without the
--label options I get:

Binary files .pc/test.diff/test.bin and test.bin differ

which no longer has the timestamps, but doesn't have the names I want
(it exposes quilt internals which the user should not have to care
about.) So I am stuck.

Do you have any idea how this problem could be solved? In quilt I will
most likely add a test to check if the output starts with "Binary
files" and exclude the file again. But I think the problem is more
general than this. It seems we would need separate --label options for
the text and binary cases, as you may want to include the timestamp (or
any other extra information) for regular diff output, while you only
want the file names in the binary case. Maybe we need a new option
--file-name for the latter?

[1] https://savannah.nongnu.org/projects/quilt

Thanks,
-- 
Jean Delvare
SUSE L3 Support

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: Jean Delvare <jdelvare@HIDDEN>
Subject: bug#24397: Acknowledgement (Binary files and --label option)
Message-ID: <handler.24397.B.147343526425128.ack <at> debbugs.gnu.org>
References: <20160909113032.683e77fc@endymion>
X-Gnu-PR-Message: ack 24397
X-Gnu-PR-Package: diffutils
Reply-To: 24397 <at> debbugs.gnu.org
Date: Fri, 09 Sep 2016 15:35: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 24397 <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
24397: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24397
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-diffutils@HIDDEN:

Subject: bug#24397: [bug-diffutils] bug#24397: Binary files and --label option
Resent-From: Paul Eggert <eggert@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Fri, 09 Sep 2016 15:55:01 +0000
Resent-Message-ID: <handler.24397.B24397.147343648527125 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Jean Delvare <jdelvare@HIDDEN>, 24397 <at> debbugs.gnu.org
References: <20160909113032.683e77fc@endymion>
From: Paul Eggert <eggert@HIDDEN>
Organization: UCLA Computer Science Department
Message-ID: <b8be2961-abd8-b4d1-8623-aa8666543a96@HIDDEN>
Date: Fri, 9 Sep 2016 08:54:33 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <20160909113032.683e77fc@endymion>
Content-Type: text/plain; charset=utf-8; format=flowed
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>

On 09/09/2016 02:30 AM, Jean Delvare wrote:
> It seems we would need separate --label options for
> the text and binary cases, as you may want to include the timestamp (or
> any other extra information) for regular diff output, while you only
> want the file names in the binary case. Maybe we need a new option
> --file-name for the latter?

Yes, it does appear that the options need to be rethought. Also, there 
needs to be a better way to indicate symlinks and special files; that's 
a related issue.

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.