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

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/02/24 23:53:03

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

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

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- STATUS	2007/02/11 18:53:30	1.81
+++ STATUS	2007/02/24 22:53:02	1.82
@@ -13,11 +13,11 @@ 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 2007-01-28.
+- Up to date with GNU Emacs CVS HEAD as of 2007-02-25.
 - 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 2007-02-11.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-02-25.
 - Approaching usable state.
 - smerge-mode.el needs work.
 - Pre-2007-02-03 versions used to cause autoload related crashing with



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

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- ChangeLog	2007/02/11 18:53:32	1.70
+++ ChangeLog	2007/02/24 22:53:03	1.71
@@ -1,3 +1,7 @@
+2007-02-25  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-svn.el: Sync with upstream.
+
 2007-02-11  Ville Skyttä  <scop at xemacs.org>
 
 	* vc-svn.el: Sync with upstream.



1.20      +14 -30    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.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- vc-svn.el	2007/02/11 18:53:32	1.19
+++ vc-svn.el	2007/02/24 22:53:03	1.20
@@ -86,18 +86,12 @@ If you want to force an empty list of ar
   :type '(repeat string)
   :group 'vc)
 
-(defconst vc-svn-use-edit nil
-  ;; Subversion does not provide this feature (yet).
-  "*Non-nil means to use `svn edit' to \"check out\" a file.
-This is only meaningful if you don't use the implicit checkout model
-\(i.e. if you have $SVNREAD set)."
-  ;; :type 'boolean
-  ;; :version "22.1"
-  ;; :group 'vc
-  )
-
-(defvar vc-svn-admin-directory
-  (cond ((and (eq system-type 'windows-nt)
+;; We want to autoload it for use by the autoloaded version of
+;; vc-svn-registered, but we want the value to be compiled at startup, not
+;; at dump time.
+;; ;;;###autoload
+(defconst vc-svn-admin-directory
+  (cond ((and (memq system-type '(cygwin windows-nt ms-dos))
 	      (getenv "SVN_ASP_DOT_NET_HACK"))
 	 "_svn")
 	(t ".svn"))
@@ -114,12 +108,12 @@ This is only meaningful if you don't use
 ;;                bytecode interpreter issue with redefining vc-svn-registered
 ;;;###autoload (defun vc-svn-registered-lite (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                                (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                             (concat admin-dir "/entries")
+;;;###autoload                             (file-name-directory f)))
 ;;;###autoload       (load "vc-svn")
 ;;;###autoload       (vc-svn-registered f))))
 
@@ -279,13 +273,8 @@ the SVN command (in that order)."
 
 (defun vc-svn-update (file editable rev switches)
   (if (and (file-exists-p file) (not rev))
-      ;; If no revision was specified, just make the file writable
-      ;; if necessary (using `svn-edit' if requested).
-      (and editable (not (eq (vc-svn-checkout-model file) 'implicit))
-	   (if vc-svn-use-edit
-	       (vc-svn-command nil 0 file "edit")
-	     (set-file-modes file (logior (file-modes file) 128))
-	     (if (equal file buffer-file-name) (toggle-read-only -1))))
+      ;; If no revision was specified, there's nothing to do.
+      nil
     ;; Check out a particular version (or recreate the file).
     (vc-file-setprop file 'vc-workfile-version nil)
     (apply 'vc-svn-command nil 0 file
@@ -307,12 +296,7 @@ the SVN command (in that order)."
 (defun vc-svn-revert (file &optional contents-done)
   "Revert FILE to the version it was based on."
   (unless contents-done
-    (vc-svn-command nil 0 file "revert"))
-  (unless (eq (vc-checkout-model file) 'implicit)
-    (if vc-svn-use-edit
-        (vc-svn-command nil 0 file "unedit")
-      ;; Make the file read-only by switching off all w-bits
-      (set-file-modes file (logand (file-modes file) 3950)))))
+    (vc-svn-command nil 0 file "revert")))
 
 (defun vc-svn-merge (file first-version &optional second-version)
   "Merge changes into current working copy of FILE.