{"thread":{"id":"5817","subject":"[PATCH] vc-git.el: Switch to using git-blame instead of git-annotate.","startedAt":"2006-10-05T09:30:44Z","lastAt":"2006-10-05T09:52:52Z","messageCount":3,"participants":["Alexandre Julliard","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"28235","messageId":"87k63f9kjf.fsf@wine.dyndns.org","threadId":"5817","inReplyTo":null,"subject":"[PATCH] vc-git.el: Switch to using git-blame instead of git-annotate.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-10-05T09:30:44Z","receivedAt":"2006-10-05T09:30:44Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n---\n contrib/emacs/vc-git.el |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el\nindex 4a8f790..4189c4c 100644\n--- a/contrib/emacs/vc-git.el\n+++ b/contrib/emacs/vc-git.el\n@@ -119,10 +119,10 @@ (defun vc-git-checkout (file &optional e\n (defun vc-git-annotate-command (file buf &optional rev)\n   ; FIXME: rev is ignored\n   (let ((name (file-relative-name file)))\n-    (call-process \"git\" nil buf nil \"annotate\" name)))\n+    (call-process \"git\" nil buf nil \"blame\" name)))\n \n (defun vc-git-annotate-time ()\n-  (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)\n+  (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)\n        (vc-annotate-convert-time\n         (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))\n \n-- \n1.4.2.3.g1723\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"28236","messageId":"7v4pujf6mx.fsf@assigned-by-dhcp.cox.net","threadId":"5817","inReplyTo":"87k63f9kjf.fsf@wine.dyndns.org","subject":"Re: [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-05T09:34:30Z","receivedAt":"2006-10-05T09:34:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexandre Julliard <julliard@winehq.org> writes:\n\n> Signed-off-by: Alexandre Julliard <julliard@winehq.org>\n> ---\n>  contrib/emacs/vc-git.el |    4 ++--\n>  1 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el\n> index 4a8f790..4189c4c 100644\n> --- a/contrib/emacs/vc-git.el\n> +++ b/contrib/emacs/vc-git.el\n> @@ -119,10 +119,10 @@ (defun vc-git-checkout (file &optional e\n>  (defun vc-git-annotate-command (file buf &optional rev)\n>    ; FIXME: rev is ignored\n>    (let ((name (file-relative-name file)))\n> -    (call-process \"git\" nil buf nil \"annotate\" name)))\n> +    (call-process \"git\" nil buf nil \"blame\" name)))\n\n\"blame -c\" is advertised to give the same format as \"annotate\",\nso I think you would not need other hunk if you did.\n\n>  (defun vc-git-annotate-time ()\n> -  (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)\n> +  (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)\n>         (vc-annotate-convert-time\n>          (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7))))))\n\nNot that I am preferring the annotate output format over blame's\nnative output format.  I just wanted to know if the reason you\ndid not do -c was because you tried and \"blame -c\" was not\ncompatible as advertised (in which case we have one more thing\nto fix).\n"},{"id":"28237","messageId":"87fye39jij.fsf@wine.dyndns.org","threadId":"5817","inReplyTo":"7v4pujf6mx.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] vc-git.el: Switch to using git-blame instead of git-annotate.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2006-10-05T09:52:52Z","receivedAt":"2006-10-05T09:52:52Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Junio C Hamano <junkio@cox.net> writes:\n\n> Not that I am preferring the annotate output format over blame's\n> native output format.  I just wanted to know if the reason you\n> did not do -c was because you tried and \"blame -c\" was not\n> compatible as advertised (in which case we have one more thing\n> to fix).\n\nAs far as I can tell, \"blame -c\" works fine. I switched because I find\nthe default blame output nicer, it wastes less horizontal space and\nthe file contents are properly aligned.\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"}]}