aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-04-24 00:52:00 -0700
committerGlenn Morris2013-04-24 00:52:00 -0700
commitbb7cdf58f6ad1ddbf2dad90568440d756fa831f1 (patch)
tree7377f89a8bf63c0eba8c2b0a4d9c0718d7a604ca
parent6933cefc4834cc5ef8d8c46fd2379578240c4f1e (diff)
downloademacs-bb7cdf58f6ad1ddbf2dad90568440d756fa831f1.tar.gz
emacs-bb7cdf58f6ad1ddbf2dad90568440d756fa831f1.zip
Doc fixes related to vc-print-log
* vc/vc-bzr.el (vc-bzr-print-log): * vc/vc-cvs.el (vc-cvs-print-log): * vc/vc-git.el (vc-git-print-log): * vc/vc-hg.el (vc-hg-print-log): * vc/vc-mtn.el (vc-mtn-print-log): * vc/vc-rcs.el (vc-rcs-print-log): * vc/vc-sccs.el (vc-sccs-print-log): * vc/vc-svn.el (vc-svn-print-log): * vc/vc.el (vc-print-log-internal): Doc fixes.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/vc/vc-bzr.el5
-rw-r--r--lisp/vc/vc-cvs.el3
-rw-r--r--lisp/vc/vc-git.el8
-rw-r--r--lisp/vc/vc-hg.el7
-rw-r--r--lisp/vc/vc-mtn.el4
-rw-r--r--lisp/vc/vc-rcs.el12
-rw-r--r--lisp/vc/vc-sccs.el3
-rw-r--r--lisp/vc/vc-svn.el5
-rw-r--r--lisp/vc/vc.el21
10 files changed, 56 insertions, 24 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0b20fdbd63..adec7e10e88 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
12013-04-24 Glenn Morris <rgm@gnu.org>
2
3 * vc/vc-bzr.el (vc-bzr-print-log):
4 * vc/vc-cvs.el (vc-cvs-print-log):
5 * vc/vc-git.el (vc-git-print-log):
6 * vc/vc-hg.el (vc-hg-print-log):
7 * vc/vc-mtn.el (vc-mtn-print-log):
8 * vc/vc-rcs.el (vc-rcs-print-log):
9 * vc/vc-sccs.el (vc-sccs-print-log):
10 * vc/vc-svn.el (vc-svn-print-log):
11 * vc/vc.el (vc-print-log-internal): Doc fixes.
12
12013-04-23 Glenn Morris <rgm@gnu.org> 132013-04-23 Glenn Morris <rgm@gnu.org>
2 14
3 * startup.el (normal-no-mouse-startup-screen, normal-about-screen): 15 * startup.el (normal-no-mouse-startup-screen, normal-about-screen):
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d72c1f7f859..d01fcede4be 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -694,7 +694,10 @@ REV non-nil gets an error."
694 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))) 694 ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))))
695 695
696(defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit) 696(defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit)
697 "Get bzr change log for FILES into specified BUFFER." 697 "Print commit log associated with FILES into specified BUFFER.
698If SHORTLOG is non-nil, use --line format.
699If START-REVISION is non-nil, it is the newest revision to show.
700If LIMIT is non-nil, show no more than this many entries."
698 ;; `vc-do-command' creates the buffer, but we need it before running 701 ;; `vc-do-command' creates the buffer, but we need it before running
699 ;; the command. 702 ;; the command.
700 (vc-setup-buffer buffer) 703 (vc-setup-buffer buffer)
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 334683898be..7a8f8107509 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -503,7 +503,8 @@ Will fail unless you have administrative privileges on the repo."
503(declare-function vc-rcs-print-log-cleanup "vc-rcs" ()) 503(declare-function vc-rcs-print-log-cleanup "vc-rcs" ())
504 504
505(defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit) 505(defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit)
506 "Get change logs associated with FILES." 506 "Print commit log associated with FILES into specified BUFFER.
507Remaining arguments are ignored."
507 (require 'vc-rcs) 508 (require 'vc-rcs)
508 ;; It's just the catenation of the individual logs. 509 ;; It's just the catenation of the individual logs.
509 (vc-cvs-command 510 (vc-cvs-command
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 17de931628b..06474cb4604 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -732,9 +732,11 @@ This prompts for a branch to merge from."
732;;; HISTORY FUNCTIONS 732;;; HISTORY FUNCTIONS
733 733
734(defun vc-git-print-log (files buffer &optional shortlog start-revision limit) 734(defun vc-git-print-log (files buffer &optional shortlog start-revision limit)
735 "Get change log associated with FILES. 735 "Print commit log associated with FILES into specified BUFFER.
736Note that using SHORTLOG requires at least Git version 1.5.6, 736If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'.
737for the --graph option." 737\(This requires at least Git version 1.5.6, for the --graph option.)
738If START-REVISION is non-nil, it is the newest revision to show.
739If LIMIT is non-nil, show no more than this many entries."
738 (let ((coding-system-for-read vc-git-commits-coding-system)) 740 (let ((coding-system-for-read vc-git-commits-coding-system))
739 ;; `vc-do-command' creates the buffer, but we need it before running 741 ;; `vc-do-command' creates the buffer, but we need it before running
740 ;; the command. 742 ;; the command.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 033e78c20cd..4584036f03b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -152,7 +152,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
152 (2 'change-log-list) 152 (2 'change-log-list)
153 (3 'change-log-name) 153 (3 'change-log-name)
154 (4 'change-log-date))) 154 (4 'change-log-date)))
155 "Mercurial log template for `vc-print-root-log'. 155 "Mercurial log template for `vc-hg-print-log' short format.
156This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE 156This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
157is the \"--template\" argument string to pass to Mercurial, 157is the \"--template\" argument string to pass to Mercurial,
158REGEXP is a regular expression matching the resulting Mercurial 158REGEXP is a regular expression matching the resulting Mercurial
@@ -246,7 +246,10 @@ highlighting the Log View buffer."
246 :group 'vc-hg) 246 :group 'vc-hg)
247 247
248(defun vc-hg-print-log (files buffer &optional shortlog start-revision limit) 248(defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
249 "Get change log associated with FILES." 249 "Print commit log associated with FILES into specified BUFFER.
250If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
251If START-REVISION is non-nil, it is the newest revision to show.
252If LIMIT is non-nil, show no more than this many entries."
250 ;; `vc-do-command' creates the buffer, but we need it before running 253 ;; `vc-do-command' creates the buffer, but we need it before running
251 ;; the command. 254 ;; the command.
252 (vc-setup-buffer buffer) 255 (vc-setup-buffer buffer)
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 06827a5e027..fbfd89561b7 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -202,6 +202,10 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
202;; ) 202;; )
203 203
204(defun vc-mtn-print-log (files buffer &optional _shortlog start-revision limit) 204(defun vc-mtn-print-log (files buffer &optional _shortlog start-revision limit)
205 "Print commit logs associated with FILES into specified BUFFER.
206_SHORTLOG is ignored.
207If START-REVISION is non-nil, it is the newest revision to show.
208If LIMIT is non-nil, show no more than this many entries."
205 (apply 'vc-mtn-command buffer 0 files "log" 209 (apply 'vc-mtn-command buffer 0 files "log"
206 (append 210 (append
207 (when start-revision (list "--from" (format "%s" start-revision))) 211 (when start-revision (list "--from" (format "%s" start-revision)))
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 40d8acb7e07..0a2fc804e6d 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -567,10 +567,14 @@ directory the operation is applied to all registered files beneath it."
567 (when (looking-at "[\b\t\n\v\f\r ]+") 567 (when (looking-at "[\b\t\n\v\f\r ]+")
568 (delete-char (- (match-end 0) (match-beginning 0)))))) 568 (delete-char (- (match-end 0) (match-beginning 0))))))
569 569
570(defun vc-rcs-print-log (files buffer &optional shortlog start-revision-ignored limit) 570(defun vc-rcs-print-log (files buffer &optional shortlog
571 "Get change log associated with FILE. If FILE is a 571 start-revision-ignored limit)
572directory the operation is applied to all registered files beneath it." 572 "Print commit log associated with FILES into specified BUFFER.
573 (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs files))) 573Remaining arguments are ignored.
574If FILE is a directory the operation is applied to all registered
575files beneath it."
576 (vc-do-command (or buffer "*vc*") 0 "rlog"
577 (mapcar 'vc-name (vc-expand-dirs files)))
574 (with-current-buffer (or buffer "*vc*") 578 (with-current-buffer (or buffer "*vc*")
575 (vc-rcs-print-log-cleanup)) 579 (vc-rcs-print-log-cleanup))
576 (when limit 'limit-unsupported)) 580 (when limit 'limit-unsupported))
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index bfbe42222e9..d3cf650ddf9 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -350,7 +350,8 @@ revert all subfiles."
350;;; 350;;;
351 351
352(defun vc-sccs-print-log (files buffer &optional shortlog start-revision-ignored limit) 352(defun vc-sccs-print-log (files buffer &optional shortlog start-revision-ignored limit)
353 "Get change log associated with FILES." 353 "Print commit log associated with FILES into specified BUFFER.
354Remaining arguments are ignored."
354 (setq files (vc-expand-dirs files)) 355 (setq files (vc-expand-dirs files))
355 (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)) 356 (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
356 (when limit 'limit-unsupported)) 357 (when limit 'limit-unsupported))
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 923888b460b..3009d174e0b 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -494,7 +494,10 @@ or svn+ssh://."
494 (set (make-local-variable 'log-view-per-file-logs) nil)) 494 (set (make-local-variable 'log-view-per-file-logs) nil))
495 495
496(defun vc-svn-print-log (files buffer &optional shortlog start-revision limit) 496(defun vc-svn-print-log (files buffer &optional shortlog start-revision limit)
497 "Get change log(s) associated with FILES." 497 "Print commit log associated with FILES into specified BUFFER.
498SHORTLOG is ignored.
499If START-REVISION is non-nil, it is the newest revision to show.
500If LIMIT is non-nil, show no more than this many entries."
498 (save-current-buffer 501 (save-current-buffer
499 (vc-setup-buffer buffer) 502 (vc-setup-buffer buffer)
500 (let ((inhibit-read-only t)) 503 (let ((inhibit-read-only t))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 7f03affb6b7..5e1d27c0ea3 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -356,9 +356,11 @@
356;; If LIMIT is true insert only insert LIMIT log entries. If the 356;; If LIMIT is true insert only insert LIMIT log entries. If the
357;; backend does not support limiting the number of entries to show 357;; backend does not support limiting the number of entries to show
358;; it should return `limit-unsupported'. 358;; it should return `limit-unsupported'.
359;; If START-REVISION is given, then show the log starting from the 359;; If START-REVISION is given, then show the log starting from that
360;; revision. At this point START-REVISION is only required to work 360;; revision ("starting" in the sense of it being the _newest_
361;; in conjunction with LIMIT = 1. 361;; revision shown, rather than the working revision, which is normally
362;; the case). Not all backends support this. At present, this is
363;; only ever used with LIMIT = 1 (by vc-annotate-show-log-revision-at-line).
362;; 364;;
363;; * log-outgoing (backend remote-location) 365;; * log-outgoing (backend remote-location)
364;; 366;;
@@ -2111,14 +2113,11 @@ or if PL-RETURN is 'limit-unsupported."
2111 &optional is-start-revision limit) 2113 &optional is-start-revision limit)
2112 "For specified BACKEND and FILES, show the VC log. 2114 "For specified BACKEND and FILES, show the VC log.
2113Leave point at WORKING-REVISION, if it is non-nil. 2115Leave point at WORKING-REVISION, if it is non-nil.
2114If IS-START-REVISION is non-nil, start the log from WORKING-REVISION. 2116If IS-START-REVISION is non-nil, start the log from WORKING-REVISION
2115Show up to LIMIT entries (non-nil means unlimited). 2117\(not all backends support this); i.e., show only WORKING-REVISION and
2116\(IS-START-REVISION non-nil might not work correctly if LIMIT is not 1.)" 2118earlier revisions. Show up to LIMIT entries (non-nil means unlimited)."
2117 ;; The parenthetical remark is based on the commentary of vc.el for 2119 ;; As of 2013/04 the only thing that passes IS-START-REVISION non-nil
2118 ;; "print log": "At this point START-REVISION is only required to work 2120 ;; is vc-annotate-show-log-revision-at-line, which sets LIMIT = 1.
2119 ;; in conjunction with LIMIT = 1." The only thing that passes
2120 ;; IS-START-REVISION non-nil is vc-annotate-show-log-revision-at-line,
2121 ;; which sets LIMIT = 1.
2122 2121
2123 ;; Don't switch to the output buffer before running the command, 2122 ;; Don't switch to the output buffer before running the command,
2124 ;; so that any buffer-local settings in the vc-controlled 2123 ;; so that any buffer-local settings in the vc-controlled