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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/06/26 23:54:01

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog vc-git.el vc-hg.el vc-hooks.el 
                         vc-rcs.el vc.el 

Log message:
        Remove find-file-not-found-hook VC method.  (Bug#2757)
        * vc-hooks.el (vc-file-not-found-hook)
        (vc-default-find-file-not-found-hook): Remove functions.
        (find-file-not-found-functions): Do not add vc-file-not-found-hook.
        * vc-rcs.el (vc-rcs-find-file-not-found-hook): Remove function.
        * vc.el:
        * vc-hg.el:
        * vc-git.el: Do not mention find-file-not-found-hook VC method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2031&r2=1.2032
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15730&r2=1.15731
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hg.el?cvsroot=emacs&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hooks.el?cvsroot=emacs&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-rcs.el?cvsroot=emacs&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.719&r2=1.720

Patches:
Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -b -r1.2031 -r1.2032
--- etc/NEWS    24 Jun 2009 19:21:22 -0000      1.2031
+++ etc/NEWS    26 Jun 2009 23:53:55 -0000      1.2032
@@ -32,6 +32,10 @@
 On systems which support GVFS-Fuse, Tramp offers the new connection
 methods "dav", "davs" and "obex".
 
+** VC and related modes
+
+*** When a file is not found, VC will not try to check it out of RCS anymore.
+
 
 * Installation Changes in Emacs 23.1
 

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15730
retrieving revision 1.15731
diff -u -b -r1.15730 -r1.15731
--- lisp/ChangeLog      25 Jun 2009 11:25:09 -0000      1.15730
+++ lisp/ChangeLog      26 Jun 2009 23:53:56 -0000      1.15731
@@ -1,3 +1,14 @@
+2009-06-26  Dan Nicolaescu  <address@hidden>
+
+       Remove find-file-not-found-hook VC method.  (Bug#2757)
+       * vc-hooks.el (vc-file-not-found-hook)
+       (vc-default-find-file-not-found-hook): Remove functions.
+       (find-file-not-found-functions): Do not add vc-file-not-found-hook.
+       * vc-rcs.el (vc-rcs-find-file-not-found-hook): Remove function.
+       * vc.el:
+       * vc-hg.el:
+       * vc-git.el: Do not mention find-file-not-found-hook VC method.
+
 2009-06-25  Agustín Martín  <address@hidden>
 
        * textmodes/ispell.el: Add `ispell-looking-back' XEmacs

Index: lisp/vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- lisp/vc-git.el      13 Mar 2009 20:04:15 -0000      1.81
+++ lisp/vc-git.el      26 Jun 2009 23:54:00 -0000      1.82
@@ -101,7 +101,6 @@
 ;; - delete-file (file)                           OK
 ;; - rename-file (old new)                OK
 ;; - find-file-hook ()                    NOT NEEDED
-;; - find-file-not-found-hook ()                NOT NEEDED
 
 (eval-when-compile
   (require 'cl)

Index: lisp/vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- lisp/vc-hg.el       12 Jun 2009 20:14:52 -0000      1.96
+++ lisp/vc-hg.el       26 Jun 2009 23:54:00 -0000      1.97
@@ -92,7 +92,6 @@
 ;; - delete-file (file)                        TEST IT
 ;; - rename-file (old new)                     OK
 ;; - find-file-hook ()                         PROBABLY NOT NEEDED
-;; - find-file-not-found-hook ()               PROBABLY NOT NEEDED
 
 ;; 2) Implement Stefan Monnier's advice:
 ;; vc-hg-registered and vc-hg-state

Index: lisp/vc-hooks.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- lisp/vc-hooks.el    23 Jun 2009 06:35:43 -0000      1.278
+++ lisp/vc-hooks.el    26 Jun 2009 23:54:00 -0000      1.279
@@ -911,27 +911,6 @@
 
 (add-hook 'find-file-hook 'vc-find-file-hook)
 
-;; more hooks, this time for file-not-found
-(defun vc-file-not-found-hook ()
-  "When file is not found, try to check it out from version control.
-Returns t if checkout was successful, nil otherwise.
-Used in `find-file-not-found-functions'."
-  ;; When a file does not exist, ignore cached info about it
-  ;; from a previous visit.
-  ;; We check that `buffer-file-name' is non-nil.  It should be always
-  ;; the case, but in conjunction with Tramp, it might be nil.  M. Albinus.
-  (when buffer-file-name
-    (vc-file-clearprops buffer-file-name)
-    (let ((backend (vc-backend buffer-file-name)))
-      (when backend (vc-call-backend backend 'find-file-not-found-hook)))))
-
-(defun vc-default-find-file-not-found-hook (backend)
-  ;; This used to do what vc-rcs-find-file-not-found-hook does, but it only
-  ;; really makes sense for RCS.  For other backends, better not do anything.
-  nil)
-
-(add-hook 'find-file-not-found-functions 'vc-file-not-found-hook)
-
 (defun vc-kill-buffer-hook ()
   "Discard VC info about a file when we kill its buffer."
   (when buffer-file-name (vc-file-clearprops buffer-file-name)))

Index: lisp/vc-rcs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- lisp/vc-rcs.el      23 Jun 2009 06:35:43 -0000      1.86
+++ lisp/vc-rcs.el      26 Jun 2009 23:54:00 -0000      1.87
@@ -247,14 +247,6 @@
     ;; The workfile is unchanged if rcsdiff found no differences.
     (zerop status)))
 
-(defun vc-rcs-find-file-not-found-hook ()
-  (if (yes-or-no-p
-       (format "File %s was lost; check out from version control? "
-              (file-name-nondirectory buffer-file-name)))
-      (save-excursion
-       (require 'vc)
-       (let ((default-directory (file-name-directory buffer-file-name)))
-          (not (vc-error-occurred (vc-checkout buffer-file-name)))))))
 
 ;;;
 ;;; State-changing functions

Index: lisp/vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.719
retrieving revision 1.720
diff -u -b -r1.719 -r1.720
--- lisp/vc.el  23 Jun 2009 06:35:43 -0000      1.719
+++ lisp/vc.el  26 Jun 2009 23:54:00 -0000      1.720
@@ -513,11 +513,6 @@
 ;;   Operation called in current buffer when opening a file.  This can
 ;;   be used by the backend to setup some local variables it might need.
 ;;
-;; - find-file-not-found-hook ()
-;;
-;;   Operation called in current buffer when opening a non-existing file.
-;;   By default, this asks the user if she wants to check out the file.
-;;
 ;; - extra-menu ()
 ;;
 ;;   Return a menu keymap, the items in the keymap will appear at the