GNU bug report logs - #37216
[PATCH] vc-svn-ignore sets incorrect properties for relative filenames

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: emacs; Reported by: Wolfgang Scherer <Wolfgang.Scherer@HIDDEN>; Keywords: patch; dated Wed, 28 Aug 2019 23:41:01 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.

Message received at 37216 <at> debbugs.gnu.org:


Received: (at 37216) by debbugs.gnu.org; 15 Sep 2019 13:07:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 09:07:52 2019
Received: from localhost ([127.0.0.1]:47502 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1i9UFr-0004ct-Og
	for submit <at> debbugs.gnu.org; Sun, 15 Sep 2019 09:07:51 -0400
Received: from quimby.gnus.org ([80.91.231.51]:33246)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <larsi@HIDDEN>) id 1i9UFq-0004cl-B1
 for 37216 <at> debbugs.gnu.org; Sun, 15 Sep 2019 09:07:50 -0400
Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie)
 by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.89) (envelope-from <larsi@HIDDEN>)
 id 1i9UFn-0000Kh-9j; Sun, 15 Sep 2019 15:07:49 +0200
From: Lars Ingebrigtsen <larsi@HIDDEN>
To: Wolfgang Scherer <Wolfgang.Scherer@HIDDEN>
Subject: Re: bug#37216: [PATCH] vc-svn-ignore sets incorrect properties for
 relative filenames
References: <3df2dec6-18c5-ff65-cfa0-408bc5212b4e@HIDDEN>
Date: Sun, 15 Sep 2019 15:07:46 +0200
In-Reply-To: <3df2dec6-18c5-ff65-cfa0-408bc5212b4e@HIDDEN> (Wolfgang Scherer's
 message of "Thu, 29 Aug 2019 01:39:48 +0200")
Message-ID: <87muf5wvvh.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 @@CONTACT_ADDRESS@@ for details.
 Content preview:  Wolfgang Scherer <Wolfgang.Scherer@HIDDEN> writes: > If a
 relative filename has at least one level of parent > directories,
 `vc-svn-ignore'
 fails to add the ignore spec to the > correct subdirectory. > > The attached
 patch fixes that error. 
 Content analysis details:   (-2.9 points, 5.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -1.0 ALL_TRUSTED            Passed through trusted hosts only via SMTP
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 37216
Cc: 37216 <at> debbugs.gnu.org
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.0 (-)

Wolfgang Scherer <Wolfgang.Scherer@HIDDEN> writes:

> If a relative filename has at least one level of parent
> directories, `vc-svn-ignore' fails to add the ignore spec to the
> correct subdirectory.
>
> The attached patch fixes that error.

[...]

> +FILE is a wildcard specification, either relative to
> +DIRECTORY or absolute."
> +  (let* ((path (directory-file-name (expand-file-name file directory)))
> +         (directory (file-name-directory path))
> +         (file (file-name-nondirectory path))
> +         (ignores (vc-svn-ignore-completion-table directory))
>           (ignores (if remove
>                        (delete file ignores)
>                      (push file ignores))))
>      (vc-svn-command nil 0 nil nil "propset" "svn:ignore"
>                      (mapconcat #'identity ignores "\n")
> -                    (expand-file-name directory))))
> +                    directory)))

I don't have any svn trees to test with, but if I understand the code
here, then this seems correct.

Does anybody else have an opinion?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no




Information forwarded to bug-gnu-emacs@HIDDEN:
bug#37216; Package emacs. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 28 Aug 2019 23:40:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 28 19:40:04 2019
Received: from localhost ([127.0.0.1]:51385 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1i37Xo-0000Jy-2l
	for submit <at> debbugs.gnu.org; Wed, 28 Aug 2019 19:40:04 -0400
Received: from lists.gnu.org ([209.51.188.17]:55702)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <Wolfgang.Scherer@HIDDEN>) id 1i37Xl-0000Jf-LB
 for submit <at> debbugs.gnu.org; Wed, 28 Aug 2019 19:40:02 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:55318)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Wolfgang.Scherer@HIDDEN>) id 1i37Xk-0006ge-DX
 for bug-gnu-emacs@HIDDEN; Wed, 28 Aug 2019 19:40:01 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
 RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.3.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Wolfgang.Scherer@HIDDEN>) id 1i37Xj-0007R0-Cw
 for bug-gnu-emacs@HIDDEN; Wed, 28 Aug 2019 19:40:00 -0400
