Received: (at 24397) by debbugs.gnu.org; 9 Sep 2016 15:54:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 09 11:54:45 2016 Received: from localhost ([127.0.0.1]:54800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1biO8a-00073R-Ty for submit <at> debbugs.gnu.org; Fri, 09 Sep 2016 11:54:45 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:52206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <eggert@HIDDEN>) id 1biO8Z-00073E-PH for 24397 <at> debbugs.gnu.org; Fri, 09 Sep 2016 11:54:44 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id AF7F7161222; Fri, 9 Sep 2016 08:54:37 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id TY-O5Mj0rVbO; Fri, 9 Sep 2016 08:54:37 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 133F9161226; Fri, 9 Sep 2016 08:54:37 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LSJvU2-Yxy_J; Fri, 9 Sep 2016 08:54:36 -0700 (PDT) Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id EFEE1161222; Fri, 9 Sep 2016 08:54:36 -0700 (PDT) Subject: Re: [bug-diffutils] bug#24397: Binary files and --label option 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 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 24397 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.3 (-) 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.
bug-diffutils@HIDDEN:bug#24397; Package diffutils.
Full text available.Received: (at submit) by debbugs.gnu.org; 9 Sep 2016 15:34:24 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 09 11:34:24 2016 Received: from localhost ([127.0.0.1]:54785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1biNot-0006XD-9t for submit <at> debbugs.gnu.org; Fri, 09 Sep 2016 11:34:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jdelvare@HIDDEN>) id 1biI93-0002gm-8P for submit <at> debbugs.gnu.org; Fri, 09 Sep 2016 05:30:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <jdelvare@HIDDEN>) id 1biI8w-0004yr-Sg for submit <at> debbugs.gnu.org; Fri, 09 Sep 2016 05:30:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <jdelvare@HIDDEN>) id 1biI8w-0004xZ-Oy for submit <at> debbugs.gnu.org; Fri, 09 Sep 2016 05:30:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <jdelvare@HIDDEN>) id 1biI8u-0000YS-65 for bug-diffutils@HIDDEN; Fri, 09 Sep 2016 05:30:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <jdelvare@HIDDEN>) id 1biI8p-0004vr-Qa for bug-diffutils@HIDDEN; Fri, 09 Sep 2016 05:30:39 -0400 Received: from mx2.suse.de ([195.135.220.15]:33951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <jdelvare@HIDDEN>) id 1biI8p-0004vW-F2 for bug-diffutils@HIDDEN; Fri, 09 Sep 2016 05:30:35 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 70215ACF7 for <bug-diffutils@HIDDEN>; Fri, 9 Sep 2016 09:30:33 +0000 (UTC) Date: Fri, 9 Sep 2016 11:30:32 +0200 From: Jean Delvare <jdelvare@HIDDEN> To: bug-diffutils@HIDDEN Subject: Binary files and --label option Message-ID: <20160909113032.683e77fc@endymion> Organization: SUSE Linux X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.30; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Fri, 09 Sep 2016 11:34:22 -0400 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -4.0 (----) 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
Jean Delvare <jdelvare@HIDDEN>:bug-diffutils@HIDDEN.
Full text available.bug-diffutils@HIDDEN:bug#24397; Package diffutils.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.