User: scop
Date: 06/07/04 23:52:24
Modified: packages/unsupported/scop/vc ChangeLog Makefile
package-info.in vc-hooks.el
Added: packages/unsupported/scop/vc vc-git.el
Log:
Add git backend from git upstream + a couple of fixes.
Revision Changes Path
1.56 +8 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ChangeLog 2006/07/04 21:48:05 1.55
+++ ChangeLog 2006/07/04 21:52:22 1.56
@@ -1,5 +1,13 @@
2006-07-04 Ville Skyttä <scop(a)xemacs.org>
+ * vc-git.el: New, from git upstream.
+ (vc-git-print-log): Add optional BUFFER arg, use it.
+ (vc-git-diff): Ditto.
+ * vc-hooks.el (vc-handled-backends): Add GIT.
+ (vc-mode-line): Ditto.
+ * package-info.in (provides): Add vc-git.
+ * Makefile (ELCS): Add vc-git.elc.
+
* vc.el (vc-coding-system-for-diff): We don't have
`find-operation-coding-system'.
1.9 +2 -2 XEmacs/packages/unsupported/scop/vc/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Makefile 2006/06/12 19:31:41 1.8
+++ Makefile 2006/07/04 21:52:23 1.9
@@ -25,7 +25,7 @@ PKG_TYPE = regular
REQUIRES = dired xemacs-base vc mail-lib ediff sh-script pcl-cvs tramp
CATEGORY = unsupported
-ELCS = vc-hooks.elc vc.elc vc-arch.elc vc-cvs.elc vc-mcvs.elc vc-rcs.elc \
- vc-sccs.elc vc-svn.elc vc-xemacs.elc log-edit.elc
+ELCS = vc-hooks.elc vc.elc vc-arch.elc vc-cvs.elc vc-git.elc vc-mcvs.elc \
+ vc-rcs.elc vc-sccs.elc vc-svn.elc vc-xemacs.elc log-edit.elc
include ../../../XEmacs.rules
1.5 +1 -1 XEmacs/packages/unsupported/scop/vc/package-info.in
Index: package-info.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/package-info.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- package-info.in 2005/12/05 11:26:28 1.4
+++ package-info.in 2006/07/04 21:52:23 1.5
@@ -13,7 +13,7 @@
filename FILENAME
md5sum MD5SUM
size SIZE
- provides (vc vc-hooks vc-arch vc-cvs vc-mcvs vc-rcs vc-sccs vc-svn vc-xemacs log-edit)
+ provides (vc vc-hooks vc-arch vc-cvs vc-git vc-mcvs vc-rcs vc-sccs vc-svn vc-xemacs log-edit)
requires (REQUIRES)
type regular
))
1.12 +4 -2 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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- vc-hooks.el 2006/04/20 21:32:29 1.11
+++ vc-hooks.el 2006/07/04 21:52:23 1.12
@@ -59,7 +59,8 @@ The default regexp prevents fruitless an
to determine the VC status in directories in which filenames are
interpreted as hostnames.")
-(defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS)
+;; XEmacs change: add GIT
+(defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS GIT)
;; Arch and MCVS come last because they are per-tree rather than per-dir.
"*List of version control backends for which VC will be used.
Entries in this list will be tried in order to determine whether a
@@ -716,7 +717,8 @@ visiting FILE."
(setq vc-mode
(let* ((str (if vc-display-status (vc-call mode-line-string file)
(symbol-name backend)))
- (test-str "^\\(RCS\\|CVS\\|SVN\\|SCCS\\|Arch\\|MCVS\\)-")
+ ;; XEmacs change: add GIT
+ (test-str "^\\(RCS\\|CVS\\|SVN\\|SCCS\\|Arch\\|MCVS\\|GIT\\)-")
(not-locked (string-match test-str str)))
(if (or not-locked (not vc-mode-face))
(concat " " str)
1.1 XEmacs/packages/unsupported/scop/vc/vc-git.el
Index: vc-git.el
===================================================================
;;; vc-git.el --- VC backend for the git version control system
;; Copyright (C) 2006 Alexandre Julliard
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation; either version 2 of
;; the License, or (at your option) any later version.
;;
;; This program is distributed in the hope that it will be
;; useful, but WITHOUT ANY WARRANTY; without even the implied
;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE. See the GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public
;; License along with this program; if not, write to the Free
;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
;; MA 02111-1307 USA
;;; Commentary:
;; This file contains a VC backend for the git version control
;; system.
;;
;; To install: put this file on the load-path and add GIT to the list
;; of supported backends in `vc-handled-backends'.
;;
;; TODO
;; - changelog generation
;; - working with revisions other than HEAD
;;
(defvar git-commits-coding-system 'utf-8
"Default coding system for git commits.")
(defun vc-git--run-command-string (file &rest args)
"Run a git command on FILE and return its output as string."
(let* ((ok t)
(str (with-output-to-string
(with-current-buffer standard-output
(unless (eq 0 (apply #'call-process "git" nil '(t nil) nil
(append args (list (file-relative-name file)))))
(setq ok nil))))))
(and ok str)))
(defun vc-git--run-command (file &rest args)
"Run a git command on FILE, discarding any output."
(let ((name (file-relative-name file)))
(eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name))))))
(defun vc-git-registered (file)
"Check whether FILE is registered with git."
(with-temp-buffer
(let* ((dir (file-name-directory file))
(name (file-relative-name file dir)))
(when dir (cd dir))
(and (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"))))))))
(defun vc-git-state (file)
"git-specific version of `vc-state'."
(let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
(if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff))
'edited
'up-to-date)))
(defun vc-git-workfile-version (file)
"git-specific version of `vc-workfile-version'."
(let ((str (with-output-to-string
(with-current-buffer standard-output
(call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD")))))
(if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
(match-string 2 str)
str)))
(defun vc-git-revert (file &optional contents-done)
"Revert FILE to the version stored in the git repository."
(if contents-done
(vc-git--run-command file "update-index" "--")
(vc-git--run-command file "checkout" "HEAD")))
(defun vc-git-checkout-model (file)
'implicit)
(defun vc-git-workfile-unchanged-p (file)
(let ((sha1 (vc-git--run-command-string file "hash-object" "--"))
(head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--")))
(and head
(string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head)
(string= (car (split-string sha1 "\n")) (match-string 1 head)))))
(defun vc-git-register (file &optional rev comment)
"Register FILE into the git version-control system."
(vc-git--run-command file "update-index" "--add" "--"))
;; XEmacs change: add optional BUFFER arg, use it
(defun vc-git-print-log (file &optional buffer)
(let ((name (file-relative-name file))
(coding-system-for-read git-commits-coding-system))
(vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--")))
;; XEmacs change: add optional BUFFER arg, use it
(defun vc-git-diff (file &optional rev1 rev2 buffer)
(let ((name (file-relative-name file))
(buf (or buffer "*vc-diff*")))
(if (and rev1 rev2)
(vc-do-command buf 0 "git" name "diff-tree" "-p" rev1 rev2 "--")
(vc-do-command buf 0 "git" name "diff-index" "-p" (or rev1 "HEAD") "--"))
; git-diff-index doesn't set exit status like diff does
(if (vc-git-workfile-unchanged-p file) 0 1)))
(defun vc-git-checkin (file rev comment)
(let ((coding-system-for-write git-commits-coding-system))
(vc-git--run-command file "commit" "-m" comment "--only" "--")))
(defun vc-git-checkout (file &optional editable rev destfile)
(vc-git--run-command file "checkout" (or rev "HEAD")))
(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)))
(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)
(vc-annotate-convert-time
(apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))
;; Not really useful since we can't do anything with the revision yet
;;(defun vc-annotate-extract-revision-at-line ()
;; (save-excursion
;; (move-beginning-of-line 1)
;; (and (looking-at "[0-9a-f]+")
;; (buffer-substring (match-beginning 0) (match-end 0)))))
(provide 'vc-git)