[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/vc-cvs.el li...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/11/16 20:36:11

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog vc-cvs.el vc-git.el vc-rcs.el 
                         vc-sccs.el vc.el 

Log message:
        * vc.el (vc-log-show-limit): Default to 2000.
        (vc-print-log-internal): Insert buttons to request more entries
        when limiting the output.
        
        * vc-sccs.el (vc-sccs-print-log):
        * vc-rcs.el (vc-rcs-print-log):
        * vc-cvs.el (vc-cvs-print-log):
        * vc-git.el (vc-git-print-log): Return 'limit-unsupported when
        LIMIT is non-nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2113&r2=1.2114
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16647&r2=1.16648
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-rcs.el?cvsroot=emacs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-sccs.el?cvsroot=emacs&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.739&r2=1.740

Patches:
Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.2113
retrieving revision 1.2114
diff -u -b -r1.2113 -r1.2114
--- etc/NEWS    6 Nov 2009 18:47:48 -0000       1.2113
+++ etc/NEWS    16 Nov 2009 20:36:06 -0000      1.2114
@@ -201,6 +201,13 @@
 *** FIXME: add info about the new VC functions: vc-root-diff and
 vc-root-print-log once they stabilize.
 
+*** The log functions (C-x v l and C-x v L) do not show the full log
+by default anymore.  The number of entries shown can be chosen
+interactively with a prefix argument, by customizing
+vc-log-show-limit.  The log buffer display buttons that can be used
+to change the number of entries shown.
+RCS, SCCS, CVS and Git do not support this feature.
+
 *** vc-annotate supports annotations through file copies and renames,
 it displays the old names for the files and it can show logs/diffs for
 the corresponding lines.  Currently only Git and Mercurial take

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16647
retrieving revision 1.16648
diff -u -b -r1.16647 -r1.16648
--- lisp/ChangeLog      16 Nov 2009 20:10:39 -0000      1.16647
+++ lisp/ChangeLog      16 Nov 2009 20:36:08 -0000      1.16648
@@ -1,3 +1,15 @@
+2009-11-16  Dan Nicolaescu  <address@hidden>
+
+       * vc.el (vc-log-show-limit): Default to 2000.
+       (vc-print-log-internal): Insert buttons to request more entries
+       when limiting the output.
+
+       * vc-sccs.el (vc-sccs-print-log):
+       * vc-rcs.el (vc-rcs-print-log):
+       * vc-cvs.el (vc-cvs-print-log):
+       * vc-git.el (vc-git-print-log): Return 'limit-unsupported when
+       LIMIT is non-nil.
+
 2009-11-16  Michael Albinus  <address@hidden>
 
        * net/tramp-gvfs.el (tramp-gvfs-dbus-event-error): Raise only an

Index: lisp/vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- lisp/vc-cvs.el      15 Nov 2009 20:29:01 -0000      1.172
+++ lisp/vc-cvs.el      16 Nov 2009 20:36:11 -0000      1.173
@@ -505,7 +505,8 @@
    (if (vc-stay-local-p files 'CVS) 'async 0)
    files "log")
   (with-current-buffer buffer
-    (vc-exec-after (vc-rcs-print-log-cleanup))))
+    (vc-exec-after (vc-rcs-print-log-cleanup)))
+  (when limit 'limit-unsupported))
 
 (defun vc-cvs-comment-history (file)
   "Get comment history of a file."

Index: lisp/vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- lisp/vc-git.el      15 Nov 2009 20:29:01 -0000      1.98
+++ lisp/vc-git.el      16 Nov 2009 20:36:11 -0000      1.99
@@ -526,7 +526,8 @@
                            "--")
          (vc-git-command buffer 'async files
                          "rev-list" ;; "--graph"
-                         "--pretty" "HEAD" "--"))))))
+                         "--pretty" "HEAD" "--")))
+        (when limit 'limit-unsupported))))
 
 (defvar log-view-message-re)
 (defvar log-view-file-re)

Index: lisp/vc-rcs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- lisp/vc-rcs.el      16 Nov 2009 14:41:08 -0000      1.98
+++ lisp/vc-rcs.el      16 Nov 2009 20:36:11 -0000      1.99
@@ -564,7 +564,8 @@
 directory the operation is applied to all registered files beneath it."
   (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs 
files)))
   (with-current-buffer (or buffer "*vc*")
-    (vc-rcs-print-log-cleanup)))
+    (vc-rcs-print-log-cleanup))
+  (when limit 'limit-unsupported))
 
 (defun vc-rcs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using RCS between two sets of files."

Index: lisp/vc-sccs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-sccs.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- lisp/vc-sccs.el     15 Nov 2009 20:29:02 -0000      1.70
+++ lisp/vc-sccs.el     16 Nov 2009 20:36:11 -0000      1.71
@@ -338,7 +338,8 @@
 (defun vc-sccs-print-log (files buffer &optional shortlog limit)
   "Get change log associated with FILES."
   (setq files (vc-expand-dirs files))
-  (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)))
+  (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
+  (when limit 'limit-unsupported))
 
 (defun vc-sccs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SCCS between two filesets."

Index: lisp/vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.739
retrieving revision 1.740
diff -u -b -r1.739 -r1.740
--- lisp/vc.el  15 Nov 2009 20:29:02 -0000      1.739
+++ lisp/vc.el  16 Nov 2009 20:36:11 -0000      1.740
@@ -337,7 +337,9 @@
 ;;
 ;;   Insert the revision log for FILES into BUFFER.
 ;;   If SHORTLOG is true insert a short version of the log.
-;;   If LIMIT is true insert only insert LIMIT log entries.
+;;   If LIMIT is true insert only insert LIMIT log entries.  If the
+;;   backend does not support limiting the number of entries to show
+;;   it should return `limit-unsupported'.
 ;;
 ;; - log-view-mode ()
 ;;
@@ -694,7 +696,7 @@
   :type '(choice (const :tag "Work out" nil) (const yes) (const no))
   :group 'vc)
 
-(defcustom vc-log-show-limit 0
+(defcustom vc-log-show-limit 2000
   "Limit the number of items shown by the VC log commands.
 Zero means unlimited.
 Not all VC backends are able to support this feature."
@@ -1850,7 +1852,8 @@
   ;; so that any buffer-local settings in the vc-controlled
   ;; buffer can be accessed by the command.
   (let ((dir-present nil)
-       (vc-short-log nil))
+       (vc-short-log nil)
+       pl-return)
     (dolist (file files)
       (when (file-directory-p file)
        (setq dir-present t)))
@@ -1858,7 +1861,9 @@
          (not (null (if dir-present
                         (memq 'directory vc-log-short-style)
                       (memq 'file vc-log-short-style)))))
-    (vc-call-backend backend 'print-log files "*vc-change-log*" vc-short-log 
limit)
+
+    (setq pl-return (vc-call-backend backend 'print-log files "*vc-change-log*"
+                                    vc-short-log limit))
     (pop-to-buffer "*vc-change-log*")
     (vc-exec-after
      `(let ((inhibit-read-only t)
@@ -1867,6 +1872,23 @@
        (set (make-local-variable 'log-view-vc-backend) ',backend)
        (set (make-local-variable 'log-view-vc-fileset) ',files)
 
+       (when (and ,limit (not (eq 'limit-unsupported pl-return)))
+         (goto-char (point-max))
+         (widget-create 'push-button
+                        :notify (lambda (&rest ignore)
+                                  (vc-print-log-internal
+                                   ',backend ',files ',working-revision (* 2 
,limit)))
+                        :help-echo "Show the log again, and double the number 
of log entries shown"
+                        "Show 2X entries")
+         (widget-insert "    ")
+         (widget-create 'push-button
+                        :notify (lambda (&rest ignore)
+                                  (vc-print-log-internal
+                                   ',backend ',files ',working-revision nil))
+                        :help-echo "Show the log again, showing all entries"
+                        "Show unlimited entries")
+         (widget-setup))
+
        (shrink-window-if-larger-than-buffer)
        ;; move point to the log entry for the working revision
        (vc-call-backend ',backend 'show-log-entry ',working-revision)