Received: from mout.gmx.net ([212.227.17.21]:57245)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Wolfgang.Scherer@HIDDEN>)
 id 1i37Xi-0007Q0-Vp
 for bug-gnu-emacs@HIDDEN; Wed, 28 Aug 2019 19:39:59 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
 s=badeba3b8450; t=1567035591;
 bh=c8YXzinylYVv/rokX80cSePx2n+bhvJw5EKsDPNlUak=;
 h=X-UI-Sender-Class:To:From:Subject:Date;
 b=jYGdNsYGTMqxc2kboddO9vC7vQjjoPMtLXyW5tNjcTffIx9exctlAa3OMbB84jqLz
 cC0nPJvfGD5j9ib4FpccQtJjqWhuM/Sa6/lJ/NP0T5oJzuAFRk7uS1X2lw9nGMdqhb
 YmGs90C34Vi6KG7mP4I0sn2XZCooQQKJbdIDVJJ4=
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
Received: from sheckley.simul.de ([87.144.41.174]) by mail.gmx.com (mrgmx105
 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MPGRp-1hqoOJ3eaT-00PgBP for
 <bug-gnu-emacs@HIDDEN>; Thu, 29 Aug 2019 01:39:50 +0200
Received: from [127.0.0.1] (sheckley.simul.de [127.0.0.1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by sheckley.simul.de (Postfix) with ESMTPSA id A723E1942B05
 for <bug-gnu-emacs@HIDDEN>; Thu, 29 Aug 2019 01:39:48 +0200 (CEST)
To: Emacs Bugs <bug-gnu-emacs@HIDDEN>
From: Wolfgang Scherer <Wolfgang.Scherer@HIDDEN>
Subject: [PATCH] vc-svn-ignore sets incorrect properties for relative filenames
Openpgp: preference=signencrypt
Autocrypt: addr=Wolfgang.Scherer@HIDDEN; prefer-encrypt=mutual; keydata=
 xsDiBEb46IgRBACMHOAb1KNo1Ylk+ebri+4R+bG4tyKlqBlrpv8D9/ZwRdXSGt+0DyCHoaAd
 7KW7noHapLe87DunABOjKG4nqTGv+dRiWuUBlp3I4aYRFDVa3Da+XnIYkMHKqhK59VEHQCdp
 Km42nuLS7TS+n99at9YwzTG6VBdOlBKTlRFngOjVLwCg1RGXJ6X3EjS1FKCQeXziURVpWlkD
 /2zY6Ayhxi62TS84VjikXrrmjXykAAaAmMVEyKKYb9L5pGlqiZz9g/K9xw1EUoZTYuaufquD
 v4rAGR58K/3V4CYfJLEeshMWiaXHvMmlxMznlG16/um4MvmR8B3r+cx0nOPK1JBdD2qrkNnF
 Mw8FB+zouLFB4Gt2IUC5IlOmZ8OQA/4qdU53CItzWsCr9Nux4L0qUlRweSmCnV8xGQ2wP5XI
 MawIQxxREvSrsYDG8cNnYETMg4iQFfIktwAoxCJvuFAwIB6ZxHGF4FcEZm64CXc2u7CmFLqt
 rVhXhIfMz9oEYC+HhGczGamn9ofbGTFd2hJEtPcQgWNR4f7+aKknmi2+OM0fV29sZmdhbmcg
 U2NoZXJlciA8d3NAc3ctYW10LndzPsJhBBMRAgAhBQJYmz3YAhsjBQsJCAcCBhUICQoLAgQW
 AgMBAh4BAheAAAoJEIUCr3Gr112VZZoAoLTBSTp1qGuNhLdXY04iaWCMYmHCAJ4kHPtQ6nTw
 kEq9qCHgVgXDaY7wjs7ATQRG+OiIEAQAhi0wjcxvA4tychg2NQuwBIf9LX/46l+74+QbewCn
 a4a+mw/9s5KYqLGtYMuu3/KYq9yBd53OYc7LWTLMxsGOIATSOQRhdCKYW1AanupYrC/bKNW/
 8i2QEXc7LIeYiaII0TkVdQTVZxrg9kKLQ+Vf6z04Lbfv91sVCkHKI9jxgVMAAwUD/0mkDeN0
 tllPH+NOjbkkqlOj6UOwzwIYgXmALhuAEFGXVLM2HfRV9TtJa2OoGZiuhyGXat3Jl9QK9NNv
 d/J4HSal93ZHWstPU4YIRc5uhJ1eeWwKsfTmPvbZXMKMkh+hBBJ39SZnmxfoeUzkK0EQNE2p
 PZDyjAlz03qOx6D0DHnZwkkEGBECAAkFAkb46IgCGwwACgkQhQKvcavXXZU8PwCdGmUH5mbh
 dsLYyx7qthe4hOWnW54AoJQMfmHP4uUI6ji8VkdlvO8LKtLP
Message-ID: <3df2dec6-18c5-ff65-cfa0-408bc5212b4e@HIDDEN>
Date: Thu, 29 Aug 2019 01:39:48 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------5B3BF8C4BFE6355B74083AB8"
Content-Language: de-DE
X-Provags-ID: V03:K1:Xy9TjUEGSgEQDfNY/QqG5OOjOFVjcDPpUdxPjfNaAspT+c9pPJ4
 Zz6z+Wm9RALMO7VK6Vp6UqEMmMRJwyeRhcOQtA7yBK82j8zT4zmMMeRIQR9bEsIbTVsopa4
 +ILSDM3tG/Jjr/nAeD/NIPpEJd78Y7q+PKG1UhiLTbZC4oeHZQj7y/8TaHOVD7gNix/Dpjg
 ZWxYKV5S77KNkQiC90XJQ==
X-UI-Out-Filterresults: notjunk:1;V03:K0:j5PB5/zLXhE=:bYpruXeK2er3qvXiIihdr4
 GC57/SNlbPgDMuI3EWaU8l4h8QiOaBcBSFngzKwQ3H+3TyGW10kyYqww3tbjCYJflxd1ksOeR
 5T4U3m0wgM/e1MfI7Ji97qqOdoYb3PnmjvMk0oHJsLJy3k/n7Fy2c9+eiFh2X5sfOfA8l0SzH
 rIt3aBdTlQe5u17RshMnI314ENjdOyDUCKrOv8ZvnrSPxj4/p9nmTH5VXiOrdizi71eGipAJZ
 6RREc2rR50+Xo/a2HmFdDvZuzruJJGQg4D1ZzouqMrmWHCTFPqoxjr3DUL8Crfg/de0A+yZkr
 KRWNLoZ/4V1HZwenjuFi9HgwG3XU185LxFEJerTFWe4mxF5u30QsL4LJQJ8sYGoEiQC/c4D47
 frdxDTOy6PD3dgAtBRcH0Kx+Yij56Dg5vtWURGRvFFmo3rtppxhG4KMTJJvl98apV/mpcUOCm
 aIVKYKbx3Ww4+Yi5UXhdFClILAOrqr8H3r4GaJBi0TKVCbVlIYfiydVkYpLHo2PnGCOwFmtMM
 jZRFAPseCgdYAPAamkMBdhtIXhGtZ/VNW58ibBvGwfwu4/RzRsxpe7nfexcOYQDCfNaH1J5Fl
 D6ypOzJTU0V6yDCuuqr6ps8rlWd6JHVzB9RuMpwinxpTfI33RB2uXGC20lZ6WRlEQEcfvxBIX
 e2sC2d7cuikV+xps+AR+WBe0yDwpsQZnwdmSPK+bPoUSOAPrHY0dzyAjfZFd3CBLD12rnXfTi
 zx13ZT1S+1zhs2i7lHPbDHbMP1P2RB0riD7KTjOCLLwoDauvC1zvhCHAwUBNmFmQx+Zj9ytLH
 aqjgh6ldj1FTuzxgr7AkdyiqWxQULermX8GsphmmJc2X27ivSyfWz8Wz3jCDnvDOb+eLIwBxV
 15PTVXNfBiNaFhJ6fNLyoZabbQMtSJW0vNYJyK6NRSNKFR8lp5IHJ8li6tmSPL6ov2x2GOxFP
 wBkXyQpgIudpIGu8Y4lRZue/ezlV3SiGwuvFcCBm7g7x1AXcdxMn0Dl+FiUhdNzU5u03BVAlp
 lG6MM3q585hrcUgdgSonhfdVAr0f5serWyCCHM10noKRBT1QJFo0LAGzyUVuE6XXOCQfMY169
 KlWI2pA1gaxQBD/8fHParYGyRW7EnSg1yFALdpSwv6ABLs2gqp7mR8D+Q==
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 212.227.17.21
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
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: -2.4 (--)

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

If a relative filename has at least one level of parent
directories, `vc-svn-ignore' fails to add the ignore spec to the
correct subdirectory.

The attached patch fixes that error.


--------------5B3BF8C4BFE6355B74083AB8
Content-Type: text/x-patch;
 name="0001-Set-correct-svn-ignore-property-for-relative-filenam.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename*0="0001-Set-correct-svn-ignore-property-for-relative-filenam.pa";
 filename*1="tch"

=46rom dc6484a72161c251e213d40ea1b750b3a366608c Mon Sep 17 00:00:00 2001
From: Wolfgang Scherer <wolfgang.scherer@HIDDEN>
Date: Thu, 29 Aug 2019 01:37:23 +0200
Subject: [PATCH] Set correct svn:ignore property for relative filenames

* lisp/vc/vc-svn.el: (vc-svn-ignore) Use svn:ignore property of
immediate parent directory for wildcard specification.
=2D--
 lisp/vc/vc-svn.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 3c50c8f..7196394 100644
=2D-- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -353,15 +353,18 @@ to the SVN command."

 (defun vc-svn-ignore (file &optional directory remove)
   "Ignore FILE under Subversion.
-FILE is a file wildcard, relative to the root directory of DIRECTORY."
-  (let* ((ignores (vc-svn-ignore-completion-table directory))
-         (file (file-relative-name file directory))
+FILE is a wildcard specification, either relative to
+DIRECTORY or absolute."
+  (let* ((path (directory-file-name (expand-file-name file directory)))
+         (directory (file-name-directory path))
+         (file (file-name-nondirectory path))
+         (ignores (vc-svn-ignore-completion-table directory))
          (ignores (if remove
                       (delete file ignores)
                     (push file ignores))))
     (vc-svn-command nil 0 nil nil "propset" "svn:ignore"
                     (mapconcat #'identity ignores "\n")
-                    (expand-file-name directory))))
+                    directory)))

 (defun vc-svn-ignore-completion-table (directory)
   "Return the list of ignored files in DIRECTORY."
=2D-
2.7.4


--------------5B3BF8C4BFE6355B74083AB8--




Acknowledgement sent to Wolfgang Scherer <Wolfgang.Scherer@HIDDEN>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs@HIDDEN. Full text available.
Report forwarded to bug-gnu-emacs@HIDDEN:
bug#37216; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 15 Sep 2019 13:15:01 UTC

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