diff options
Diffstat (limited to 'lisp/vc-git.el')
-rw-r--r-- | lisp/vc-git.el | 254 |
1 files changed, 137 insertions, 117 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 64efec6a41f..7920fec0289 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -53,22 +53,22 @@ ;; * state (file) OK ;; - state-heuristic (file) NOT NEEDED ;; - dir-state (dir) OK -;; * workfile-version (file) OK +;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (file) OK ;; - workfile-unchanged-p (file) OK -;; - mode-line-string (file) NOT NEEDED +;; - mode-line-string (file) OK ;; - dired-state-info (file) OK ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK ;; * register (files &optional rev comment) OK -;; - init-version (file) NOT NEEDED +;; - init-revision (file) NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD ;; - receive-file (file rev) NOT NEEDED ;; - unregister (file) OK ;; * checkin (files rev comment) OK -;; * find-version (file rev buffer) OK +;; * find-revision (file rev buffer) OK ;; * checkout (file &optional editable rev) OK ;; * revert (file &optional contents-done) OK ;; - rollback (files) COULD BE SUPPORTED @@ -77,18 +77,17 @@ ;; wouldn't be identified as a merge by git, ;; so it's probably not a good idea. ;; - merge-news (file) see `merge' -;; - steal-lock (file &optional version) NOT NEEDED +;; - steal-lock (file &optional revision) NOT NEEDED ;; HISTORY FUNCTIONS ;; * print-log (files &optional buffer) OK ;; - log-view-mode () OK -;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD +;; - show-log-entry (revision) OK ;; - wash-log (file) COULD BE SUPPORTED ;; - logentry-check () NOT NEEDED ;; - comment-history (file) ?? ;; - update-changelog (files) COULD BE SUPPORTED ;; * diff (file &optional rev1 rev2 buffer) OK -;; - revision-completion-table (file) NOT SUPPORTED in emacs-22.x -;; - diff-tree (dir &optional rev1 rev2) OK +;; - revision-completion-table (files) NEEDED? ;; - annotate-command (file buf &optional rev) OK ;; - annotate-time () OK ;; - annotate-current-time () NOT NEEDED @@ -100,8 +99,8 @@ ;; MISCELLANEOUS ;; - make-version-backups-p (file) NOT NEEDED ;; - repository-hostname (dirname) NOT NEEDED -;; - previous-version (file rev) OK -;; - next-version (file rev) OK +;; - previous-revision (file rev) OK +;; - next-revision (file rev) OK ;; - check-headers () COULD BE SUPPORTED ;; - clear-headers () NOT NEEDED ;; - delete-file (file) OK @@ -117,7 +116,7 @@ ;;; BACKEND PROPERTIES (defun vc-git-revision-granularity () - 'repository) + 'repository) ;;; STATE-QUERYING FUNCTIONS @@ -135,56 +134,49 @@ (let* ((dir (file-name-directory file)) (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))) + (when dir (cd dir)) + (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))) (concat name "\0"))))))))) + (string= (substring str 0 (1+ (length name))) + (concat name "\0"))))))))) (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)) + (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" "-c" "-m" "-o") + (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-backend 'Git) - (vc-file-setprop file 'vc-state 'up-to-date)) - ((eq status-char ?M) - (vc-file-setprop file 'vc-backend 'Git) - (vc-file-setprop file 'vc-state 'edited)) - ((eq status-char ?C) - (vc-file-setprop file 'vc-backend 'Git) - (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))))) - -(defun vc-git-workfile-version (file) - "Git-specific version of `vc-workfile-version'." + (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))) @@ -195,6 +187,18 @@ (defun vc-git-workfile-unchanged-p (file) (eq 'up-to-date (vc-git-state file))) +(defun vc-git-mode-line-string (file) + "Return string for placement into the modeline for FILE." + (let* ((branch (vc-git-working-revision file)) + (def-ml (vc-default-mode-line-string 'Git file)) + (help-echo (get-text-property 0 'help-echo def-ml))) + (if (zerop (length branch)) + (propertize + (concat def-ml "!") + 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) + (propertize def-ml + 'help-echo (concat help-echo "\nCurrent branch: " branch))))) + (defun vc-git-dired-state-info (file) "Git-specific version of `vc-dired-state-info'." (let ((git-state (vc-state file))) @@ -223,7 +227,7 @@ (let ((coding-system-for-write git-commits-coding-system)) (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) -(defun vc-git-find-version (file rev buffer) +(defun vc-git-find-revision (file rev buffer) (let ((coding-system-for-read 'binary) (coding-system-for-write 'binary) (fullname (substring @@ -282,35 +286,51 @@ "^commit *\\([0-9a-z]+\\)") (set (make-local-variable 'log-view-font-lock-keywords) (append - `((,log-view-message-re (1 'change-log-acknowledgement)) - (,log-view-file-re (1 'change-log-file-face))) - ;; Handle the case: - ;; user: foo@bar - '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" - (1 'change-log-email)) - ;; Handle the case: - ;; user: FirstName LastName <foo@bar> - ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" - (1 'change-log-name) - (2 'change-log-email)) - ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" - (1 'change-log-name)) - ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" - (1 'change-log-name) - (2 'change-log-email)) - ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" - (1 'change-log-acknowledgement) - (2 'change-log-acknowledgement)) - ("^Date: \\(.+\\)" (1 'change-log-date)) - ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) + `((,log-view-message-re (1 'change-log-acknowledgement)) + (,log-view-file-re (1 'change-log-file-face))) + ;; Handle the case: + ;; user: foo@bar + '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" + (1 'change-log-email)) + ;; Handle the case: + ;; user: FirstName LastName <foo@bar> + ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" + (1 'change-log-name) + (2 'change-log-email)) + ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" + (1 'change-log-name)) + ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" + (1 'change-log-name) + (2 'change-log-email)) + ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" + (1 'change-log-acknowledgement) + (2 'change-log-acknowledgement)) + ("^Date: \\(.+\\)" (1 'change-log-date)) + ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) + +(defun vc-git-show-log-entry (revision) + "Move to the log entry for REVISION. +REVISION may have the form BRANCH, BRANCH~N, +or BRANCH^ (where \"^\" can be repeated)." + (goto-char (point-min)) + (search-forward "\ncommit" nil t + (cond ((string-match "~\\([0-9]\\)$" revision) + (1+ (string-to-number (match-string 1 revision)))) + ((string-match "\\^+$" revision) + (1+ (length (match-string 0 revision)))) + (t nil))) + (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) (let ((buf (or buffer "*vc-diff*"))) (if (and rev1 rev2) - (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" rev1 rev2 "--") - (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" (or rev1 "HEAD") "--")))) + (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" + rev1 rev2 "--") + (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" + (or rev1 "HEAD") "--")))) -(defun vc-git-revision-table (file) +(defun vc-git-revision-table (files) + ;; What about `files'?!? --Stef (let ((table (list "HEAD"))) (with-temp-buffer (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") @@ -319,31 +339,30 @@ (push (match-string 2) table))) table)) -(defun vc-git-revision-completion-table (file) - (lexical-let ((file file) +(defun vc-git-revision-completion-table (files) + (lexical-let ((files files) table) (setq table (lazy-completion-table - table (lambda () (vc-git-revision-table file)))) + table (lambda () (vc-git-revision-table files)))) table)) -(defun vc-git-diff-tree (dir &optional rev1 rev2) - (vc-git-diff dir rev1 rev2)) - (defun vc-git-annotate-command (file buf &optional rev) ;; FIXME: rev is ignored (let ((name (file-relative-name file))) (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))) '(6 5 4 3 2 1 7)))))) + (apply #'encode-time (mapcar (lambda (match) + (string-to-number (match-string match))) + '(6 5 4 3 2 1 7)))))) (defun vc-git-annotate-extract-revision-at-line () - (save-excursion - (move-beginning-of-line 1) - (and (looking-at "[0-9a-f]+") - (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) + (save-excursion + (move-beginning-of-line 1) + (and (looking-at "[0-9a-f]+") + (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) ;;; SNAPSHOT SYSTEM @@ -363,49 +382,43 @@ ;;; MISCELLANEOUS -(defun vc-git-previous-version (file rev) - "Git-specific version of `vc-previous-version'." +(defun vc-git-previous-revision (file rev) + "Git-specific version of `vc-previous-revision'." (let ((default-directory (file-name-directory (expand-file-name file))) (file (file-name-nondirectory file))) (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)) (not (bobp)) (buffer-substring-no-properties - (point) - (1- (point-max)))))))) + (point) + (1- (point-max)))))))) -(defun vc-git-next-version (file rev) - "Git-specific version of `vc-next-version'." +(defun vc-git-next-revision (file rev) + "Git-specific version of `vc-next-revision'." (let* ((default-directory (file-name-directory (expand-file-name file))) - (file (file-name-nondirectory file)) - (current-rev - (with-temp-buffer - (and - (zerop - (call-process "git" nil '(t nil) nil "rev-list" - "-1" rev "--" file)) - (goto-char (point-max)) - (bolp) - (zerop (forward-line -1)) - (bobp) - (buffer-substring-no-properties - (point) - (1- (point-max))))))) + (file (file-name-nondirectory file)) + (current-rev + (with-temp-buffer + (and + (vc-git--out-ok "rev-list" "-1" rev "--" file) + (goto-char (point-max)) + (bolp) + (zerop (forward-line -1)) + (bobp) + (buffer-substring-no-properties + (point) + (1- (point-max))))))) (and current-rev (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)) @@ -430,13 +443,23 @@ 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))) @@ -446,10 +469,7 @@ Returns nil if not possible." (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) |