GNU bug report logs - #18605
24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 18605 in the body.
You can then email your comments to 18605 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: bug-gnu-emacs <at> gnu.org
Subject: 24.3.93;
 vc-svn-dir-status-files returns filenames prepended with spaces
Date: Thu, 02 Oct 2014 16:20:53 +0400

Tags: patch

Instead of

  (("foo" . ignored) ("bar" . edited))

I get

  ((" foo" . ignored) (" bar" . edited))

with

svn, version 1.8.8 (r1568071)
   compiled Aug 13 2014, 17:12:39 on x86_64-pc-linux-gnu

And I have a reason to believe that SVN on Cygwin behaves the same:
https://github.com/dgutov/diff-hl/issues/25#issuecomment-57606933

Attaching a tiny patch, although there's probably a better way to fix
that regexp.

In GNU Emacs 24.3.93.4 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8)
 of 2014-09-19 on axl
Repository revision: 117510 juri <at> jurta.org-20140918205955-kwp5ckzrk2l4w1km
Windowing system distributor `The X.Org Foundation', version 11.0.11501000
System Description:	Ubuntu 14.04.1 LTS


=== modified file 'lisp/vc/vc-svn.el'
--- lisp/vc/vc-svn.el	2014-01-01 07:43:34 +0000
+++ lisp/vc/vc-svn.el	2014-10-02 12:19:00 +0000
@@ -195,7 +195,7 @@
                      (?~ . edited)))
 	(re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)?   \\(.*\\)$"
 	      ;; Subexp 3 is a dummy in this case, so the numbers match.
-	      "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$"))
+	      "^\\(.\\)\\(.\\)...\\(.\\) +\\(.*\\)$"))
        result)
     (goto-char (point-min))
     (while (re-search-forward re nil t)

Message #8 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93;
 vc-svn-dir-status-files returns filenames prepended with spaces
Date: Thu, 02 Oct 2014 08:53:30 -0400

> Instead of
>   (("foo" . ignored) ("bar" . edited))
> I get
>   ((" foo" . ignored) (" bar" . edited))
> with
> svn, version 1.8.8 (r1568071)
>    compiled Aug 13 2014, 17:12:39 on x86_64-pc-linux-gnu

Do you know if that's because of a change in SVN's output format, or if
that's because of a change in the way Emacs parses SVN's output?


        Stefan

Message #11 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames
 prepended with spaces
Date: Thu, 02 Oct 2014 17:49:38 +0400

On 10/02/2014 04:53 PM, Stefan Monnier wrote:

> Do you know if that's because of a change in SVN's output format, or if
> that's because of a change in the way Emacs parses SVN's output?

The former, apparently. See

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4741 and
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6361

These seem to be about the same problem, but for the "remote" case, 
whereas `vc-svn-dir-status-files' queries repo status locally, and calls 
`vc-svn-after-dir-status' without the second argument.

Message #14 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: Stefan Monnier <monnier <at> iro.umontreal.ca>, 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93;
 vc-svn-dir-status-files returns filenames prepended with spaces
Date: Thu, 02 Oct 2014 15:16:53 -0400

Dmitry Gutov wrote:

>> Do you know if that's because of a change in SVN's output format, or if
>> that's because of a change in the way Emacs parses SVN's output?
>
> The former, apparently. See
>
> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4741 and
> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6361

Surely the way to answer the question is to give a recipe that shows the
relevant svn status output in an old and new version of svn.

Message #17 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Glenn Morris <rgm <at> gnu.org>
Cc: Stefan Monnier <monnier <at> iro.umontreal.ca>, 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames
 prepended with spaces
Date: Thu, 02 Oct 2014 23:50:30 +0400

On 10/02/2014 11:16 PM, Glenn Morris wrote:

> Surely the way to answer the question is to give a recipe that shows the
> relevant svn status output in an old and new version of svn.

You're welcome to do it: I don't have the old version installed, and I'm 
not sure where I would obtain it.

Instead, I spent some time digging in related changes history, which IMO 
is a lot more useful.

Message #20 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: Stefan Monnier <monnier <at> iro.umontreal.ca>, 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93;
 vc-svn-dir-status-files returns filenames prepended with spaces
Date: Thu, 02 Oct 2014 16:12:07 -0400

Dmitry Gutov wrote:

> You're welcome to do it: I don't have the old version installed, and
> I'm not sure where I would obtain it.

http://archive.apache.org/dist/subversion/

> Instead, I spent some time digging in related changes history, which
> IMO is a lot more useful.

I think a reproducible recipe would be even more useful.
But if you don't care about this being fixed in emacs-24, then there's
no rush.

Message #23 received at 18605 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Glenn Morris <rgm <at> gnu.org>
Cc: Stefan Monnier <monnier <at> iro.umontreal.ca>, 18605 <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames
 prepended with spaces
Date: Fri, 03 Oct 2014 00:18:09 +0400

On 10/03/2014 12:12 AM, Glenn Morris wrote:

> But if you don't care about this being fixed in emacs-24, then there's
> no rush.

Indeed, like the similar bug 18579, I really don't expect this to be 
fixed before the 24.4 release.

Message #28 received at 18605-done <at> debbugs.gnu.org (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 18605-done <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93;
 vc-svn-dir-status-files returns filenames prepended with spaces
Date: Thu, 02 Oct 2014 20:42:17 -0400

> Instead of
>   (("foo" . ignored) ("bar" . edited))
> I get
>   ((" foo" . ignored) (" bar" . edited))
> with
> svn, version 1.8.8 (r1568071)
>    compiled Aug 13 2014, 17:12:39 on x86_64-pc-linux-gnu

I installed the patch below.


        Stefan


=== modified file 'lisp/vc/vc-svn.el'
--- lisp/vc/vc-svn.el	2014-01-01 07:43:34 +0000
+++ lisp/vc/vc-svn.el	2014-10-03 00:27:34 +0000
@@ -195,7 +195,7 @@
                      (?~ . edited)))
 	(re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)?   \\(.*\\)$"
 	      ;; Subexp 3 is a dummy in this case, so the numbers match.
-	      "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$"))
+	      "^\\(.\\)\\(.\\)...\\(.\\).? \\(.*\\)$"))
        result)
     (goto-char (point-min))
     (while (re-search-forward re nil t)

Message #31 received at 18605-done <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 18605-done <at> debbugs.gnu.org
Subject: Re: bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames
 prepended with spaces
Date: Fri, 03 Oct 2014 04:50:08 +0400

On 10/03/2014 04:42 AM, Stefan Monnier wrote:

> I installed the patch below.

Thanks!

Previous Next

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