* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
@ 2014-10-02 12:20 Dmitry Gutov
2014-10-02 12:53 ` Stefan Monnier
2014-10-03 0:42 ` Stefan Monnier
0 siblings, 2 replies; 9+ messages in thread
From: Dmitry Gutov @ 2014-10-02 12:20 UTC (permalink / raw)
To: 18605
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@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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 12:20 bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces Dmitry Gutov
@ 2014-10-02 12:53 ` Stefan Monnier
2014-10-02 13:49 ` Dmitry Gutov
2014-10-03 0:42 ` Stefan Monnier
1 sibling, 1 reply; 9+ messages in thread
From: Stefan Monnier @ 2014-10-02 12:53 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 18605
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 12:53 ` Stefan Monnier
@ 2014-10-02 13:49 ` Dmitry Gutov
2014-10-02 19:16 ` Glenn Morris
0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Gutov @ 2014-10-02 13:49 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 18605
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 13:49 ` Dmitry Gutov
@ 2014-10-02 19:16 ` Glenn Morris
2014-10-02 19:50 ` Dmitry Gutov
0 siblings, 1 reply; 9+ messages in thread
From: Glenn Morris @ 2014-10-02 19:16 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 18605
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 19:16 ` Glenn Morris
@ 2014-10-02 19:50 ` Dmitry Gutov
2014-10-02 20:12 ` Glenn Morris
0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Gutov @ 2014-10-02 19:50 UTC (permalink / raw)
To: Glenn Morris; +Cc: 18605
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 19:50 ` Dmitry Gutov
@ 2014-10-02 20:12 ` Glenn Morris
2014-10-02 20:18 ` Dmitry Gutov
0 siblings, 1 reply; 9+ messages in thread
From: Glenn Morris @ 2014-10-02 20:12 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 18605
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 20:12 ` Glenn Morris
@ 2014-10-02 20:18 ` Dmitry Gutov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Gutov @ 2014-10-02 20:18 UTC (permalink / raw)
To: Glenn Morris; +Cc: 18605
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.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-02 12:20 bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces Dmitry Gutov
2014-10-02 12:53 ` Stefan Monnier
@ 2014-10-03 0:42 ` Stefan Monnier
2014-10-03 0:50 ` Dmitry Gutov
1 sibling, 1 reply; 9+ messages in thread
From: Stefan Monnier @ 2014-10-03 0:42 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: 18605-done
> 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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces
2014-10-03 0:42 ` Stefan Monnier
@ 2014-10-03 0:50 ` Dmitry Gutov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Gutov @ 2014-10-03 0:50 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 18605-done
On 10/03/2014 04:42 AM, Stefan Monnier wrote:
> I installed the patch below.
Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-10-03 0:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-02 12:20 bug#18605: 24.3.93; vc-svn-dir-status-files returns filenames prepended with spaces Dmitry Gutov
2014-10-02 12:53 ` Stefan Monnier
2014-10-02 13:49 ` Dmitry Gutov
2014-10-02 19:16 ` Glenn Morris
2014-10-02 19:50 ` Dmitry Gutov
2014-10-02 20:12 ` Glenn Morris
2014-10-02 20:18 ` Dmitry Gutov
2014-10-03 0:42 ` Stefan Monnier
2014-10-03 0:50 ` Dmitry Gutov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).