Author: mattiase
Date: Thu Apr 5 18:23:42 2012
New Revision: 1309992
URL: http://svn.apache.org/viewvc?rev=1309992&view=rev
Log:
Parse svn status -v output correctly even when the revision numbers have
more than 6 digits (and thus change the start of the file name column).
* contrib/client-side/emacs/dsvn.el
(svn-status-v-filter): Update regexp and get rid of unused capture groups.
Modified:
subversion/trunk/contrib/client-side/emacs/dsvn.el
Modified: subversion/trunk/contrib/client-side/emacs/dsvn.el
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/dsvn.el?rev=1309992&r1=1309991&r2=1309992&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/dsvn.el Thu Apr 5 18:23:42 2012
@@ -1092,9 +1092,9 @@ outside."
(insert str)
(goto-char svn-output-marker)
(while (looking-at
- "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([* ]\\)
\\(........\\) \\(........\\) \\(............\\) \\([^ ].*\\)\n")
- (let ((status (match-string 1))
- (filename (svn-normalise-path (match-string 6))))
+ "\\(?:\\(\\?.....\\)\\|\\([ ACDGIMRX!~][ CM][ L][ +][ S][
KOTB]\\)[ C]? [* ] +[^ ]+ +[^ ]+ +[^ ]+\\) +\\([^ ].*\\)\n")
+ (let ((status (or (match-string 1) (match-string 2)))
+ (filename (svn-normalise-path (match-string 3))))
(delete-region (match-beginning 0)
(match-end 0))
(when (or (not svn-file-filter)
