diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc.el | 24 |
2 files changed, 17 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac1c078f72c..a776210d453 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 <cyd@stupidchicken.com> diff --git a/lisp/vc.el b/lisp/vc.el index 61f1bb6369d..e785f3fb9ca 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1041,9 +1041,12 @@ merge in the changes into your working copy." (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 @@ merge in the changes into your working copy." (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)))))))) + (setq revision (read-string "New revision or backend: ")) + (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 |