procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc-git.el (vc-git-region-history): Handle local changes

Browse source 
Adjust lto/lfrom when we have uncommitted changes.
This commit is contained in:
Stefan Monnier 2015-10-02 15:24:23 -04:00
parent 355ccbcf33
commit a5c20339c5
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lisp/vc/vc-git.el
View file

@ -974,6 +974,34 @@ or BRANCH^ (where \"^\" can be repeated)."
(buffer-string))))
(defun vc-git-region-history (file buffer lfrom lto)
;; The "git log" command below interprets the line numbers as applying
;; to the HEAD version of the file, not to the current state of the file.
;; So we need to look at all the local changes and adjust lfrom/lto
;; accordingly.
;; FIXME: Maybe this should be done in vc.el (i.e. for all backends), but
;; since Git is the only backend to support this operation so far, it's hard
;; to tell.
(with-temp-buffer
(vc-call-backend 'git 'diff file "HEAD" nil (current-buffer))
(goto-char (point-min))
(let ((last-offset 0)
(from-offset nil)
(to-offset nil))
(while (re-search-forward
"^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@" nil t)
(let ((headno (string-to-number (match-string 1)))
(headcnt (string-to-number (match-string 2)))
(curno (string-to-number (match-string 3)))
(curcnt (string-to-number (match-string 4))))
(cl-assert (equal (- curno headno) last-offset))
(and (null from-offset) (> curno lfrom)
(setq from-offset last-offset))
(and (null to-offset) (> curno lto)
(setq to-offset last-offset))
(setq last-offset
(- (+ curno curcnt) (+ headno headcnt)))))
(setq lto (- lto (or to-offset last-offset)))
(setq lfrom (- lfrom (or to-offset last-offset)))))
(vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not supported?
(format "-L%d,%d:%s" lfrom lto (file-relative-name file))))