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

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 06/10/15 20:56:56

  Modified:    packages/unsupported/scop/vc ChangeLog vc-git.el vc-hooks.el
Log:
Sync vc with upstreams.

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

Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- STATUS	2006/09/26 20:54:25	1.73
+++ STATUS	2006/10/15 18:56:52	1.74
@@ -17,7 +17,7 @@ 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, git upstream as of 2006-09-26.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-10-15.
 - Approaching usable state.
 - smerge-mode.el needs work.
 - Causes autoload related crashing with 21.4.x, more info:



1.63      +5 -0      XEmacs/packages/unsupported/scop/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- ChangeLog	2006/08/28 21:45:04	1.62
+++ ChangeLog	2006/10/15 18:56:55	1.63
@@ -1,3 +1,8 @@
+2006-10-15  Ville Skyttä  <scop at xemacs.org>
+
+	* vc-git.el: Sync with upstream.
+	* vc-hooks.el: Ditto.
+
 2006-08-29  Ville Skyttä  <scop at xemacs.org>
 
 	* smerge-mode.el (smerge-mine): Comment out unsupported



1.5       +2 -2      XEmacs/packages/unsupported/scop/vc/vc-git.el

Index: vc-git.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-git.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vc-git.el	2006/08/20 08:14:41	1.4
+++ vc-git.el	2006/10/15 18:56:55	1.5
@@ -119,10 +119,10 @@
 (defun vc-git-annotate-command (file buf &optional rev)
   ; FIXME: rev is ignored
   (let ((name (file-relative-name file)))
-    (call-process "git" nil buf nil "annotate" name)))
+    (call-process "git" nil buf nil "blame" name)))
 
 (defun vc-git-annotate-time ()
-  (and (re-search-forward "[0-9a-f]+\t(.*\t\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\)\t[0-9]+)" nil t)
+  (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t)
        (vc-annotate-convert-time
         (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))
 



1.13      +9 -3      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.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- vc-hooks.el	2006/07/04 21:52:23	1.12
+++ vc-hooks.el	2006/10/15 18:56:55	1.13
@@ -53,11 +53,13 @@ BACKEND, use `vc-handled-backends'.")
 (defvar vc-header-alist ())
 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header)
 
-(defvar vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
- "Regexp matching directory names that are not under VC's control.
+(defcustom vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
+  "Regexp matching directory names that are not under VC's control.
 The default regexp prevents fruitless and time-consuming attempts
 to determine the VC status in directories in which filenames are
-interpreted as hostnames.")
+interpreted as hostnames."
+:type 'regexp
+:group 'vc)
 
 ;; XEmacs change: add GIT
 (defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS GIT)
@@ -320,6 +322,10 @@ non-nil if FILE exists and its contents 
   "Find the root of a checked out project.
 The function walks up the directory tree from FILE looking for WITNESS.
 If WITNESS if not found, return nil, otherwise return the root."
+  ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
+  ;; witnesses in /home or in /.
+  ;; XEmacs: 2nd arg to `abbreviate-file-name' to match GNU functionality
+  (setq file (abbreviate-file-name file t))
   (let ((root nil))
     (while (not (or root
                    (equal file (setq file (file-name-directory file)))