;;; vc-git.el --- VC backend for the git version control system
-;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Alexandre Julliard <julliard@winehq.org>
;; Keywords: tools
(name (file-relative-name file dir)))
(and (ignore-errors
(when dir (cd dir))
- (eq 0 (call-process "git" nil '(t nil) nil "ls-files"
- "-c" "-z" "--" name)))
+ (vc-git--out-ok "ls-files" "-c" "-z" "--" name))
(let ((str (buffer-string)))
(and (> (length str) (length name))
(string= (substring str 0 (1+ (length name)))
(defun vc-git-state (file)
"Git-specific version of `vc-state'."
- (call-process "git" nil nil nil "add" "--refresh" "--" (file-relative-name file))
+ ;; FIXME: This can't set 'ignored yet
+ (vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
(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-dir-state (dir)
+(defun vc-git--ls-files-state (state &rest args)
+ "Set state to STATE on all files found with git-ls-files ARGS."
(with-temp-buffer
- (vc-git-command (current-buffer) nil nil "ls-files" "-t")
+ (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args)
(goto-char (point-min))
- (let ((status-char nil)
- (file nil))
- (while (not (eobp))
- (setq status-char (char-after))
- (setq file
- (expand-file-name
- (buffer-substring-no-properties (+ (point) 2)
- (line-end-position))))
- (cond
- ;; The rest of the possible states in "git ls-files -t" output:
- ;; R removed/deleted
- ;; K to be killed
- ;; should not show up in vc-dired, so don't deal with them
- ;; here.
- ((eq status-char ?H)
- (vc-file-setprop file 'vc-state 'up-to-date))
- ((eq status-char ?M)
- (vc-file-setprop file 'vc-state 'edited))
- ((eq status-char ?C)
- (vc-file-setprop file 'vc-state 'edited))
- ((eq status-char ??)
- (vc-file-setprop file 'vc-backend 'none)
- (vc-file-setprop file 'vc-state 'nil)))
- (forward-line)))))
+ (let ((start (point)))
+ (while (search-forward "\0" nil t)
+ (let ((file (expand-file-name
+ (buffer-substring-no-properties start (1- (point))))))
+ (vc-file-setprop file 'vc-backend (if state 'Git 'none))
+ (vc-file-setprop file 'vc-state state))
+ (setq start (point))))))
+
+(defun vc-git-dir-state (dir)
+ "Git-specific version of `dir-state'."
+ (vc-git--ls-files-state 'up-to-date "-c")
+ (vc-git--ls-files-state 'edited "-m")
+ (vc-git--ls-files-state 'removed "-d")
+ (vc-git--ls-files-state 'ignored "-o" "-i" "--exclude-standard")
+ (vc-git--ls-files-state nil "-o" "--exclude-standard"))
(defun vc-git-working-revision (file)
"Git-specific version of `vc-working-revision'."
(let ((str (with-output-to-string
(with-current-buffer standard-output
- (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD")))))
+ (vc-git--out-ok "symbolic-ref" "HEAD")))))
(if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
(match-string 2 str)
str)))
(vc-git-command buf 0 name "blame" (if rev (concat "-r" rev)))))
(defun vc-git-annotate-time ()
- (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)
+ (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)))
(vc-git-symbolic-commit
(with-temp-buffer
(and
- (zerop
- (call-process "git" nil '(t nil) nil "rev-list"
- "-2" rev "--" file))
+ (vc-git--out-ok "rev-list" "-2" rev "--" file)
(goto-char (point-max))
(bolp)
(zerop (forward-line -1))
(current-rev
(with-temp-buffer
(and
- (zerop
- (call-process "git" nil '(t nil) nil "rev-list"
- "-1" rev "--" file))
+ (vc-git--out-ok "rev-list" "-1" rev "--" file)
(goto-char (point-max))
(bolp)
(zerop (forward-line -1))
(vc-git-symbolic-commit
(with-temp-buffer
(and
- (zerop
- (call-process "git" nil '(t nil) nil "rev-list"
- "HEAD" "--" file))
+ (vc-git--out-ok "rev-list" "HEAD" "--" file)
(goto-char (point-min))
(search-forward current-rev nil t)
(zerop (forward-line -1))
The difference to vc-do-command is that this function always invokes `git'."
(apply 'vc-do-command buffer okstatus "git" file-or-list flags))
+(defun vc-git--call (buffer command &rest args)
+ ;; We don't need to care the arguments. If there is a file name, it
+ ;; is always a relative one. This works also for remote
+ ;; directories.
+ (apply 'process-file "git" nil buffer nil command args))
+
+(defun vc-git--out-ok (command &rest args)
+ (zerop (apply 'vc-git--call '(t nil) command args)))
+
(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)))))
+ (unless (apply 'vc-git--out-ok
+ (append args (list (file-relative-name
+ file))))
(setq ok nil))))))
(and ok str)))
(and commit
(with-temp-buffer
(and
- (zerop
- (call-process "git" nil '(t nil) nil "name-rev"
- "--name-only" "--tags"
- commit))
+ (vc-git--out-ok "name-rev" "--name-only" "--tags" commit)
(goto-char (point-min))
(= (forward-line 2) 1)
(bolp)
HCoop / bpt / emacs.git / blobdiff