mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
vc-git.el: Switch to using git-blame instead of git-annotate.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
c530c5aa31
commit
13f8e0b24b
|
@ -119,10 +119,10 @@
|
||||||
(defun vc-git-annotate-command (file buf &optional rev)
|
(defun vc-git-annotate-command (file buf &optional rev)
|
||||||
; FIXME: rev is ignored
|
; FIXME: rev is ignored
|
||||||
(let ((name (file-relative-name file)))
|
(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 ()
|
(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
|
(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))))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue