CVS update by scop packages/unsupported/scop/vc, vc-hooks.el ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/06/16 14:57:27

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

Revision  Changes    Path
1.86      +1 -1      XEmacs/packages/unsupported/scop/STATUS

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- STATUS	2007/06/06 18:09:35	1.85
+++ STATUS	2007/06/16 12:57:24	1.86
@@ -17,6 +17,6 @@ generic-modes: generic.el and generic-x.
 - 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, hg, git upstream as of 2007-06-06.
+- Up to date with GNU Emacs CVS HEAD, hg, git upstream as of 2007-06-16.
 - Approaching usable state.
 - smerge-mode.el needs work.



1.76      +6 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- ChangeLog	2007/06/06 18:09:41	1.75
+++ ChangeLog	2007/06/16 12:57:25	1.76
@@ -1,3 +1,9 @@
+2007-06-16  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-arch.el: Sync with upstream.
+	* vc-svn.el: Ditto.
+	* vc.el: Ditto.
+
 2007-06-06  Ville Skyttä  <scop at xemacs.org>
 
 	* vc-hooks.el: Sync with upstream.



1.20      +1 -1      XEmacs/packages/unsupported/scop/vc/vc-arch.el

Index: vc-arch.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-arch.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- vc-arch.el	2007/05/14 19:07:13	1.19
+++ vc-arch.el	2007/06/16 12:57:26	1.20
@@ -63,7 +63,7 @@
 ;;;
 
 (defvar vc-arch-command
-  (let ((candidates '("tla")))
+  (let ((candidates '("tla" "baz")))
     (while (and candidates (not (executable-find (car candidates))))
       (setq candidates (cdr candidates)))
     (or (car candidates) "tla")))



1.20      +1 -0      XEmacs/packages/unsupported/scop/vc/vc-hooks.el

Index: vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-hooks.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- vc-hooks.el	2007/06/06 18:09:41	1.19
+++ vc-hooks.el	2007/06/16 12:57:26	1.20
@@ -861,6 +861,7 @@ current, and kill the buffer that visits
 
 ;; XEmacs addition: better placed here than autoloaded in mercurial.el for
 ;;                  consistency with other included vc related modes.
+;; XEmacs TODO: fix this up to not always pull in mercurial.el.
 (add-hook 'find-file-hook 'hg-find-file-hook)
 
 ;; more hooks, this time for file-not-found



1.21      +6 -1      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.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- vc-svn.el	2007/02/24 22:53:03	1.20
+++ vc-svn.el	2007/06/16 12:57:26	1.21
@@ -469,11 +469,16 @@ NAME is assumed to be a URL."
 ;;; Internal functions
 ;;;
 
+(defcustom vc-svn-program "svn"
+  "Name of the svn executable."
+:type 'string
+:group 'vc)
+
 (defun vc-svn-command (buffer okstatus file &rest flags)
   "A wrapper around `vc-do-command' for use in vc-svn.el.
 The difference to vc-do-command is that this function always invokes `svn',
 and that it passes `vc-svn-global-switches' to it before FLAGS."
-  (apply 'vc-do-command buffer okstatus "svn" file
+  (apply 'vc-do-command buffer okstatus vc-svn-program file
          (if (stringp vc-svn-global-switches)
              (cons vc-svn-global-switches flags)
            (append vc-svn-global-switches



1.39      +6 -2      XEmacs/packages/unsupported/scop/vc/vc.el

Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- vc.el	2007/05/14 19:07:13	1.38
+++ vc.el	2007/06/16 12:57:26	1.39
@@ -2114,7 +2114,7 @@ See Info node `Merging'."
     (define-key vmap "t" 'vc-dired-toggle-terse-mode)
     map))
 
-(define-derived-mode vc-dired-mode dired-mode "Dired under VC"
+(define-derived-mode vc-dired-mode dired-mode "Dired under "
   "The major mode used in VC directory buffers.
 
 It works like Dired, but lists only files under version control, with
@@ -2174,6 +2174,8 @@ There is a special command, `*l', to mar
        (set (make-local-variable 'dired-actual-switches)
             vc-dired-switches))
   (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display)
+  (setq mode-name (concat mode-name (symbol-name (vc-responsible-backend 
+						  default-directory))))
   (setq vc-dired-mode t))
 
 (defun vc-dired-toggle-terse-mode ()
@@ -2232,7 +2234,9 @@ Called by dired after any portion of a v
 	;; if the backend supports it, get the state
 	;; of all files in this directory at once
 	(let ((backend (vc-responsible-backend subdir)))
-	  (if (vc-find-backend-function backend 'dir-state)
+	  ;; check `backend' can really handle `subdir'.
+	  (if (and (vc-call-backend backend 'responsible-p subdir)
+		   (vc-find-backend-function backend 'dir-state))
 	      (vc-call-backend backend 'dir-state subdir)))
         (forward-line 1)
         ;; erase (but don't remove) the "total" line