Mercurial > emacs

comparison lisp/vc-git.el @ 86422:68e2cdfcf931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-git-annotate-time): Handle optional field FILENAME. Also, match one space at end of annotation text, after last paren.
author Thien-Thi Nguyen <ttn@gnuvola.org>
date Sun, 25 Nov 2007 00:41:49 +0000
parents d2c8f5a27761
children 7c0a55a957d0
comparison
equal deleted inserted replaced
86421:ad95f9479040 86422:68e2cdfcf931
357 ;; FIXME: rev is ignored 357 ;; FIXME: rev is ignored
358 (let ((name (file-relative-name file))) 358 (let ((name (file-relative-name file)))
359 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) 359 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev)))))
360 360
361 (defun vc-git-annotate-time () 361 (defun vc-git-annotate-time ()
362 (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) 362 (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)
363 (vc-annotate-convert-time 363 (vc-annotate-convert-time
364 (apply #'encode-time (mapcar (lambda (match) 364 (apply #'encode-time (mapcar (lambda (match)
365 (string-to-number (match-string match))) 365 (string-to-number (match-string match)))
366 '(6 5 4 3 2 1 7)))))) 366 '(6 5 4 3 2 1 7))))))
367 367