diff options
| author | David Kågedal <davidk@lysator.liu.se> | 2007-02-09 09:20:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-09 00:52:52 -0800 |
| commit | 9f85fb324dc21b595a77313936b39930437209e7 (patch) | |
| tree | 4922a49fc7c504f986b0af3b2b78e7da40e30355 /contrib | |
| parent | f6f125fbaa79c097f10afdbd7103ec068df10397 (diff) | |
| download | git-9f85fb324dc21b595a77313936b39930437209e7.tar.gz git-9f85fb324dc21b595a77313936b39930437209e7.tar.xz | |
Handle uncommitted changes and cache descriptions
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/emacs/git-blame.el | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el index 56a548b4a..c99437e5e 100644 --- a/contrib/emacs/git-blame.el +++ b/contrib/emacs/git-blame.el @@ -187,8 +187,10 @@ (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))) + (if (string= hash "0000000000000000000000000000000000000000") + nil + (git-blame-new-commit + hash src-line res-line num-lines)))) (delete-region (point) (match-end 0)) t) ((looking-at "filename \\(.+\\)\n") @@ -220,6 +222,7 @@ (unless color (setq color git-blame-ancient-color)) (setq info (list hash src-line res-line num-lines + (git-describe-commit hash) (cons 'color color)))) (puthash hash info git-blame-cache)) (goto-line res-line) @@ -233,7 +236,8 @@ (overlay-put ovl 'git-blame info) (overlay-put ovl 'help-echo hash) (overlay-put ovl 'face (list :background - (cdr (assq 'color (cddddr info))))) + (cdr (assq 'color (nthcdr 5 info))))) + ;; the point-entered property doesn't seem to work in overlays ;;(overlay-put ovl 'point-entered ;; `(lambda (x y) (git-blame-identify ,hash))) (let ((modified (buffer-modified-p))) @@ -253,11 +257,21 @@ (car info) (error "No commit info")))) +(defun git-describe-commit (hash) + (with-temp-buffer + (call-process "git" nil t nil + "log" "-1" "--pretty=oneline" + hash) + (buffer-substring (point-min) (1- (point-max))))) + +(defvar git-blame-last-identification nil) +(make-variable-buffer-local 'git-blame-last-identification) (defun git-blame-identify (&optional hash) (interactive) - (shell-command - (format "git log -1 --pretty=oneline %s" (or hash - (git-blame-current-commit))))) + (let ((info (gethash (or hash (git-blame-current-commit)) git-blame-cache))) + (when (and info (not (eq info git-blame-last-identification))) + (message "%s" (nth 4 info)) + (setq git-blame-last-identification info)))) (provide 'git-blame) |