* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
;;; vc-annotate.el --- VC Annotate Support -*- lexical-binding: t -*-
|
2008-06-22 17:56:00 +00:00
|
|
|
|
2015-01-01 22:26:41 +00:00
|
|
|
;; Copyright (C) 1997-1998, 2000-2015 Free Software Foundation, Inc.
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
;; Author: Martin Lorentzson <emwson@emw.ericsson.se>
|
2014-02-10 01:34:22 +00:00
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
* lisp/finder.el (finder-known-keywords): Add keyword "vc"
for version control.
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
2010-06-11 19:09:57 +00:00
|
|
|
;; Keywords: vc tools
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: vc
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
2008-11-23 05:48:41 +00:00
|
|
|
;;
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(require 'vc-hooks)
|
|
|
|
|
(require 'vc)
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defcustom vc-annotate-display-mode 'fullscale
|
|
|
|
|
"Which mode to color the output of \\[vc-annotate] with by default."
|
|
|
|
|
:type '(choice (const :tag "By Color Map Range" nil)
|
|
|
|
|
(const :tag "Scale to Oldest" scale)
|
|
|
|
|
(const :tag "Scale Oldest->Newest" fullscale)
|
|
|
|
|
(number :tag "Specify Fractional Number of Days"
|
|
|
|
|
:value "20.5"))
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2014-07-08 08:49:18 +00:00
|
|
|
(defcustom vc-annotate-background-mode
|
|
|
|
|
(not (or (eq (or frame-background-mode
|
|
|
|
|
(frame-parameter nil 'background-mode))
|
|
|
|
|
'dark)
|
|
|
|
|
(and (tty-display-color-p) (<= (display-color-cells) 8))))
|
|
|
|
|
"Non-nil means `vc-annotate-color-map' is applied to the background.
|
|
|
|
|
|
|
|
|
|
When non-nil, the color range from `vc-annotate-color-map' is applied
|
|
|
|
|
to the background, while the foreground remains default.
|
|
|
|
|
|
|
|
|
|
When nil, the color range from `vc-annotate-color-map' is applied
|
|
|
|
|
to the foreground, and the color from the option `vc-annotate-background'
|
|
|
|
|
is applied to the background."
|
|
|
|
|
:type 'boolean
|
2014-08-09 23:55:39 +00:00
|
|
|
:set (lambda (symbol value)
|
|
|
|
|
(set-default symbol value)
|
|
|
|
|
(when (boundp 'vc-annotate-color-map)
|
2014-08-12 06:51:21 +00:00
|
|
|
(with-demoted-errors
|
2014-08-09 23:55:39 +00:00
|
|
|
;; Update the value of the dependent variable.
|
|
|
|
|
(custom-reevaluate-setting 'vc-annotate-color-map))))
|
2014-09-29 18:14:08 +00:00
|
|
|
:version "25.1"
|
2014-07-08 08:49:18 +00:00
|
|
|
:group 'vc)
|
|
|
|
|
|
2008-06-22 17:56:00 +00:00
|
|
|
(defcustom vc-annotate-color-map
|
|
|
|
|
(if (and (tty-display-color-p) (<= (display-color-cells) 8))
|
|
|
|
|
;; A custom sorted TTY colormap
|
|
|
|
|
(let* ((colors
|
|
|
|
|
(sort
|
|
|
|
|
(delq nil
|
|
|
|
|
(mapcar (lambda (x)
|
|
|
|
|
(if (not (or
|
|
|
|
|
(string-equal (car x) "white")
|
|
|
|
|
(string-equal (car x) "black") ))
|
|
|
|
|
(car x)))
|
|
|
|
|
(tty-color-alist)))
|
|
|
|
|
(lambda (a b)
|
|
|
|
|
(cond
|
|
|
|
|
((or (string-equal a "red") (string-equal b "blue")) t)
|
|
|
|
|
((or (string-equal b "red") (string-equal a "blue")) nil)
|
|
|
|
|
((string-equal a "yellow") t)
|
|
|
|
|
((string-equal b "yellow") nil)
|
|
|
|
|
((string-equal a "cyan") t)
|
|
|
|
|
((string-equal b "cyan") nil)
|
|
|
|
|
((string-equal a "green") t)
|
|
|
|
|
((string-equal b "green") nil)
|
|
|
|
|
((string-equal a "magenta") t)
|
|
|
|
|
((string-equal b "magenta") nil)
|
|
|
|
|
(t (string< a b))))))
|
|
|
|
|
(date 20.)
|
|
|
|
|
(delta (/ (- 360. date) (1- (length colors)))))
|
|
|
|
|
(mapcar (lambda (x)
|
|
|
|
|
(prog1
|
|
|
|
|
(cons date x)
|
|
|
|
|
(setq date (+ date delta)))) colors))
|
2014-07-08 08:49:18 +00:00
|
|
|
(cond
|
|
|
|
|
;; Normal colormap for background colors with dark foreground:
|
|
|
|
|
;; hue stepped from 0-240deg, value=1., saturation=0.20
|
|
|
|
|
(vc-annotate-background-mode
|
|
|
|
|
'(( 20. . "#FFCCCC")
|
|
|
|
|
( 40. . "#FFD8CC")
|
|
|
|
|
( 60. . "#FFE4CC")
|
|
|
|
|
( 80. . "#FFF0CC")
|
|
|
|
|
(100. . "#FFFCCC")
|
|
|
|
|
(120. . "#F6FFCC")
|
|
|
|
|
(140. . "#EAFFCC")
|
|
|
|
|
(160. . "#DEFFCC")
|
|
|
|
|
(180. . "#D2FFCC")
|
|
|
|
|
(200. . "#CCFFD2")
|
|
|
|
|
(220. . "#CCFFDE")
|
|
|
|
|
(240. . "#CCFFEA")
|
|
|
|
|
(260. . "#CCFFF6")
|
|
|
|
|
(280. . "#CCFCFF")
|
|
|
|
|
(300. . "#CCF0FF")
|
|
|
|
|
(320. . "#CCE4FF")
|
|
|
|
|
(340. . "#CCD8FF")
|
|
|
|
|
(360. . "#CCCCFF")))
|
|
|
|
|
;; Normal colormap for foreground colors on dark background:
|
|
|
|
|
;; hue stepped from 0-240deg, value=1., saturation=0.75
|
|
|
|
|
(t
|
|
|
|
|
'(( 20. . "#FF3F3F")
|
|
|
|
|
( 40. . "#FF6C3F")
|
|
|
|
|
( 60. . "#FF993F")
|
|
|
|
|
( 80. . "#FFC63F")
|
|
|
|
|
(100. . "#FFF33F")
|
|
|
|
|
(120. . "#DDFF3F")
|
|
|
|
|
(140. . "#B0FF3F")
|
|
|
|
|
(160. . "#83FF3F")
|
|
|
|
|
(180. . "#56FF3F")
|
|
|
|
|
(200. . "#3FFF56")
|
|
|
|
|
(220. . "#3FFF83")
|
|
|
|
|
(240. . "#3FFFB0")
|
|
|
|
|
(260. . "#3FFFDD")
|
|
|
|
|
(280. . "#3FF3FF")
|
|
|
|
|
(300. . "#3FC6FF")
|
|
|
|
|
(320. . "#3F99FF")
|
|
|
|
|
(340. . "#3F6CFF")
|
|
|
|
|
(360. . "#3F3FFF")))))
|
2008-06-22 17:56:00 +00:00
|
|
|
"Association list of age versus color, for \\[vc-annotate].
|
|
|
|
|
Ages are given in units of fractional days. Default is eighteen
|
|
|
|
|
steps using a twenty day increment, from red to blue. For TTY
|
|
|
|
|
displays with 8 or fewer colors, the default is red to blue with
|
|
|
|
|
all other colors between (excluding black and white)."
|
|
|
|
|
:type 'alist
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2014-07-08 08:49:18 +00:00
|
|
|
(defcustom vc-annotate-very-old-color (if vc-annotate-background-mode "#CCCCFF" "#3F3FFF")
|
2008-11-23 05:48:41 +00:00
|
|
|
"Color for lines older than the current color range in \\[vc-annotate]."
|
2008-06-22 17:56:00 +00:00
|
|
|
:type 'string
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2014-07-08 08:49:18 +00:00
|
|
|
(defcustom vc-annotate-background nil
|
2008-06-22 17:56:00 +00:00
|
|
|
"Background color for \\[vc-annotate].
|
|
|
|
|
Default color is used if nil."
|
|
|
|
|
:type '(choice (const :tag "Default background" nil) (color))
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
|
|
|
|
(defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)
|
|
|
|
|
"Menu elements for the mode-specific menu of VC-Annotate mode.
|
|
|
|
|
List of factors, used to expand/compress the time scale. See `vc-annotate'."
|
|
|
|
|
:type '(repeat number)
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
|
|
|
|
(defvar vc-annotate-mode-map
|
|
|
|
|
(let ((m (make-sparse-keymap)))
|
2008-07-01 14:47:10 +00:00
|
|
|
(define-key m "a" 'vc-annotate-revision-previous-to-line)
|
|
|
|
|
(define-key m "d" 'vc-annotate-show-diff-revision-at-line)
|
2011-05-15 13:47:56 +00:00
|
|
|
(define-key m "=" 'vc-annotate-show-diff-revision-at-line)
|
2008-07-01 14:47:10 +00:00
|
|
|
(define-key m "D" 'vc-annotate-show-changeset-diff-revision-at-line)
|
2008-06-22 17:56:00 +00:00
|
|
|
(define-key m "f" 'vc-annotate-find-revision-at-line)
|
2008-07-01 14:47:10 +00:00
|
|
|
(define-key m "j" 'vc-annotate-revision-at-line)
|
|
|
|
|
(define-key m "l" 'vc-annotate-show-log-revision-at-line)
|
|
|
|
|
(define-key m "n" 'vc-annotate-next-revision)
|
|
|
|
|
(define-key m "p" 'vc-annotate-prev-revision)
|
|
|
|
|
(define-key m "w" 'vc-annotate-working-revision)
|
|
|
|
|
(define-key m "v" 'vc-annotate-toggle-annotation-visibility)
|
2011-04-24 19:37:47 +00:00
|
|
|
(define-key m "v" 'vc-annotate-toggle-annotation-visibility)
|
|
|
|
|
(define-key m "\C-m" 'vc-annotate-goto-line)
|
2008-06-22 17:56:00 +00:00
|
|
|
m)
|
|
|
|
|
"Local keymap used for VC-Annotate mode.")
|
|
|
|
|
|
|
|
|
|
;;; Annotate functionality
|
|
|
|
|
|
|
|
|
|
;; Declare globally instead of additional parameter to
|
|
|
|
|
;; temp-buffer-show-function (not possible to pass more than one
|
|
|
|
|
;; parameter). The use of annotate-ratio is deprecated in favor of
|
|
|
|
|
;; annotate-mode, which replaces it with the more sensible "span-to
|
|
|
|
|
;; days", along with autoscaling support.
|
|
|
|
|
(defvar vc-annotate-ratio nil "Global variable.")
|
|
|
|
|
|
|
|
|
|
;; internal buffer-local variables
|
|
|
|
|
(defvar vc-annotate-backend nil)
|
|
|
|
|
(defvar vc-annotate-parent-file nil)
|
|
|
|
|
(defvar vc-annotate-parent-rev nil)
|
|
|
|
|
(defvar vc-annotate-parent-display-mode nil)
|
|
|
|
|
|
|
|
|
|
(defconst vc-annotate-font-lock-keywords
|
|
|
|
|
;; The fontification is done by vc-annotate-lines instead of font-lock.
|
|
|
|
|
'((vc-annotate-lines)))
|
|
|
|
|
|
2008-06-23 07:03:33 +00:00
|
|
|
(define-derived-mode vc-annotate-mode special-mode "Annotate"
|
2008-06-22 17:56:00 +00:00
|
|
|
"Major mode for output buffers of the `vc-annotate' command.
|
|
|
|
|
|
|
|
|
|
You can use the mode-specific menu to alter the time-span of the used
|
|
|
|
|
colors. See variable `vc-annotate-menu-elements' for customizing the
|
|
|
|
|
menu items."
|
|
|
|
|
;; Frob buffer-invisibility-spec so that if it is originally a naked t,
|
|
|
|
|
;; it will become a list, to avoid initial annotations being invisible.
|
|
|
|
|
(add-to-invisibility-spec 'foo)
|
|
|
|
|
(remove-from-invisibility-spec 'foo)
|
|
|
|
|
(set (make-local-variable 'truncate-lines) t)
|
|
|
|
|
(set (make-local-variable 'font-lock-defaults)
|
2010-03-12 08:04:54 +00:00
|
|
|
'(vc-annotate-font-lock-keywords t))
|
|
|
|
|
(hack-dir-local-variables-non-file-buffer))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-toggle-annotation-visibility ()
|
|
|
|
|
"Toggle whether or not the annotation is visible."
|
|
|
|
|
(interactive)
|
|
|
|
|
(funcall (if (memq 'vc-annotate-annotation buffer-invisibility-spec)
|
|
|
|
|
'remove-from-invisibility-spec
|
|
|
|
|
'add-to-invisibility-spec)
|
|
|
|
|
'vc-annotate-annotation)
|
|
|
|
|
(force-window-update (current-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-display-default (ratio)
|
|
|
|
|
"Display the output of \\[vc-annotate] using the default color range.
|
|
|
|
|
The color range is given by `vc-annotate-color-map', scaled by RATIO.
|
|
|
|
|
The current time is used as the offset."
|
|
|
|
|
(interactive (progn (kill-local-variable 'vc-annotate-color-map) '(1.0)))
|
|
|
|
|
(message "Redisplaying annotation...")
|
|
|
|
|
(vc-annotate-display ratio)
|
|
|
|
|
(message "Redisplaying annotation...done"))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-oldest-in-map (color-map)
|
|
|
|
|
"Return the oldest time in the COLOR-MAP."
|
|
|
|
|
;; Since entries should be sorted, we can just use the last one.
|
|
|
|
|
(caar (last color-map)))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-get-time-set-line-props ()
|
|
|
|
|
(let ((bol (point))
|
|
|
|
|
(date (vc-call-backend vc-annotate-backend 'annotate-time))
|
|
|
|
|
(inhibit-read-only t))
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
(cl-assert (>= (point) bol))
|
2008-06-22 17:56:00 +00:00
|
|
|
(put-text-property bol (point) 'invisible 'vc-annotate-annotation)
|
|
|
|
|
date))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-display-autoscale (&optional full)
|
|
|
|
|
"Highlight the output of \\[vc-annotate] using an autoscaled color map.
|
|
|
|
|
Autoscaling means that the map is scaled from the current time to the
|
|
|
|
|
oldest annotation in the buffer, or, with prefix argument FULL, to
|
|
|
|
|
cover the range from the oldest annotation to the newest."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((newest 0.0)
|
|
|
|
|
(oldest 999999.) ;Any CVS users at the founding of Rome?
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-29 01:42:51 +00:00
|
|
|
(current (vc-annotate-convert-time))
|
2008-06-22 17:56:00 +00:00
|
|
|
date)
|
|
|
|
|
(message "Redisplaying annotation...")
|
|
|
|
|
;; Run through this file and find the oldest and newest dates annotated.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(when (setq date (vc-annotate-get-time-set-line-props))
|
|
|
|
|
(when (> date newest)
|
|
|
|
|
(setq newest date))
|
|
|
|
|
(when (< date oldest)
|
|
|
|
|
(setq oldest date)))
|
|
|
|
|
(forward-line 1)))
|
|
|
|
|
(vc-annotate-display
|
|
|
|
|
(/ (- (if full newest current) oldest)
|
|
|
|
|
(vc-annotate-oldest-in-map vc-annotate-color-map))
|
|
|
|
|
(if full newest))
|
|
|
|
|
(message "Redisplaying annotation...done \(%s\)"
|
|
|
|
|
(if full
|
|
|
|
|
(format "Spanned from %.1f to %.1f days old"
|
|
|
|
|
(- current oldest)
|
|
|
|
|
(- current newest))
|
|
|
|
|
(format "Spanned to %.1f days old" (- current oldest))))))
|
|
|
|
|
|
|
|
|
|
;; Menu -- Using easymenu.el
|
|
|
|
|
(easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map
|
|
|
|
|
"VC Annotate Display Menu"
|
|
|
|
|
`("VC-Annotate"
|
|
|
|
|
["By Color Map Range" (unless (null vc-annotate-display-mode)
|
|
|
|
|
(setq vc-annotate-display-mode nil)
|
|
|
|
|
(vc-annotate-display-select))
|
|
|
|
|
:style toggle :selected (null vc-annotate-display-mode)]
|
|
|
|
|
,@(let ((oldest-in-map (vc-annotate-oldest-in-map vc-annotate-color-map)))
|
|
|
|
|
(mapcar (lambda (element)
|
|
|
|
|
(let ((days (* element oldest-in-map)))
|
|
|
|
|
`[,(format "Span %.1f days" days)
|
|
|
|
|
(vc-annotate-display-select nil ,days)
|
|
|
|
|
:style toggle :selected
|
|
|
|
|
(eql vc-annotate-display-mode ,days) ]))
|
|
|
|
|
vc-annotate-menu-elements))
|
|
|
|
|
["Span ..."
|
|
|
|
|
(vc-annotate-display-select
|
|
|
|
|
nil (float (string-to-number (read-string "Span how many days? "))))]
|
|
|
|
|
"--"
|
|
|
|
|
["Span to Oldest"
|
|
|
|
|
(unless (eq vc-annotate-display-mode 'scale)
|
|
|
|
|
(vc-annotate-display-select nil 'scale))
|
|
|
|
|
:help
|
|
|
|
|
"Use an autoscaled color map from the oldest annotation to the current time"
|
|
|
|
|
:style toggle :selected
|
|
|
|
|
(eq vc-annotate-display-mode 'scale)]
|
|
|
|
|
["Span Oldest->Newest"
|
|
|
|
|
(unless (eq vc-annotate-display-mode 'fullscale)
|
|
|
|
|
(vc-annotate-display-select nil 'fullscale))
|
|
|
|
|
:help
|
|
|
|
|
"Use an autoscaled color map from the oldest to the newest annotation"
|
|
|
|
|
:style toggle :selected
|
|
|
|
|
(eq vc-annotate-display-mode 'fullscale)]
|
|
|
|
|
"--"
|
|
|
|
|
["Toggle annotation visibility" vc-annotate-toggle-annotation-visibility
|
|
|
|
|
:help
|
|
|
|
|
"Toggle whether the annotation is visible or not"]
|
|
|
|
|
["Annotate previous revision" vc-annotate-prev-revision
|
|
|
|
|
:help "Visit the annotation of the revision previous to this one"]
|
|
|
|
|
["Annotate next revision" vc-annotate-next-revision
|
|
|
|
|
:help "Visit the annotation of the revision after this one"]
|
|
|
|
|
["Annotate revision at line" vc-annotate-revision-at-line
|
|
|
|
|
:help
|
|
|
|
|
"Visit the annotation of the revision identified in the current line"]
|
|
|
|
|
["Annotate revision previous to line" vc-annotate-revision-previous-to-line
|
|
|
|
|
:help "Visit the annotation of the revision before the revision at line"]
|
|
|
|
|
["Annotate latest revision" vc-annotate-working-revision
|
|
|
|
|
:help "Visit the annotation of the working revision of this file"]
|
2008-07-05 18:03:02 +00:00
|
|
|
"--"
|
2008-06-22 17:56:00 +00:00
|
|
|
["Show log of revision at line" vc-annotate-show-log-revision-at-line
|
|
|
|
|
:help "Visit the log of the revision at line"]
|
|
|
|
|
["Show diff of revision at line" vc-annotate-show-diff-revision-at-line
|
|
|
|
|
:help "Visit the diff of the revision at line from its previous revision"]
|
|
|
|
|
["Show changeset diff of revision at line"
|
|
|
|
|
vc-annotate-show-changeset-diff-revision-at-line
|
|
|
|
|
:enable
|
|
|
|
|
(eq 'repository (vc-call-backend ,vc-annotate-backend 'revision-granularity))
|
|
|
|
|
:help "Visit the diff of the revision at line from its previous revision"]
|
|
|
|
|
["Visit revision at line" vc-annotate-find-revision-at-line
|
|
|
|
|
:help "Visit the revision identified in the current line"]))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-display-select (&optional buffer mode)
|
|
|
|
|
"Highlight the output of \\[vc-annotate].
|
|
|
|
|
By default, the current buffer is highlighted, unless overridden by
|
|
|
|
|
BUFFER. `vc-annotate-display-mode' specifies the highlighting mode to
|
|
|
|
|
use; you may override this using the second optional arg MODE."
|
|
|
|
|
(interactive)
|
|
|
|
|
(when mode (setq vc-annotate-display-mode mode))
|
|
|
|
|
(pop-to-buffer (or buffer (current-buffer)))
|
|
|
|
|
(cond ((null vc-annotate-display-mode)
|
|
|
|
|
;; The ratio is global, thus relative to the global color-map.
|
|
|
|
|
(kill-local-variable 'vc-annotate-color-map)
|
|
|
|
|
(vc-annotate-display-default (or vc-annotate-ratio 1.0)))
|
|
|
|
|
;; One of the auto-scaling modes
|
|
|
|
|
((eq vc-annotate-display-mode 'scale)
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(vc-run-delayed (vc-annotate-display-autoscale)))
|
2008-06-22 17:56:00 +00:00
|
|
|
((eq vc-annotate-display-mode 'fullscale)
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(vc-run-delayed (vc-annotate-display-autoscale t)))
|
2008-06-22 17:56:00 +00:00
|
|
|
((numberp vc-annotate-display-mode) ; A fixed number of days lookback
|
|
|
|
|
(vc-annotate-display-default
|
|
|
|
|
(/ vc-annotate-display-mode
|
|
|
|
|
(vc-annotate-oldest-in-map vc-annotate-color-map))))
|
|
|
|
|
(t (error "No such display mode: %s"
|
|
|
|
|
vc-annotate-display-mode))))
|
|
|
|
|
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(defvar vc-sentinel-movepoint)
|
|
|
|
|
|
2008-06-22 17:56:00 +00:00
|
|
|
;;;###autoload
|
2010-06-22 03:00:54 +00:00
|
|
|
(defun vc-annotate (file rev &optional display-mode buf move-point-to vc-bk)
|
2010-06-15 04:51:42 +00:00
|
|
|
"Display the edit history of the current FILE using colors.
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
This command creates a buffer that shows, for each line of the current
|
|
|
|
|
file, when it was last edited and by whom. Additionally, colors are
|
|
|
|
|
used to show the age of each line--blue means oldest, red means
|
|
|
|
|
youngest, and intermediate colors indicate intermediate ages. By
|
|
|
|
|
default, the time scale stretches back one year into the past;
|
|
|
|
|
everything that is older than that is shown in blue.
|
|
|
|
|
|
|
|
|
|
With a prefix argument, this command asks two questions in the
|
2010-06-15 04:51:42 +00:00
|
|
|
minibuffer. First, you may enter a revision number REV; then the buffer
|
2008-06-22 17:56:00 +00:00
|
|
|
displays and annotates that revision instead of the working revision
|
|
|
|
|
\(type RET in the minibuffer to leave that default unchanged). Then,
|
|
|
|
|
you are prompted for the time span in days which the color range
|
|
|
|
|
should cover. For example, a time span of 20 days means that changes
|
|
|
|
|
over the past 20 days are shown in red to blue, according to their
|
|
|
|
|
age, and everything that is older than that is shown in blue.
|
|
|
|
|
|
|
|
|
|
If MOVE-POINT-TO is given, move the point to that line.
|
|
|
|
|
|
2010-06-22 03:00:54 +00:00
|
|
|
If VC-BK is given used that VC backend.
|
|
|
|
|
|
2008-06-22 17:56:00 +00:00
|
|
|
Customization variables:
|
|
|
|
|
|
|
|
|
|
`vc-annotate-menu-elements' customizes the menu elements of the
|
|
|
|
|
mode-specific menu. `vc-annotate-color-map' and
|
|
|
|
|
`vc-annotate-very-old-color' define the mapping of time to colors.
|
2014-07-08 08:49:18 +00:00
|
|
|
`vc-annotate-background' specifies the background color.
|
|
|
|
|
`vc-annotate-background-mode' specifies whether the color map
|
|
|
|
|
should be applied to the background or to the foreground."
|
2008-06-22 17:56:00 +00:00
|
|
|
(interactive
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(vc-ensure-vc-buffer)
|
|
|
|
|
(list buffer-file-name
|
|
|
|
|
(let ((def (vc-working-revision buffer-file-name)))
|
|
|
|
|
(if (null current-prefix-arg) def
|
2010-06-15 04:51:42 +00:00
|
|
|
(vc-read-revision
|
2008-06-22 17:56:00 +00:00
|
|
|
(format "Annotate from revision (default %s): " def)
|
2010-06-15 04:51:42 +00:00
|
|
|
(list buffer-file-name) nil def)))
|
2008-06-22 17:56:00 +00:00
|
|
|
(if (null current-prefix-arg)
|
|
|
|
|
vc-annotate-display-mode
|
|
|
|
|
(float (string-to-number
|
|
|
|
|
(read-string "Annotate span days (default 20): "
|
|
|
|
|
nil nil "20")))))))
|
|
|
|
|
(vc-ensure-vc-buffer)
|
|
|
|
|
(setq vc-annotate-display-mode display-mode) ;Not sure why. --Stef
|
|
|
|
|
(let* ((temp-buffer-name (format "*Annotate %s (rev %s)*" (buffer-name) rev))
|
|
|
|
|
(temp-buffer-show-function 'vc-annotate-display-select)
|
|
|
|
|
;; If BUF is specified, we presume the caller maintains current line,
|
|
|
|
|
;; so we don't need to do it here. This implementation may give
|
|
|
|
|
;; strange results occasionally in the case of REV != WORKFILE-REV.
|
2009-03-10 00:59:09 +00:00
|
|
|
(current-line (or move-point-to (unless buf
|
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(line-number-at-pos))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
(message "Annotating...")
|
|
|
|
|
;; If BUF is specified it tells in which buffer we should put the
|
|
|
|
|
;; annotations. This is used when switching annotations to another
|
|
|
|
|
;; revision, so we should update the buffer's name.
|
|
|
|
|
(when buf (with-current-buffer buf
|
|
|
|
|
(rename-buffer temp-buffer-name t)
|
|
|
|
|
;; In case it had to be uniquified.
|
|
|
|
|
(setq temp-buffer-name (buffer-name))))
|
|
|
|
|
(with-output-to-temp-buffer temp-buffer-name
|
2010-06-22 03:00:54 +00:00
|
|
|
(let ((backend (or vc-bk (vc-backend file)))
|
2009-09-11 10:58:54 +00:00
|
|
|
(coding-system-for-read buffer-file-coding-system))
|
2008-06-22 17:56:00 +00:00
|
|
|
(vc-call-backend backend 'annotate-command file
|
|
|
|
|
(get-buffer temp-buffer-name) rev)
|
|
|
|
|
;; we must setup the mode first, and then set our local
|
|
|
|
|
;; variables before the show-function is called at the exit of
|
|
|
|
|
;; with-output-to-temp-buffer
|
|
|
|
|
(with-current-buffer temp-buffer-name
|
|
|
|
|
(unless (equal major-mode 'vc-annotate-mode)
|
|
|
|
|
(vc-annotate-mode))
|
|
|
|
|
(set (make-local-variable 'vc-annotate-backend) backend)
|
|
|
|
|
(set (make-local-variable 'vc-annotate-parent-file) file)
|
|
|
|
|
(set (make-local-variable 'vc-annotate-parent-rev) rev)
|
|
|
|
|
(set (make-local-variable 'vc-annotate-parent-display-mode)
|
|
|
|
|
display-mode))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer temp-buffer-name
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(vc-run-delayed
|
|
|
|
|
;; Ideally, we'd rather not move point if the user has already
|
|
|
|
|
;; moved it elsewhere, but really point here is not the position
|
|
|
|
|
;; of the user's cursor :-(
|
|
|
|
|
(when current-line ;(and (bobp))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line (1- current-line))
|
|
|
|
|
(setq vc-sentinel-movepoint (point)))
|
|
|
|
|
(unless (active-minibuffer-window)
|
|
|
|
|
(message "Annotating... done"))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-prev-revision (prefix)
|
|
|
|
|
"Visit the annotation of the revision previous to this one.
|
|
|
|
|
|
|
|
|
|
With a numeric prefix argument, annotate the revision that many
|
|
|
|
|
revisions previous."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(vc-annotate-warp-revision (- 0 prefix)))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-next-revision (prefix)
|
|
|
|
|
"Visit the annotation of the revision after this one.
|
|
|
|
|
|
|
|
|
|
With a numeric prefix argument, annotate the revision that many
|
|
|
|
|
revisions after."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(vc-annotate-warp-revision prefix))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-working-revision ()
|
|
|
|
|
"Visit the annotation of the working revision of this file."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
|
|
|
|
(let ((warp-rev (vc-working-revision vc-annotate-parent-file)))
|
|
|
|
|
(if (equal warp-rev vc-annotate-parent-rev)
|
|
|
|
|
(message "Already at revision %s" warp-rev)
|
|
|
|
|
(vc-annotate-warp-revision warp-rev)))))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-extract-revision-at-line ()
|
2009-10-19 05:04:22 +00:00
|
|
|
"Extract the revision number of the current line.
|
|
|
|
|
Return a cons (REV . FILENAME)."
|
2008-06-22 17:56:00 +00:00
|
|
|
;; This function must be invoked from a buffer in vc-annotate-mode
|
2009-10-19 05:04:22 +00:00
|
|
|
(let ((rev (vc-call-backend vc-annotate-backend
|
|
|
|
|
'annotate-extract-revision-at-line)))
|
|
|
|
|
(if (or (null rev) (consp rev))
|
|
|
|
|
rev
|
|
|
|
|
(cons rev vc-annotate-parent-file))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-revision-at-line ()
|
|
|
|
|
"Visit the annotation of the revision identified in the current line."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
|
|
|
|
(let ((rev-at-line (vc-annotate-extract-revision-at-line)))
|
|
|
|
|
(if (not rev-at-line)
|
|
|
|
|
(message "Cannot extract revision number from the current line")
|
2010-01-25 09:04:59 +00:00
|
|
|
(if (and (equal (car rev-at-line) vc-annotate-parent-rev)
|
|
|
|
|
(string= (cdr rev-at-line) vc-annotate-parent-file))
|
2008-06-22 17:56:00 +00:00
|
|
|
(message "Already at revision %s" rev-at-line)
|
2009-10-19 05:04:22 +00:00
|
|
|
(vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line)))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-find-revision-at-line ()
|
|
|
|
|
"Visit the revision identified in the current line."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
|
|
|
|
(let ((rev-at-line (vc-annotate-extract-revision-at-line)))
|
|
|
|
|
(if (not rev-at-line)
|
|
|
|
|
(message "Cannot extract revision number from the current line")
|
2009-10-19 05:04:22 +00:00
|
|
|
(switch-to-buffer-other-window
|
2010-06-22 01:26:30 +00:00
|
|
|
(vc-find-revision (cdr rev-at-line) (car rev-at-line) vc-annotate-backend))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-revision-previous-to-line ()
|
|
|
|
|
"Visit the annotation of the revision before the revision at line."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
2009-10-19 05:04:22 +00:00
|
|
|
(let* ((rev-at-line (vc-annotate-extract-revision-at-line))
|
|
|
|
|
(prev-rev nil)
|
|
|
|
|
(rev (car rev-at-line))
|
|
|
|
|
(fname (cdr rev-at-line)))
|
2008-06-22 17:56:00 +00:00
|
|
|
(if (not rev-at-line)
|
|
|
|
|
(message "Cannot extract revision number from the current line")
|
|
|
|
|
(setq prev-rev
|
|
|
|
|
(vc-call-backend vc-annotate-backend 'previous-revision
|
2009-10-19 05:04:22 +00:00
|
|
|
fname rev))
|
2009-11-25 23:47:31 +00:00
|
|
|
(vc-annotate-warp-revision prev-rev fname)))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
2009-12-10 08:24:41 +00:00
|
|
|
(defvar log-view-vc-backend)
|
|
|
|
|
(defvar log-view-vc-fileset)
|
|
|
|
|
|
2008-06-22 17:56:00 +00:00
|
|
|
(defun vc-annotate-show-log-revision-at-line ()
|
2009-12-07 09:02:11 +00:00
|
|
|
"Visit the log of the revision at line.
|
|
|
|
|
If the VC backend supports it, only show the log entry for the revision.
|
|
|
|
|
If a *vc-change-log* buffer exists and already shows a log for
|
2011-03-24 01:57:22 +00:00
|
|
|
the file in question, search for the log entry required and move point."
|
2008-06-22 17:56:00 +00:00
|
|
|
(interactive)
|
|
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
|
|
|
|
(let ((rev-at-line (vc-annotate-extract-revision-at-line)))
|
|
|
|
|
(if (not rev-at-line)
|
|
|
|
|
(message "Cannot extract revision number from the current line")
|
2009-12-07 09:02:11 +00:00
|
|
|
(let ((backend vc-annotate-backend)
|
|
|
|
|
(log-buf (get-buffer "*vc-change-log*"))
|
|
|
|
|
pos)
|
|
|
|
|
(if (and
|
|
|
|
|
log-buf
|
|
|
|
|
;; Look for a log buffer that already displays the correct file.
|
|
|
|
|
(with-current-buffer log-buf
|
|
|
|
|
(and (eq backend log-view-vc-backend)
|
|
|
|
|
(null (cdr log-view-vc-fileset))
|
|
|
|
|
(string= (car log-view-vc-fileset) (cdr rev-at-line))
|
|
|
|
|
;; Check if the entry we require can be found.
|
|
|
|
|
(vc-call-backend
|
|
|
|
|
backend 'show-log-entry (car rev-at-line))
|
|
|
|
|
(setq pos (point)))))
|
|
|
|
|
(progn
|
|
|
|
|
(pop-to-buffer log-buf)
|
|
|
|
|
(goto-char pos))
|
|
|
|
|
;; Ask the backend to display a single log entry.
|
|
|
|
|
(vc-print-log-internal
|
|
|
|
|
vc-annotate-backend (list (cdr rev-at-line))
|
|
|
|
|
(car rev-at-line) t 1)))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
2009-10-19 05:04:22 +00:00
|
|
|
(defun vc-annotate-show-diff-revision-at-line-internal (filediff)
|
2012-04-10 20:08:43 +00:00
|
|
|
(if (not (derived-mode-p 'vc-annotate-mode))
|
2008-06-22 17:56:00 +00:00
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
2009-10-19 05:04:22 +00:00
|
|
|
(let* ((rev-at-line (vc-annotate-extract-revision-at-line))
|
2012-04-10 20:08:43 +00:00
|
|
|
(prev-rev nil)
|
|
|
|
|
(rev (car rev-at-line))
|
|
|
|
|
(fname (cdr rev-at-line)))
|
2008-06-22 17:56:00 +00:00
|
|
|
(if (not rev-at-line)
|
|
|
|
|
(message "Cannot extract revision number from the current line")
|
|
|
|
|
(setq prev-rev
|
|
|
|
|
(vc-call-backend vc-annotate-backend 'previous-revision
|
2010-06-22 02:08:55 +00:00
|
|
|
(if filediff fname nil) rev))
|
2008-06-22 17:56:00 +00:00
|
|
|
(if (not prev-rev)
|
2009-10-19 05:04:22 +00:00
|
|
|
(message "Cannot diff from any revision prior to %s" rev)
|
2012-04-10 20:08:43 +00:00
|
|
|
(vc-diff-internal
|
|
|
|
|
t
|
|
|
|
|
;; The value passed here should follow what
|
|
|
|
|
;; `vc-deduce-fileset' returns.
|
|
|
|
|
(list vc-annotate-backend
|
|
|
|
|
(if filediff
|
|
|
|
|
(list fname)
|
|
|
|
|
nil))
|
|
|
|
|
prev-rev rev))))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-show-diff-revision-at-line ()
|
|
|
|
|
"Visit the diff of the revision at line from its previous revision."
|
|
|
|
|
(interactive)
|
2009-10-19 05:04:22 +00:00
|
|
|
(vc-annotate-show-diff-revision-at-line-internal t))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-show-changeset-diff-revision-at-line ()
|
|
|
|
|
"Visit the diff of the revision at line from its previous revision for all files in the changeset."
|
|
|
|
|
(interactive)
|
|
|
|
|
(when (eq 'file (vc-call-backend vc-annotate-backend 'revision-granularity))
|
|
|
|
|
(error "The %s backend does not support changeset diffs" vc-annotate-backend))
|
|
|
|
|
(vc-annotate-show-diff-revision-at-line-internal nil))
|
|
|
|
|
|
2009-10-19 05:04:22 +00:00
|
|
|
(defun vc-annotate-warp-revision (revspec &optional file)
|
2008-06-22 17:56:00 +00:00
|
|
|
"Annotate the revision described by REVSPEC.
|
|
|
|
|
|
2008-11-23 05:48:41 +00:00
|
|
|
If REVSPEC is a positive integer, warp that many revisions forward,
|
2008-06-22 17:56:00 +00:00
|
|
|
if possible, otherwise echo a warning message. If REVSPEC is a
|
2008-11-23 05:48:41 +00:00
|
|
|
negative integer, warp that many revisions backward, if possible,
|
|
|
|
|
otherwise echo a warning message. If REVSPEC is a string, then it
|
|
|
|
|
describes a revision number, so warp to that revision."
|
2008-06-22 17:56:00 +00:00
|
|
|
(if (not (equal major-mode 'vc-annotate-mode))
|
|
|
|
|
(message "Cannot be invoked outside of a vc annotate buffer")
|
|
|
|
|
(let* ((buf (current-buffer))
|
|
|
|
|
(oldline (line-number-at-pos))
|
|
|
|
|
(revspeccopy revspec)
|
|
|
|
|
(newrev nil))
|
|
|
|
|
(cond
|
|
|
|
|
((and (integerp revspec) (> revspec 0))
|
|
|
|
|
(setq newrev vc-annotate-parent-rev)
|
|
|
|
|
(while (and (> revspec 0) newrev)
|
|
|
|
|
(setq newrev (vc-call-backend vc-annotate-backend 'next-revision
|
2009-10-19 05:04:22 +00:00
|
|
|
(or file vc-annotate-parent-file) newrev))
|
2008-06-22 17:56:00 +00:00
|
|
|
(setq revspec (1- revspec)))
|
|
|
|
|
(unless newrev
|
|
|
|
|
(message "Cannot increment %d revisions from revision %s"
|
|
|
|
|
revspeccopy vc-annotate-parent-rev)))
|
|
|
|
|
((and (integerp revspec) (< revspec 0))
|
|
|
|
|
(setq newrev vc-annotate-parent-rev)
|
|
|
|
|
(while (and (< revspec 0) newrev)
|
|
|
|
|
(setq newrev (vc-call-backend vc-annotate-backend 'previous-revision
|
2009-10-19 05:04:22 +00:00
|
|
|
(or file vc-annotate-parent-file) newrev))
|
2008-06-22 17:56:00 +00:00
|
|
|
(setq revspec (1+ revspec)))
|
|
|
|
|
(unless newrev
|
|
|
|
|
(message "Cannot decrement %d revisions from revision %s"
|
|
|
|
|
(- 0 revspeccopy) vc-annotate-parent-rev)))
|
|
|
|
|
((stringp revspec) (setq newrev revspec))
|
|
|
|
|
(t (error "Invalid argument to vc-annotate-warp-revision")))
|
|
|
|
|
(when newrev
|
2009-10-19 05:04:22 +00:00
|
|
|
(vc-annotate (or file vc-annotate-parent-file) newrev
|
2008-06-22 17:56:00 +00:00
|
|
|
vc-annotate-parent-display-mode
|
|
|
|
|
buf
|
|
|
|
|
;; Pass the current line so that vc-annotate will
|
|
|
|
|
;; place the point in the line.
|
|
|
|
|
(min oldline (progn (goto-char (point-max))
|
|
|
|
|
(forward-line -1)
|
2010-06-22 03:00:54 +00:00
|
|
|
(line-number-at-pos)))
|
|
|
|
|
vc-annotate-backend)))))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-compcar (threshold a-list)
|
|
|
|
|
"Test successive cons cells of A-LIST against THRESHOLD.
|
|
|
|
|
Return the first cons cell with a car that is not less than THRESHOLD,
|
|
|
|
|
nil if no such cell exists."
|
|
|
|
|
(let ((i 1)
|
|
|
|
|
(tmp-cons (car a-list)))
|
|
|
|
|
(while (and tmp-cons (< (car tmp-cons) threshold))
|
|
|
|
|
(setq tmp-cons (car (nthcdr i a-list)))
|
|
|
|
|
(setq i (+ i 1)))
|
|
|
|
|
tmp-cons)) ; Return the appropriate value
|
|
|
|
|
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-29 01:42:51 +00:00
|
|
|
(defun vc-annotate-convert-time (&optional time)
|
|
|
|
|
"Convert optional value TIME to a floating-point number of days.
|
|
|
|
|
TIME defaults to the current time."
|
|
|
|
|
(/ (float-time time) 86400))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defun vc-annotate-difference (&optional offset)
|
|
|
|
|
"Return the time span in days to the next annotation.
|
|
|
|
|
This calls the backend function annotate-time, and returns the
|
|
|
|
|
difference in days between the time returned and the current time,
|
|
|
|
|
or OFFSET if present."
|
|
|
|
|
(let ((next-time (vc-annotate-get-time-set-line-props)))
|
|
|
|
|
(when next-time
|
|
|
|
|
(- (or offset
|
|
|
|
|
(vc-call-backend vc-annotate-backend 'annotate-current-time))
|
|
|
|
|
next-time))))
|
|
|
|
|
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(defun vc-default-annotate-current-time (_backend)
|
2008-06-22 17:56:00 +00:00
|
|
|
"Return the current time, encoded as fractional days."
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-29 01:42:51 +00:00
|
|
|
(vc-annotate-convert-time))
|
2008-06-22 17:56:00 +00:00
|
|
|
|
|
|
|
|
(defvar vc-annotate-offset nil)
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-display (ratio &optional offset)
|
|
|
|
|
"Highlight `vc-annotate' output in the current buffer.
|
2008-11-23 05:48:41 +00:00
|
|
|
RATIO is the expansion that should be applied to `vc-annotate-color-map'.
|
2008-06-22 17:56:00 +00:00
|
|
|
The annotations are relative to the current time, unless overridden by OFFSET."
|
|
|
|
|
(when (/= ratio 1.0)
|
|
|
|
|
(set (make-local-variable 'vc-annotate-color-map)
|
|
|
|
|
(mapcar (lambda (elem) (cons (* (car elem) ratio) (cdr elem)))
|
|
|
|
|
vc-annotate-color-map)))
|
|
|
|
|
(set (make-local-variable 'vc-annotate-offset) offset)
|
|
|
|
|
(font-lock-mode 1))
|
|
|
|
|
|
|
|
|
|
(defun vc-annotate-lines (limit)
|
|
|
|
|
(while (< (point) limit)
|
|
|
|
|
(let ((difference (vc-annotate-difference vc-annotate-offset))
|
|
|
|
|
(start (point))
|
|
|
|
|
(end (progn (forward-line 1) (point))))
|
|
|
|
|
(when difference
|
|
|
|
|
(let* ((color (or (vc-annotate-compcar difference vc-annotate-color-map)
|
|
|
|
|
(cons nil vc-annotate-very-old-color)))
|
|
|
|
|
;; substring from index 1 to remove any leading `#' in the name
|
|
|
|
|
(face-name (concat "vc-annotate-face-"
|
|
|
|
|
(if (string-equal
|
|
|
|
|
(substring (cdr color) 0 1) "#")
|
|
|
|
|
(substring (cdr color) 1)
|
|
|
|
|
(cdr color))))
|
|
|
|
|
;; Make the face if not done.
|
|
|
|
|
(face (or (intern-soft face-name)
|
|
|
|
|
(let ((tmp-face (make-face (intern face-name))))
|
2014-07-08 08:49:18 +00:00
|
|
|
(cond
|
|
|
|
|
(vc-annotate-background-mode
|
|
|
|
|
(set-face-background tmp-face (cdr color)))
|
|
|
|
|
(t
|
|
|
|
|
(set-face-foreground tmp-face (cdr color))
|
|
|
|
|
(when vc-annotate-background
|
|
|
|
|
(set-face-background tmp-face vc-annotate-background))))
|
2008-06-22 17:56:00 +00:00
|
|
|
tmp-face)))) ; Return the face
|
|
|
|
|
(put-text-property start end 'face face)))))
|
|
|
|
|
;; Pretend to font-lock there were no matches.
|
|
|
|
|
nil)
|
|
|
|
|
|
2011-04-24 19:37:47 +00:00
|
|
|
(defun vc-annotate-goto-line ()
|
|
|
|
|
"Go to the line corresponding to the current VC Annotate line."
|
|
|
|
|
(interactive)
|
|
|
|
|
(unless (eq major-mode 'vc-annotate-mode)
|
|
|
|
|
(error "Not in a VC-Annotate buffer"))
|
|
|
|
|
(let ((line (save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(line-number-at-pos)))
|
|
|
|
|
(rev vc-annotate-parent-rev))
|
|
|
|
|
(pop-to-buffer
|
|
|
|
|
(or (and (buffer-live-p vc-parent-buffer)
|
|
|
|
|
vc-parent-buffer)
|
|
|
|
|
(and (file-exists-p vc-annotate-parent-file)
|
|
|
|
|
(find-file-noselect vc-annotate-parent-file))
|
|
|
|
|
(error "File not found: %s" vc-annotate-parent-file)))
|
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line (1- line))
|
|
|
|
|
(recenter))
|
|
|
|
|
;; Issue a warning if the lines might be incorrect.
|
|
|
|
|
(cond
|
|
|
|
|
((buffer-modified-p)
|
|
|
|
|
(message "Buffer modified; annotated line numbers may be incorrect"))
|
|
|
|
|
((not (eq (vc-state buffer-file-name) 'up-to-date))
|
|
|
|
|
(message "File is not up-to-date; annotated line numbers may be incorrect"))
|
|
|
|
|
((not (equal rev (vc-working-revision buffer-file-name)))
|
|
|
|
|
(message "Annotations were for revision %s; line numbers may be incorrect"
|
|
|
|
|
rev)))))
|
|
|
|
|
|
2008-06-22 17:56:00 +00:00
|
|
|
(provide 'vc-annotate)
|
|
|
|
|
|
|
|
|
|
;;; vc-annotate.el ends here
|