CVS update by scop packages/unsupported/scop/vc ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 06/11/11 13:25:06

  Modified:    packages/unsupported/scop/vc ChangeLog vc-svn.el
Log:
Sync vc with upstream.

Revision  Changes    Path
1.77      +3 -2      XEmacs/packages/unsupported/scop/STATUS

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- STATUS	2006/10/25 12:08:56	1.76
+++ STATUS	2006/11/11 12:25:00	1.77
@@ -13,14 +13,15 @@ ede: Emacs Development Environment, <htt
 - Compiles, I have no idea whether it works or not.
 
 generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2006-10-15.
+- Up to date with GNU Emacs CVS HEAD as of 2006-11-11.
 - Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
 
 vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
-- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-10-25.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-11-11.
 - Approaching usable state.
 - smerge-mode.el needs work.
 - Causes autoload related crashing with 21.4.x, more info:
   http://koti.welho.com/vskytta/xemacs/new-vc/
   (Workaround: remove auto-autoloads.elc from the installed dir.)
 - TODO, sometime: Mercurial support, eg. http://kanis.cc/ivan/lisp/vc-hg.el
+  or perhaps contrib/mercurial.el from Mercurial itself.



1.65      +4 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- ChangeLog	2006/10/25 12:09:02	1.64
+++ ChangeLog	2006/11/11 12:25:05	1.65
@@ -1,3 +1,7 @@
+2006-11-11  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-svn.el: Sync with upstream.
+
 2006-10-25  Ville Skyttä  <scop at xemacs.org>
 
 	* vc.el: Sync with upstream.



1.16      +24 -6     XEmacs/packages/unsupported/scop/vc/vc-svn.el

Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vc-svn.el	2006/10/25 12:09:02	1.15
+++ vc-svn.el	2006/11/11 12:25:05	1.16
@@ -96,22 +96,38 @@ This is only meaningful if you don't use
   ;; :group 'vc
   )
 
+(defvar vc-svn-admin-directory
+  (cond ((and (eq system-type 'windows-nt)
+	      (getenv "SVN_ASP_DOT_NET_HACK"))
+	 "_svn")
+	(t ".svn"))
+  "The name of the \".svn\" subdirectory or its equivalent.")
+
 ;;;
 ;;; State-querying functions
 ;;;
 
+;;; vc-svn-admin-directory is generally not defined when the
+;;; autoloaded function is called.
+
 ;;;###autoload (defun vc-svn-registered (f)
-;;;###autoload   (when (file-readable-p (expand-file-name
-;;;###autoload 			  ".svn/entries" (file-name-directory f)))
+;;;###autoload   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
+;;;###autoload 			       (getenv "SVN_ASP_DOT_NET_HACK"))
+;;;###autoload 			  "_svn")
+;;;###autoload 			 (t ".svn"))))
+;;;###autoload     (when (file-readable-p (expand-file-name
+;;;###autoload 			    (concat admin-dir "/entries")
+;;;###autoload 			    (file-name-directory f)))
 ;;;###autoload       (load "vc-svn")
-;;;###autoload       (vc-svn-registered f)))
+;;;###autoload       (vc-svn-registered f))))
 
 ;;;###autoload
 (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"
+  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
+						   "/entries")
 					   (file-name-directory file)))
     (with-temp-buffer
       (cd (file-name-directory file))
@@ -207,7 +223,7 @@ the SVN command (in that order)."
 
 (defun vc-svn-responsible-p (file)
   "Return non-nil if SVN thinks it is responsible for FILE."
-  (file-directory-p (expand-file-name ".svn"
+  (file-directory-p (expand-file-name vc-svn-admin-directory
 				      (if (file-directory-p file)
 					  file
 					(file-name-directory file)))))
@@ -477,7 +493,9 @@ 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)))
+      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
+						"/entries")
+					dirname)))
     (goto-char (point-min))
     (when (re-search-forward
 	   ;; Old `svn' used name="svn:this_dir", newer use just name="".