Remove logentry primitive from backend API.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f5d8c5e97bb563c8569529f15a2be170f362c43..84d1f3e5833ca91b99c3f83af1ad8f5f7ddb9878 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,7 +3,12 @@
        * vc-dispatcher.el: New file, separates out the UI and command 
        execution machinery from VCS-specific logic left in vc.el.  The
        separation is not yet completely clean, but it's a good start.
-       * vc.el: This file is about 1700 lines shorter now.
+       * vc.el: This file is about 1700 lines shorter now.  Obsolete 
+       logentry-check is removed from the backend API.
+       * vc-sccs.el: Obsolete vc-sccs-logentry-check removed.  This was
+       was the only implementation of the logentry-check method, and
+       it guarded against a log length limit that has probably been
+       obsolete for 15 years (!).
 
 2008-05-02  Sam Steingold  <sds@gnu.org>
 

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 3870bb79397daed2aebf1884b441a8767f7e1b1a..765b8f58e2bc8596fafa9d36c52df8e896bc8438 100644 (file)
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -138,10 +138,8 @@ Another is that undo information is not kept."
             (insert s)
             (set-marker (process-mark p) (point))))))))
 
-(defun vc-setup-buffer (&optional buf)
-  "Prepare BUF for executing a VC command and make it current.
-BUF defaults to \"*vc*\", can be a string and will be created if necessary."
-  (unless buf (setq buf "*vc*"))
+(defun vc-setup-buffer (buf)
+  "Prepare BUF for executing a slave command and make it current."
   (let ((camefrom (current-buffer))
        (olddir default-directory))
     (set-buffer (get-buffer-create buf))
@@ -501,7 +499,6 @@ for `vc-log-after-operation-hook'."
        (message "%s  Type C-c C-c when done" msg)
       (vc-finish-logentry (eq comment t)))))
 
-;; FIXME: Reference to vc-call-backend should go.
 (defun vc-finish-logentry (&optional nocomment)
   "Complete the operation implied by the current log entry.
 Use the contents of the current buffer as a check-in or registration
@@ -510,10 +507,6 @@ the buffer contents as a comment."
   (interactive)
   ;; Check and record the comment, if any.
   (unless nocomment
-    ;; Comment too long?
-    (vc-call-backend (or (when vc-log-fileset (vc-backend vc-log-fileset))
-                        (vc-responsible-backend default-directory))
-                    'logentry-check)
     (run-hooks 'vc-logentry-check-hook))
   ;; Sync parent buffer in case the user modified it while editing the comment.
   ;; But not if it is a vc-dired buffer.
@@ -557,7 +550,6 @@ the buffer contents as a comment."
       (vc-dir-move-to-goal-column))
     (run-hooks after-hook 'vc-finish-logentry-hook)))
 
-
 ;; The VC directory major mode.  Coopt Dired for this.
 ;; All VC commands get mapped into logical equivalents.
 

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index ed13cb920812a99fa63a5151a2def9d66045602e..43bafa603a885913e4537dc673e2041e3ba6e3cb 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -83,7 +83,6 @@
 ;; - log-view-mode ()                             OK
 ;; - show-log-entry (revision)                    OK
 ;; - wash-log (file)                              COULD BE SUPPORTED
-;; - logentry-check ()                            NOT NEEDED
 ;; - comment-history (file)                       ??
 ;; - update-changelog (files)                     COULD BE SUPPORTED
 ;; * diff (file &optional rev1 rev2 buffer)       OK

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 85ea6e13b07b3a2c22f208e7143f5dc14b06acac..285c6acefea822b4d86034e7ac9c149c334f3328 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -72,7 +72,6 @@
 ;; - log-view-mode ()                          OK
 ;; - show-log-entry (revision)                  NOT NEEDED, DEFAULT IS GOOD
 ;; - wash-log (file)                           ??
-;; - logentry-check ()                         NOT NEEDED
 ;; - comment-history (file)                    NOT NEEDED
 ;; - update-changelog (files)                  NOT NEEDED
 ;; * diff (files &optional rev1 rev2 buffer)   OK

diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index ce1b977e7f6b7dacd8a0e88f6dd1585877957b75..aa7708db47da7fb42de49fe5d59f3f12eec3f459 100644 (file)
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -332,12 +332,6 @@ locked.  REV is the revision to check out."
   ;; FIXME: not implemented for SCCS
   nil)
 
-(defun vc-sccs-logentry-check ()
-  "Check that the log entry in the current buffer is acceptable for SCCS."
-  (when (>= (buffer-size) 512)
-    (goto-char 512)
-    (error "Log must be less than 512 characters; point is now at pos 512")))
-
 (defun vc-sccs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SCCS between two filesets."
   (setq oldvers (vc-sccs-lookup-triple (car files) oldvers))

diff --git a/lisp/vc.el b/lisp/vc.el
index 28a10ed5d3973925ac02695f4bff2e5b7235392b..283f714e935a560b8c4b1486171e462585428812 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -401,13 +401,6 @@
 ;;
 ;;   Remove all non-comment information from the output of print-log.
 ;;
-;; - logentry-check ()
-;;
-;;   If defined, this function is run to find out whether the user
-;;   entered a valid log entry for check-in.  The log entry is in the
-;;   current buffer, and if it is not a valid one, the function should
-;;   throw an error.
-;;
 ;; - comment-history (file)
 ;;
 ;;   Return a string containing all log entries that were made for FILE.
@@ -823,7 +816,7 @@ See `run-hooks'."
   :group 'vc)
 
 (defcustom vc-logentry-check-hook nil
-  "Normal hook run by `vc-backend-logentry-check'.
+  "Normal hook run by `vc-finish-logentry'.
 Use this to impose your own rules on the entry in addition to any the
 version control backend imposes itself."
   :type 'hook
@@ -2733,7 +2726,6 @@ to provide the `find-revision' operation instead."
   (with-current-buffer (find-file-noselect new)
     (vc-register)))
 
-(defalias 'vc-default-logentry-check 'ignore)
 (defalias 'vc-default-check-headers 'ignore)
 
 (defun vc-default-log-view-mode (backend) (log-view-mode))