# [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate. 3 messages from 2006-10-05 to 2006-10-05. Participants: Alexandre Julliard, Junio C Hamano. Thread: https://gitlist.dev/t/5817 ## Alexandre Julliard, 2006-10-05 09:30 Subject: [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate. Message-ID: <87k63f9kjf.fsf@wine.dyndns.org> URL: https://gitlist.dev/e/87k63f9kjf.fsf%40wine.dyndns.org ``` Signed-off-by: Alexandre Julliard --- contrib/emacs/vc-git.el | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el index 4a8f790..4189c4c 100644 --- a/contrib/emacs/vc-git.el +++ b/contrib/emacs/vc-git.el @@ -119,10 +119,10 @@ (defun vc-git-checkout (file &optional e (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))) + (call-process "git" nil buf nil "blame" 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) + (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)))))) -- 1.4.2.3.g1723 -- Alexandre Julliard julliard@winehq.org ``` ## Junio C Hamano, 2006-10-05 09:34 Subject: Re: [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate. Message-ID: <7v4pujf6mx.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v4pujf6mx.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <87k63f9kjf.fsf@wine.dyndns.org> ``` Alexandre Julliard writes: > Signed-off-by: Alexandre Julliard > --- > contrib/emacs/vc-git.el | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el > index 4a8f790..4189c4c 100644 > --- a/contrib/emacs/vc-git.el > +++ b/contrib/emacs/vc-git.el > @@ -119,10 +119,10 @@ (defun vc-git-checkout (file &optional e > (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))) > + (call-process "git" nil buf nil "blame" name))) "blame -c" is advertised to give the same format as "annotate", so I think you would not need other hunk if you did. > (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 > (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7)))))) Not that I am preferring the annotate output format over blame's native output format. I just wanted to know if the reason you did not do -c was because you tried and "blame -c" was not compatible as advertised (in which case we have one more thing to fix). ``` ## Alexandre Julliard, 2006-10-05 09:52 Subject: Re: [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate. Message-ID: <87fye39jij.fsf@wine.dyndns.org> URL: https://gitlist.dev/e/87fye39jij.fsf%40wine.dyndns.org In-Reply-To: <7v4pujf6mx.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano writes: > Not that I am preferring the annotate output format over blame's > native output format. I just wanted to know if the reason you > did not do -c was because you tried and "blame -c" was not > compatible as advertised (in which case we have one more thing > to fix). As far as I can tell, "blame -c" works fine. I switched because I find the default blame output nicer, it wastes less horizontal space and the file contents are properly aligned. -- Alexandre Julliard julliard@winehq.org ```