CVS update by scop packages/unsupported/scop/vc, vc-arch.el ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Thu Jan 18 17:10:08 EST 2007
User: scop
Date: 07/01/18 23:10:08
Modified: packages/unsupported/scop/vc ChangeLog log-edit.el
vc-arch.el vc-git.el vc-hooks.el vc-svn.el
Log:
Sync vc with upstreams.
Revision Changes Path
1.78 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- STATUS 2006/11/11 12:25:00 1.77
+++ STATUS 2007/01/18 22:10:02 1.78
@@ -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-11-11.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2007-01-18.
- Approaching usable state.
- smerge-mode.el needs work.
- Causes autoload related crashing with 21.4.x, more info:
1.66 +8 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- ChangeLog 2006/11/11 12:25:05 1.65
+++ ChangeLog 2007/01/18 22:10:07 1.66
@@ -1,3 +1,11 @@
+2007-01-18 Ville Skyttä <scop at xemacs.org>
+
+ * log-edit.el: Sync with upstream.
+ * vc-arch.el: Ditto.
+ * vc-git.el: Ditto.
+ * vc-hooks.el: Ditto.
+ * vc-svn.el: Ditto.
+
2006-11-11 Ville Skyttä <scop at xemacs.org>
* vc-svn.el: Sync with upstream.
1.12 +1 -1 XEmacs/packages/unsupported/scop/vc/log-edit.el
Index: log-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/log-edit.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- log-edit.el 2006/06/12 19:31:42 1.11
+++ log-edit.el 2007/01/18 22:10:07 1.12
@@ -1,6 +1,6 @@
;;; log-edit.el --- Major mode for editing CVS commit messages
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier at iro.umontreal.ca>
1.16 +14 -0 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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- vc-arch.el 2006/08/16 20:44:35 1.15
+++ vc-arch.el 2007/01/18 22:10:07 1.16
@@ -408,6 +408,20 @@ Return non-nil if FILE is unchanged."
(defun vc-arch-init-version () nil)
+;;; Less obvious implementations.
+
+(defun vc-arch-find-version (file rev buffer)
+ (let ((out (make-temp-file "vc-out")))
+ (unwind-protect
+ (progn
+ (with-temp-buffer
+ (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev)
+ (call-process-region (point-min) (point-max)
+ "patch" nil nil nil "-R" "-o" out file))
+ (with-current-buffer buffer
+ (insert-file-contents out)))
+ (delete-file out))))
+
(provide 'vc-arch)
;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
1.6 +9 -3 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vc-git.el 2006/10/15 18:56:55 1.5
+++ vc-git.el 2007/01/18 22:10:07 1.6
@@ -23,13 +23,18 @@
;; system.
;;
;; To install: put this file on the load-path and add GIT to the list
-;; of supported backends in `vc-handled-backends'.
+;; of supported backends in `vc-handled-backends'; the following line,
+;; placed in your ~/.emacs, will accomplish this:
;;
+;; (add-to-list 'vc-handled-backends 'GIT)
+;;
;; TODO
;; - changelog generation
;; - working with revisions other than HEAD
;;
+(eval-when-compile (require 'cl))
+
(defvar git-commits-coding-system 'utf-8
"Default coding system for git commits.")
@@ -53,8 +58,9 @@
(with-temp-buffer
(let* ((dir (file-name-directory file))
(name (file-relative-name file dir)))
- (when dir (cd dir))
- (and (ignore-errors (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name)))
+ (and (ignore-errors
+ (when dir (cd dir))
+ (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name)))
(let ((str (buffer-string)))
(and (> (length str) (length name))
(string= (substring str 0 (1+ (length name))) (concat name "\0"))))))))
1.14 +5 -4 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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vc-hooks.el 2006/10/15 18:56:55 1.13
+++ vc-hooks.el 2007/01/18 22:10:07 1.14
@@ -1,7 +1,7 @@
;;; vc-hooks.el --- resident support for version-control
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002,
-;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel at gnu.org>
@@ -641,9 +641,10 @@ the user should be returned; if REGEXP i
a regexp for matching all such backup files, regardless of the version."
(if regexp
(concat (regexp-quote (file-name-nondirectory file))
- "\\.~[0-9.]+" (unless manual "\\.") "~")
+ "\\.~.+" (unless manual "\\.") "~")
(expand-file-name (concat (file-name-nondirectory file)
- ".~" (or rev (vc-workfile-version file))
+ ".~" (subst-char-in-string
+ ?/ ?_ (or rev (vc-workfile-version file)))
(unless manual ".") "~")
(file-name-directory file))))
1.17 +8 -4 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.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vc-svn.el 2006/11/11 12:25:05 1.16
+++ vc-svn.el 2007/01/18 22:10:08 1.17
@@ -1,6 +1,6 @@
;;; vc-svn.el --- non-resident support for Subversion version-control
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier at gnu.org>
@@ -517,9 +517,13 @@ information about FILENAME and return it
(let (file status)
(goto-char (point-min))
(while (re-search-forward
- "^[ ADMCI?!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\) +" nil t)
- (setq file (expand-file-name
- (buffer-substring (point) (line-end-position))))
+ ;; Ignore the files with status in [IX?].
+ "^[ ACDGMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\) +" nil t)
+ ;; If the username contains spaces, the output format is ambiguous,
+ ;; so don't trust the output's filename unless we have to.
+ (setq file (or filename
+ (expand-file-name
+ (buffer-substring (point) (line-end-position)))))
(setq status (char-after (line-beginning-position)))
(unless (eq status ??)
;; `vc-BACKEND-registered' must not set vc-backend,
More information about the XEmacs-CVS
mailing list