subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From matti...@apache.org
Subject svn commit: r1525151 - /subversion/trunk/contrib/client-side/emacs/vc-svn.el
Date Fri, 20 Sep 2013 21:48:50 GMT
Author: mattiase
Date: Fri Sep 20 21:48:50 2013
New Revision: 1525151

URL: http://svn.apache.org/r1525151
Log:
Since "svn status" is run for every file because of the removed check
for .svn in every directory, don't complain if it fails. The check is
made more robust by adding @ to the file name, for files whose names
contain that character.

* contrib/client-side/emacs/dsvn.el
  (vc-svn-run-status): Append @ to the file name.
  (vc-svn-parse-status): Don't complain on error.

Suggested by: Karl Berry

Modified:
    subversion/trunk/contrib/client-side/emacs/vc-svn.el

Modified: subversion/trunk/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/vc-svn.el?rev=1525151&r1=1525150&r2=1525151&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/vc-svn.el Fri Sep 20 21:48:50 2013
@@ -162,7 +162,7 @@ See `vc-svn-parse-status' for a descript
     (let ((status (apply 'call-process vc-svn-program-name nil t nil
                          (append '("status" "-v")
                                  (if update '("-u") '())
-                                 (list file)))))
+                                 (list (concat file "@"))))))
       (goto-char (point-min))
       (if (not (equal 0 status)) ; not zerop; status can be a string
           ;; If you ask for the status of a file that isn't even in a
@@ -205,7 +205,8 @@ If the file is newly added, LOCAL is \"0
             (match-string 3)))
      ((looking-at "^I +") nil)       ;; An ignored file
      ((looking-at " \\{40\\}") nil)  ;; A file that is not in the wc nor svn?
-     (t (error "Couldn't parse output from `svn status -v'")))))
+     ;; Since svn status is run on every file, don't complain if it fails.
+     (t nil))))
 
 
 (defun vc-svn-parse-state-only ()



Mime
View raw message