bug-gnu-emacs
[Top][All Lists]
Advanced

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

RE: vc-svn.el and "the underscore hack"


From: AriT93
Subject: RE: vc-svn.el and "the underscore hack"
Date: Mon, 16 Oct 2006 10:02:11 -0500

Following up to my previous email.  here is a patch that seems to be
functioning.  As I said my elisp skills are pretty weak.  If there is
a better way to accomplish these changes I would be very interested in
them as a learning experience.  

--- /cygdrive/c/temp/cvs/emacs/lisp/vc-svn.el   2006-02-08 21:47:00.000000000 
-0600
+++ /cygdrive/c/emacs/lisp/vc-svn.el    2006-10-16 09:37:34.240209600 -0500
@@ -100,18 +100,25 @@ This is only meaningful if you don't use
 ;;;
 
 ;;;###autoload (defun vc-svn-registered (f)
-;;;###autoload   (when (file-readable-p (expand-file-name
-;;;###autoload                           ".svn/entries" (file-name-directory 
f)))
+;;;###autoload   (when (or (file-readable-p (expand-file-name
+;;;###autoload                           "_svn/entries" (file-name-directory 
f)))
+;;;###autoload           (file-readable-p (expand-file-name 
+;;;###autoload           ".svn/entries" (file-name-directory f))))
 ;;;###autoload       (load "vc-svn")
 ;;;###autoload       (vc-svn-registered f)))
 
 ;;;###autoload
 (add-to-list 'completion-ignored-extensions ".svn/")
+(add-to-list 'completion-ignored-extensions "_svn/")
 
 (defun vc-svn-registered (file)
   "Check if FILE is SVN registered."
-  (when (file-readable-p (expand-file-name ".svn/entries"
-                                          (file-name-directory file)))
+  ;;  (when (file-readable-p (expand-file-name "_svn/entries"
+  ;;                                      (file-name-directory file)))
+  (when (or(file-readable-p (expand-file-name ".svn/entries"
+                                                                               
          (file-name-directory file)))
+                  (file-readable-p (expand-file-name "_svn/entries"
+                                                                               
          (file-name-directory file))))
     (with-temp-buffer
       (cd (file-name-directory file))
       (let ((status
@@ -206,12 +213,22 @@ COMMENT can be used to provide an initia
 the SVN command (in that order)."
   (apply 'vc-svn-command nil 0 file "add" (vc-switches 'SVN 'register)))
 
+;; (defun vc-svn-responsible-p (file)
+;;   "Return non-nil if SVN thinks it is responsible for FILE."
+;;   (file-directory-p (expand-file-name "_svn"
+;;                                   (if (file-directory-p file)
+;;                                       file
+;;                                     (file-name-directory file)))))
 (defun vc-svn-responsible-p (file)
   "Return non-nil if SVN thinks it is responsible for FILE."
-  (file-directory-p (expand-file-name ".svn"
+  (or (file-directory-p (expand-file-name ".svn"
                                      (if (file-directory-p file)
                                          file
-                                       (file-name-directory file)))))
+                                       (file-name-directory file))))
+(file-directory-p (expand-file-name "_svn"
+                                     (if (file-directory-p file)
+                                         file
+                                       (file-name-directory file))))))
 
 (defalias 'vc-svn-could-register 'vc-svn-responsible-p
   "Return non-nil if FILE could be registered in SVN.
@@ -476,7 +493,8 @@ and that it passes `vc-svn-global-switch
     (let ((coding-system-for-read
           (or file-name-coding-system
               default-file-name-coding-system)))
-      (vc-insert-file (expand-file-name ".svn/entries" dirname)))
+      (or (vc-insert-file (expand-file-name ".svn/entries" dirname))
+                 (vc-insert-file (expand-file-name "_svn/entries" dirname))))
     (goto-char (point-min))
     (when (re-search-forward
           ;; Old `svn' used name="svn:dir", newer use just name="".
-- 

enjoy every sandwich

           -- W. Zevon

reply via email to

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