From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#37216: [PATCH] vc-svn-ignore sets incorrect properties for relative filenames Date: Sun, 15 Sep 2019 15:07:46 +0200 Message-ID: <87muf5wvvh.fsf@gnus.org> References: <3df2dec6-18c5-ff65-cfa0-408bc5212b4e@gmx.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="22779"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 37216@debbugs.gnu.org To: Wolfgang Scherer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 15 15:08:46 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i9UGk-0005pN-C9 for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 Sep 2019 15:08:46 +0200 Original-Received: from localhost ([::1]:54532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9UGj-0004im-8U for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 Sep 2019 09:08:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54965) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9UG3-0004Aq-QB for bug-gnu-emacs@gnu.org; Sun, 15 Sep 2019 09:08:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9UG2-0006DW-PX for bug-gnu-emacs@gnu.org; Sun, 15 Sep 2019 09:08:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38681) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9UG2-0006DS-Mj for bug-gnu-emacs@gnu.org; Sun, 15 Sep 2019 09:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i9UG2-0004dK-Gc for bug-gnu-emacs@gnu.org; Sun, 15 Sep 2019 09:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 15 Sep 2019 13:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37216 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 37216-submit@debbugs.gnu.org id=B37216.156855287217791 (code B ref 37216); Sun, 15 Sep 2019 13:08:02 +0000 Original-Received: (at 37216) by debbugs.gnu.org; 15 Sep 2019 13:07:52 +0000 Original-Received: from localhost ([127.0.0.1]:47502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i9UFr-0004ct-Og for submit@debbugs.gnu.org; Sun, 15 Sep 2019 09:07:51 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:33246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i9UFq-0004cl-B1 for 37216@debbugs.gnu.org; Sun, 15 Sep 2019 09:07:50 -0400 Original-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 ) id 1i9UFn-0000Kh-9j; Sun, 15 Sep 2019 15:07:49 +0200 In-Reply-To: <3df2dec6-18c5-ff65-cfa0-408bc5212b4e@gmx.de> (Wolfgang Scherer's message of "Thu, 29 Aug 2019 01:39:48 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:166494 Archived-At: Wolfgang Scherer 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