Mercurial > emacs

comparison lisp/vc-git.el @ 96487:5b7442d7d9ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-07-02 Magnus Henoch <mange@freemail.hu> * vc-git.el (vc-git-annotate-command): Use proper option for specifying revision.
author Magnus Henoch <mange@freemail.hu>
date Wed, 02 Jul 2008 11:56:11 +0000
parents d011b21b3f08
children d620ef3acfdc
comparison
equal deleted inserted replaced
96486:7369ded3b436 96487:5b7442d7d9ce
537 (setq table (lazy-completion-table 537 (setq table (lazy-completion-table
538 table (lambda () (vc-git-revision-table files)))) 538 table (lambda () (vc-git-revision-table files))))
539 table)) 539 table))
540 540
541 (defun vc-git-annotate-command (file buf &optional rev) 541 (defun vc-git-annotate-command (file buf &optional rev)
542 ;; FIXME: rev is ignored
543 (let ((name (file-relative-name file))) 542 (let ((name (file-relative-name file)))
544 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) 543 (vc-git-command buf 0 name "blame" rev)))
545 544
546 (declare-function vc-annotate-convert-time "vc-annotate" (time)) 545 (declare-function vc-annotate-convert-time "vc-annotate" (time))
547 546
548 (defun vc-git-annotate-time () 547 (defun vc-git-annotate-time ()
549 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) 548 (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t)