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

Previous Next

Package: emacs;

Reported by: Dmitry Gutov <dgutov <at> yandex.ru>

Date: Thu, 2 Oct 2014 12:22:01 UTC

Severity: normal

Tags: patch

Found in version 24.3.93

Done: Stefan Monnier <monnier <at> iro.umontreal.ca>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#18605: closed (24.3.93; vc-svn-dir-status-files returns
 filenames prepended with spaces)
Date: Fri, 03 Oct 2014 00:43:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Thu, 02 Oct 2014 20:42:17 -0400
with message-id <jwvh9zmt2e1.fsf-monnier+emacsbugs <at> gnu.org>
and subject line Re: bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
has caused the debbugs.gnu.org bug report #18605,
regarding 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
18605: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18605
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
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 part 3 (message/rfc822, inline)]
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)



This bug report was last modified 10 years and 235 days ago.

Previous Next


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