[Emacs-diffs] emacs/lisp ChangeLog vc.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/03/15 08:54:06

Modified files:
        lisp           : ChangeLog vc.el 

Log message:
        (vc-checkin): Add an extra argument for the VC backend,
        pass it down to vc-start-logentry.
        (vc-next-action, vc-transfer-file): Pass the VC backend to
        vc-checkin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15479&r2=1.15480
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.712&r2=1.713

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15479
retrieving revision 1.15480
diff -u -b -r1.15479 -r1.15480
--- ChangeLog   15 Mar 2009 02:29:23 -0000      1.15479
+++ ChangeLog   15 Mar 2009 08:54:00 -0000      1.15480
@@ -1,3 +1,10 @@
+2009-03-15  Dan Nicolaescu  <address@hidden>
+
+       * vc.el (vc-checkin): Add an extra argument for the VC backend,
+       pass it down to vc-start-logentry.
+       (vc-next-action, vc-transfer-file): Pass the VC backend to
+       vc-checkin.
+
 2009-03-15  Chong Yidong  <address@hidden>
 
        * files.el (get-free-disk-space): Ensure that default-directory is

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -b -r1.712 -r1.713
--- vc.el       14 Mar 2009 16:37:12 -0000      1.712
+++ vc.el       15 Mar 2009 08:54:05 -0000      1.713
@@ -1085,13 +1085,13 @@
        (if (not ready-for-commit)
            (message "No files remain to be committed")
          (if (not verbose)
-             (vc-checkin ready-for-commit)
+             (vc-checkin ready-for-commit backend)
            (progn
              (setq revision (read-string "New revision or backend: "))
              (let ((vsym (intern (upcase revision))))
                (if (member vsym vc-handled-backends)
                    (dolist (file files) (vc-transfer-file file vsym))
-                 (vc-checkin ready-for-commit revision))))))))
+                 (vc-checkin ready-for-commit backend revision))))))))
      ;; locked by somebody else (locking VCSes only)
      ((stringp state)
       ;; In the old days, we computed the revision once and used it on
@@ -1327,7 +1327,7 @@
      ".\n")
     (message "Please explain why you stole the lock.  Type C-c C-c when 
done.")))
 
-(defun vc-checkin (files &optional rev comment initial-contents)
+(defun vc-checkin (files backend &optional rev comment initial-contents)
   "Check in FILES.
 The optional argument REV may be a string specifying the new revision
 level (if nil increment the current level).  COMMENT is a comment
@@ -1341,6 +1341,8 @@
 Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
   (when vc-before-checkin-hook
     (run-hooks 'vc-before-checkin-hook))
+  (lexical-let
+   ((backend backend))
   (vc-start-logentry
    files rev comment initial-contents
    "Enter a change comment."
@@ -1356,13 +1358,13 @@
       ;; We used to change buffers to get local value of vc-checkin-switches,
       ;; but 'the' local buffer is not a well-defined concept for filesets.
       (progn
-       (vc-call checkin files rev comment)
+        (vc-call-backend backend 'checkin files rev comment)
        (mapc 'vc-delete-automatic-version-backups files))
       `((vc-state . up-to-date)
        (vc-checkout-time . ,(nth 5 (file-attributes file)))
        (vc-working-revision . nil)))
      (message "Checking in %s...done" (vc-delistify files)))
-   'vc-checkin-hook))
+    'vc-checkin-hook)))
 
 ;;; Additional entry points for examining version histories
 
@@ -2096,7 +2098,7 @@
     (when (or move edited)
       (vc-file-setprop file 'vc-state 'edited)
       (vc-mode-line file)
-      (vc-checkin file nil comment (stringp comment)))))
+      (vc-checkin file new-backend nil comment (stringp comment)))))
 
 (defun vc-rename-master (oldmaster newfile templates)
   "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES."