mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 06:00:41 -08:00
Code Issues Projects Releases Wiki Activity

(vc-annotate-revision-at-line): Compare file

Browse source 
names too.
This commit is contained in:
Dan Nicolaescu 2010-01-25 01:04:59 -08:00
parent 433bdc96cb
commit e2396d80cb
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2010-01-25 Dan Nicolaescu <dann@ics.uci.edu> 2010-01-25 Dan Nicolaescu <dann@ics.uci.edu>
* vc-annotate.el (vc-annotate-revision-at-line): Compare file
names too.
* vc-bzr.el (vc-bzr-print-log): Use the more compact --line option * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option
for the short log. for the short log.
(vc-bzr-log-view-mode): Adjust regexp for the above change. (vc-bzr-log-view-mode): Adjust regexp for the above change.

3
lisp/vc-annotate.el
View file

@ -447,7 +447,8 @@ Return a cons (REV . FILENAME)."
(let ((rev-at-line (vc-annotate-extract-revision-at-line))) (let ((rev-at-line (vc-annotate-extract-revision-at-line)))
(if (not rev-at-line) (if (not rev-at-line)
(message "Cannot extract revision number from the current line") (message "Cannot extract revision number from the current line")
(if (equal (car rev-at-line) vc-annotate-parent-rev) (if (and (equal (car rev-at-line) vc-annotate-parent-rev)
(string= (cdr rev-at-line) vc-annotate-parent-file))
(message "Already at revision %s" rev-at-line) (message "Already at revision %s" rev-at-line)
(vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line))))))) (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line)))))))