kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-blame.el: blame unsaved changes 

Make git-blame use the current buffer contents for the blame, instead of
the saved file.  This makes the blame correct even if there are unsaved
changes.

Also added a git-reblame command.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
David Kågedal 2007-02-09 09:21:32 +01:00 committed by Junio C Hamano
parent fa88211600
commit f0f39bb4c4
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/emacs/git-blame.el
View File

@ -102,8 +102,17 @@


(defvar git-blame-ancient-color "dark green") (defvar git-blame-ancient-color "dark green")


(defvar git-blame-overlays nil) (defvar git-blame-proc nil
(defvar git-blame-cache nil) "The running git-blame process")
(make-variable-buffer-local 'git-blame-proc)

(defvar git-blame-overlays nil
"The git-blame overlays used in the current buffer.")
(make-variable-buffer-local 'git-blame-overlays)

(defvar git-blame-cache nil
"A cache of git-blame information for the current buffer")
(make-variable-buffer-local 'git-blame-cache)


(defvar git-blame-mode nil) (defvar git-blame-mode nil)
(make-variable-buffer-local 'git-blame-mode) (make-variable-buffer-local 'git-blame-mode)
@ -118,9 +127,7 @@
(if arg (if arg
(setq git-blame-mode (eq arg 1)) (setq git-blame-mode (eq arg 1))
(setq git-blame-mode (not git-blame-mode))) (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-colors)
(make-local-variable 'git-blame-cache)
(git-blame-cleanup) (git-blame-cleanup)
(if git-blame-mode (if git-blame-mode
(progn (progn
@ -131,24 +138,37 @@
(setq git-blame-cache (make-hash-table :test 'equal)) (setq git-blame-cache (make-hash-table :test 'equal))
(git-blame-run)))) (git-blame-run))))


;;;###autoload
(defun git-reblame ()
"Recalculate all blame information in the current buffer"
(unless git-blame-mode
(error "git-blame is not active"))
(interactive)
(git-blame-cleanup)
(git-blame-run))

(defun git-blame-run () (defun git-blame-run ()
(let* ((display-buf (current-buffer)) (if git-blame-proc
;; Should maybe queue up a new run here
(message "Already running git blame")
(let ((display-buf (current-buffer))
(blame-buf (get-buffer-create (blame-buf (get-buffer-create
(concat " git blame for " (buffer-name)))) (concat " git blame for " (buffer-name)))))
(proc (start-process "git-blame" blame-buf (setq git-blame-proc
"git" "blame" "--incremental" (start-process "git-blame" blame-buf
(file-name-nondirectory buffer-file-name)))) "git" "blame"
(mapcar 'delete-overlay git-blame-overlays) "--incremental" "--contents" "-"
(setq git-blame-overlays nil) (file-name-nondirectory buffer-file-name)))
(setq git-blame-cache (make-hash-table :test 'equal))
(with-current-buffer blame-buf (with-current-buffer blame-buf
(erase-buffer) (erase-buffer)
(make-local-variable 'git-blame-file) (make-local-variable 'git-blame-file)
(make-local-variable 'git-blame-current) (make-local-variable 'git-blame-current)
(setq git-blame-file display-buf) (setq git-blame-file display-buf)
(setq git-blame-current nil)) (setq git-blame-current nil))
(set-process-filter proc 'git-blame-filter) (set-process-filter git-blame-proc 'git-blame-filter)
(set-process-sentinel proc 'git-blame-sentinel))) (set-process-sentinel git-blame-proc 'git-blame-sentinel)
(process-send-region git-blame-proc (point-min) (point-max))
(process-send-eof git-blame-proc))))


(defun git-blame-cleanup () (defun git-blame-cleanup ()
"Remove all blame properties" "Remove all blame properties"
@ -159,6 +179,9 @@
(set-buffer-modified-p modified))) (set-buffer-modified-p modified)))


(defun git-blame-sentinel (proc status) (defun git-blame-sentinel (proc status)
(with-current-buffer (process-buffer proc)
(with-current-buffer git-blame-file
(setq git-blame-proc nil)))
;;(kill-buffer (process-buffer proc)) ;;(kill-buffer (process-buffer proc))
(message "git blame finished")) (message "git blame finished"))