[PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Jakub Narebski]

Here is an Emacs implementation of incremental git-blame.  When you
turn it on while viewing a file, the editor buffer will be updated by
setting the background of individual lines to a color that reflects
which commit it comes from.  And when you move around the buffer, a
one-line summary will be shown in the echo area.

Created by David Kågedal, header and comments added by Jakub Narębski.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
---
This time I hope in proper utf-8 encoding.

Here it is as a proper git patch, and with some headers and comments
added. As compared to latest version sent by David Kågedal,
  Message-ID: <87iren2vqx.fsf@morpheus.local>
  http://permalink.gmane.org/gmane.comp.version-control.git/38246
it has elisp header and description by David Kågedal, has (require 'cl)
with explanation added, and (provide 'git-blame) at the end; no other
changes (as of now).

David, is it released as GPL? If it is, GPL boilerplate (as in git.el)
could be added to the header.

 contrib/emacs/git-blame.el |  222 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 222 insertions(+), 0 deletions(-)

diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
new file mode 100644
index 0000000..fa89889
--- /dev/null
+++ b/contrib/emacs/git-blame.el
@@ -0,0 +1,222 @@
+;;; git-blame.el --- Minor mode for incremental blame for Git  -*- coding: utf-8 -*-
+;;
+;; Copyright (C) 2007 by David Kågedal
+;;
+;; Authors:    David Kågedal <davidk@lysator.liu.se>
+;; Created:    31 Jan 2007
+;; Keywords:   git, version control, release management
+;;
+;; Compatibility: Emacs21
+
+;;; Commentary:
+;;
+;; Here is an Emacs implementation of incremental git-blame.  When you
+;; turn it on while viewing a file, the editor buffer will be updated by
+;; setting the background of individual lines to a color that reflects
+;; which commit it comes from.  And when you move around the buffer, a
+;; one-line summary will be shown in the echo area.
+
+;;; Installation:
+;;
+;;  1) Load into emacs: M-x load-file RET git-blame.el RET
+;;  2) Open a git-controlled file
+;;  3) Blame: M-x git-blame-mode
+
+;;; Compatibility:
+;;
+;; It requires GNU Emacs 21.  If you'are using Emacs 20, try
+;; changing this:
+;;
+;;            (overlay-put ovl 'face (list :background
+;;                                         (cdr (assq 'color (cddddr info)))))
+;;
+;; to
+;;
+;;            (overlay-put ovl 'face (cons 'background-color
+;;                                         (cdr (assq 'color (cddddr info)))))
+
+
+;;; Code:
+
+(require 'cl)			      ; to use `cddddr', `push', `pop'
+
+(defun color-scale (l)
+  (let* ((colors ())
+         r g b)
+    (setq r l)
+    (while r
+      (setq g l)
+      (while g
+        (setq b l)
+        (while b
+          (push (concat "#" (car r) (car g) (car b)) colors)
+          (pop b))
+        (pop g))
+      (pop r))
+    colors))
+
+(defvar git-blame-dark-colors
+  (color-scale '("00" "04" "08" "0c"
+                 "10" "14" "18" "1c"
+                 "20" "24" "28" "2c"
+                 "30" "34" "38" "3c")))
+
+(defvar git-blame-light-colors
+  (color-scale '("c0" "c4" "c8" "cc"
+                 "d0" "d4" "d8" "dc"
+                 "e0" "e4" "e8" "ec"
+                 "f0" "f4" "f8" "fc")))
+
+(defvar git-blame-ancient-color "dark green")
+
+(defvar git-blame-overlays nil)
+(defvar git-blame-cache nil)
+
+(defvar git-blame-mode nil)
+(make-variable-buffer-local 'git-blame-mode)
+(push (list 'git-blame-mode " blame") minor-mode-alist)
+
+(defun git-blame-mode (&optional arg)
+  (interactive "P")
+  (if arg
+      (setq git-blame-mode (eq arg 1))
+    (setq git-blame-mode (not git-blame-mode)))
+  (make-local-variable 'git-blame-overlays)
+  (make-local-variable 'git-blame-colors)
+  (make-local-variable 'git-blame-cache)
+   (let ((bgmode (cdr (assoc 'background-mode (frame-parameters)))))
+    (if (eq bgmode 'dark)
+        (setq git-blame-colors git-blame-dark-colors)
+      (setq git-blame-colors git-blame-light-colors)))
+  (if git-blame-mode
+      (git-blame-run)
+    (git-blame-cleanup)))
+
+(defun git-blame-run ()
+  (let* ((display-buf (current-buffer))
+         (blame-buf (get-buffer-create
+                     (concat " git blame for " (buffer-name))))
+         (proc (start-process "git-blame" blame-buf
+                             "git" "blame" "--incremental"
+                             (file-name-nondirectory buffer-file-name))))
+    (mapcar 'delete-overlay git-blame-overlays)
+    (setq git-blame-overlays nil)
+    (setq git-blame-cache (make-hash-table :test 'equal))
+    (with-current-buffer blame-buf
+      (erase-buffer)
+      (make-local-variable 'git-blame-file)
+      (make-local-variable 'git-blame-current)
+      (setq git-blame-file display-buf)
+      (setq git-blame-current nil))
+    (set-process-filter proc 'git-blame-filter)
+    (set-process-sentinel proc 'git-blame-sentinel)))
+
+(defun git-blame-cleanup ()
+  "Remove all blame properties"
+    (mapcar 'delete-overlay git-blame-overlays)
+    (setq git-blame-overlays nil)
+    (let ((modified (buffer-modified-p)))
+      (remove-text-properties (point-min) (point-max) '(point-entered nil))
+      (set-buffer-modified-p modified)))
+
+
+(defun git-blame-sentinel (proc status)
+  ;;(kill-buffer (process-buffer proc))
+  (message "git blame finished"))
+
+(defvar in-blame-filter nil)
+
+(defun git-blame-filter (proc str)
+  (save-excursion
+    (set-buffer (process-buffer proc))
+    (goto-char (process-mark proc))
+    (insert-before-markers str)
+    (goto-char 0)
+    (unless in-blame-filter
+      (let ((more t)
+            (in-blame-filter t))
+        (while more
+          (setq more (git-blame-parse)))))))
+
+(defun git-blame-parse ()
+  (cond ((looking-at "\\([0-9a-f]\\{40\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)\n")
+         (let ((hash (match-string 1))
+               (src-line (string-to-number (match-string 2)))
+               (res-line (string-to-number (match-string 3)))
+               (num-lines (string-to-number (match-string 4))))
+           (setq git-blame-current
+                 (git-blame-new-commit
+                  hash src-line res-line num-lines)))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "filename \\(.+\\)\n")
+         (let ((filename (match-string 1)))
+           (git-blame-add-info "filename" filename))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "\\([a-z-]+\\) \\(.+\\)\n")
+         (let ((key (match-string 1))
+               (value (match-string 2)))
+           (git-blame-add-info key value))
+         (delete-region (point) (match-end 0))
+         t)
+        ((looking-at "boundary\n")
+         (setq git-blame-current nil)
+         (delete-region (point) (match-end 0))
+         t)
+        (t
+         nil)))
+
+
+(defun git-blame-new-commit (hash src-line res-line num-lines)
+  (save-excursion
+    (set-buffer git-blame-file)
+    (let ((info (gethash hash git-blame-cache))
+          (inhibit-point-motion-hooks t))
+      (when (not info)
+        (let ((color (pop git-blame-colors)))
+          (unless color
+            (setq color git-blame-ancient-color))
+          (setq info (list hash src-line res-line num-lines
+                           (cons 'color color))))
+        (puthash hash info git-blame-cache))
+      (goto-line res-line)
+      (while (> num-lines 0)
+        (if (get-text-property (point) 'git-blame)
+            (forward-line)
+          (let* ((start (point))
+                 (end (progn (forward-line 1) (point)))
+                 (ovl (make-overlay start end)))
+            (push ovl git-blame-overlays)
+            (overlay-put ovl 'git-blame info)
+            (overlay-put ovl 'help-echo hash)
+            (overlay-put ovl 'face (list :background
+                                         (cdr (assq 'color (cddddr info)))))
+            ;;(overlay-put ovl 'point-entered
+            ;;             `(lambda (x y) (git-blame-identify ,hash)))
+            (let ((modified (buffer-modified-p)))
+              (put-text-property (if (= start 1) start (1- start)) (1- end)
+                                 'point-entered
+                                 `(lambda (x y) (git-blame-identify ,hash)))
+              (set-buffer-modified-p modified))))
+        (setq num-lines (1- num-lines))))))
+
+(defun git-blame-add-info (key value)
+  (if git-blame-current
+      (nconc git-blame-current (list (cons (intern key) value)))))
+
+(defun git-blame-current-commit ()
+  (let ((info (get-char-property (point) 'git-blame)))
+    (if info
+        (car info)
+      (error "No commit info"))))
+
+(defun git-blame-identify (&optional hash)
+  (interactive)
+  (shell-command
+   (format "git log -1 --pretty=oneline %s" (or hash
+                                                (git-blame-current-commit)))))
+
+(provide 'git-blame)
+
+;;; git-blame.el ends here
-- 
1.4.4.4

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

> Here is an Emacs implementation of incremental git-blame.  When you

Missing "From: " in-body header?

> turn it on while viewing a file, the editor buffer will be updated by
> setting the background of individual lines to a color that reflects
> which commit it comes from.  And when you move around the buffer, a
> one-line summary will be shown in the echo area.
>
> Created by David Kågedal, header and comments added by Jakub Narębski.

Are you Narbski, or Narebski, or are they the same?

> Signed-off-by: Jakub Narebski <jnareb@gmail.com>
> Signed-off-by: David Kågedal <davidk@lysator.liu.se>

I do not think David meant to go proprietary, but I did not see
his sign-off.

David, is this patch Ok with you?  I'll fix up to have "author"
line point fingers at you if it is, or you can send in your own
corrections/improvements (or a Nak) yourself.

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Jakub Narebski]

Junio C Hamano wrote:

> Are you Narbski, or Narebski, or are they the same?

I usually avoid using letters outside US-ASCII, approximating Narębski 
(with eogonek) with Narebski, but with David using aa in his name...
-- 
Jakub Narebski
Poland

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

> Junio C Hamano wrote:
>
>> Are you Narbski, or Narebski, or are they the same?
>
> I usually avoid using letters outside US-ASCII, approximating Narębski 
> (with eogonek) with Narebski, but with David using aa in his name...

Ahh, sorry, I usually use iso-ascii in an Emacs running on an
ASCII-only term-emu even when I am in X, and I did not see the
<ę> character between r and b in your name (right now I am in
another Emacs I opened only to compose this message).

Junio (aka 濱野 純)

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Jakub Narebski]

David Kågedal wrote:

> I have a feeling that my emails are not reaching the git list.  I
> normally read through gmane, but to to keep people happy, I tried
> answering the reply mails I got instead of following up in the
> newsgroup.  But since I'm not directly subscribed, my emails are
> probably dropped.
> 
> I don't see Jakub's recent mails in this thread in gmane either, so
> maybe he suffers from the same problem?

It looks like the whole subdiscussion didn't reach git list. I also
read git through GMane NNTP interface, but it looks as if MARC also
shows only 4 messages in this thread (no subthread starting from
David reply). Junio, Alexandre, are you subscribed to git mailing
list; can you confirm if there is no copy of this (and previous)
messages via git@vger.kernel.org?

Perhaps VGER anti-spam filter went funky again (it happened). 
postmaster@vger.kernel.org is to be pestered then.

-- 
Jakub Narebski
Poland

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Karl Hasselström]

On 2007-02-06 16:50:04 +0100, Jakub Narebski wrote:

> can you confirm if there is no copy of this (and previous) messages
> via git@vger.kernel.org?

I get the list mails via mail, and I haven't seen any discussion
between you and David.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH (take 2)] git-blame.el --- Minor mode for incremental blame for Git

[Jakub Narebski]

Karl Hasselström wrote:
> On 2007-02-06 16:50:04 +0100, Jakub Narebski wrote:
> 
>> can you confirm if there is no copy of this (and previous) messages
>> via git@vger.kernel.org?
> 
> I get the list mails via mail, and I haven't seen any discussion
> between you and David.

Hmmm... I wonder if it was because of using
  Junio C.Hamano <junkio@cox.net>
instead of
  Junio Hamano <junkio@cox.net>

In short: David said that git-blame.el is GPLv2 or later, and we agreed
on using `define-minor-mode' later when we have keymap.

-- 
Jakub Narebski
Poland