emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master f800666: Make vc-tests work with MSYS svn program


From: Eli Zaretskii
Subject: [Emacs-diffs] master f800666: Make vc-tests work with MSYS svn program
Date: Tue, 07 Jul 2015 15:07:54 +0000

branch: master
commit f8006664095c380ef3ed14b33b0587c1ac563e56
Author: Fabrice Popineau <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Make vc-tests work with MSYS svn program
    
    * lisp/vc/vc-svn.el (vc-svn-create-repo): Fix the file:// URL when
    svn is an MSYS program.
---
 lisp/vc/vc-svn.el |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index f97e2ab..8d6eae5 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -279,7 +279,13 @@ RESULT is a list of conses (FILE . STATE) for directory 
DIR."
   ;; Expand default-directory because svn gets confused by eg
   ;; file://~/path/to/file.  (Bug#15446).
   (vc-svn-command "*vc*" 0 "." "checkout"
-                  (let ((defdir (expand-file-name default-directory)))
+                  (let ((defdir (expand-file-name default-directory))
+                        (svn-prog (executable-find "svn")))
+                    (when (and (fboundp 'w32-application-type)
+                               (eq (w32-application-type svn-prog) 'msys))
+                      (setq defdir
+                            (replace-regexp-in-string "^\\(.\\):/" "/\\1/"
+                                                      defdir)))
                     (concat (if (and (stringp defdir)
                                      (eq (aref defdir 0) ?/))
                                 "file://"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]