emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Dan Nicolaescu
Subject: [Emacs-diffs] emacs/lisp ChangeLog vc.el
Date: Sun, 15 Mar 2009 08:58:06 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/03/15 08:58: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.
        (vc-next-action): Do not assume that all backends in
        vc-handled-backends are upper case.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15480
retrieving revision 1.15481
diff -u -b -r1.15480 -r1.15481
--- ChangeLog   15 Mar 2009 08:54:00 -0000      1.15480
+++ ChangeLog   15 Mar 2009 08:58:02 -0000      1.15481
@@ -4,6 +4,8 @@
        pass it down to vc-start-logentry.
        (vc-next-action, vc-transfer-file): Pass the VC backend to
        vc-checkin.
+       (vc-next-action): Do not assume that all backends in
+       vc-handled-backends are upper case.
 
 2009-03-15  Chong Yidong  <address@hidden>
 

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.713
retrieving revision 1.714
diff -u -b -r1.713 -r1.714
--- vc.el       15 Mar 2009 08:54:05 -0000      1.713
+++ vc.el       15 Mar 2009 08:58:05 -0000      1.714
@@ -1041,9 +1041,12 @@
        (verbose
        ;; go to a different revision
        (setq revision (read-string "Branch, revision, or backend to move to: 
"))
-       (let ((vsym (intern-soft (upcase revision))))
-         (if (member vsym vc-handled-backends)
-             (dolist (file files) (vc-transfer-file file vsym))
+       (let ((revision-downcase (downcase revision)))
+         (if (member
+              revision-downcase
+              (mapcar (lambda (arg) (downcase (symbol-name arg))) 
vc-handled-backends))
+             (let ((vsym (intern-soft revision-downcase)))
+               (dolist (file files) (vc-transfer-file file vsym)))
            (dolist (file files)
               (vc-checkout file (eq model 'implicit) revision)))))
        ((not (eq model 'implicit))
@@ -1086,12 +1089,15 @@
            (message "No files remain to be committed")
          (if (not verbose)
              (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 backend revision))))))))
+           (let ((revision-downcase (downcase revision)))
+             (if (member
+                  revision-downcase
+                  (mapcar (lambda (arg) (downcase (symbol-name arg)))
+                          vc-handled-backends))
+                 (let ((vsym (intern revision-downcase)))
+                   (dolist (file files) (vc-transfer-file file vsym)))
+               (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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]