diff options
| author | Dan Nicolaescu | 2009-03-15 08:58:02 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-03-15 08:58:02 +0000 |
| commit | 57b037f9bcf56a2021b5614d3cdbb2ba1df9dc0e (patch) | |
| tree | ff7127d2f795f5afd08a0e214a3308f56dad5273 | |
| parent | 01cf1a52ea1969eafdba32e4c4a33766a3a50157 (diff) | |
| download | emacs-57b037f9bcf56a2021b5614d3cdbb2ba1df9dc0e.tar.gz emacs-57b037f9bcf56a2021b5614d3cdbb2ba1df9dc0e.zip | |
(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.
| -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 @@ | |||
| 4 | pass it down to vc-start-logentry. | 4 | pass it down to vc-start-logentry. |
| 5 | (vc-next-action, vc-transfer-file): Pass the VC backend to | 5 | (vc-next-action, vc-transfer-file): Pass the VC backend to |
| 6 | vc-checkin. | 6 | vc-checkin. |
| 7 | (vc-next-action): Do not assume that all backends in | ||
| 8 | vc-handled-backends are upper case. | ||
| 7 | 9 | ||
| 8 | 2009-03-15 Chong Yidong <cyd@stupidchicken.com> | 10 | 2009-03-15 Chong Yidong <cyd@stupidchicken.com> |
| 9 | 11 | ||
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." | |||
| 1041 | (verbose | 1041 | (verbose |
| 1042 | ;; go to a different revision | 1042 | ;; go to a different revision |
| 1043 | (setq revision (read-string "Branch, revision, or backend to move to: ")) | 1043 | (setq revision (read-string "Branch, revision, or backend to move to: ")) |
| 1044 | (let ((vsym (intern-soft (upcase revision)))) | 1044 | (let ((revision-downcase (downcase revision))) |
| 1045 | (if (member vsym vc-handled-backends) | 1045 | (if (member |
| 1046 | (dolist (file files) (vc-transfer-file file vsym)) | 1046 | revision-downcase |
| 1047 | (mapcar (lambda (arg) (downcase (symbol-name arg))) vc-handled-backends)) | ||
| 1048 | (let ((vsym (intern-soft revision-downcase))) | ||
| 1049 | (dolist (file files) (vc-transfer-file file vsym))) | ||
| 1047 | (dolist (file files) | 1050 | (dolist (file files) |
| 1048 | (vc-checkout file (eq model 'implicit) revision))))) | 1051 | (vc-checkout file (eq model 'implicit) revision))))) |
| 1049 | ((not (eq model 'implicit)) | 1052 | ((not (eq model 'implicit)) |
| @@ -1086,12 +1089,15 @@ merge in the changes into your working copy." | |||
| 1086 | (message "No files remain to be committed") | 1089 | (message "No files remain to be committed") |
| 1087 | (if (not verbose) | 1090 | (if (not verbose) |
| 1088 | (vc-checkin ready-for-commit backend) | 1091 | (vc-checkin ready-for-commit backend) |
| 1089 | (progn | 1092 | (setq revision (read-string "New revision or backend: ")) |
| 1090 | (setq revision (read-string "New revision or backend: ")) | 1093 | (let ((revision-downcase (downcase revision))) |
| 1091 | (let ((vsym (intern (upcase revision)))) | 1094 | (if (member |
| 1092 | (if (member vsym vc-handled-backends) | 1095 | revision-downcase |
| 1093 | (dolist (file files) (vc-transfer-file file vsym)) | 1096 | (mapcar (lambda (arg) (downcase (symbol-name arg))) |
| 1094 | (vc-checkin ready-for-commit backend revision)))))))) | 1097 | vc-handled-backends)) |
| 1098 | (let ((vsym (intern revision-downcase))) | ||
| 1099 | (dolist (file files) (vc-transfer-file file vsym))) | ||
| 1100 | (vc-checkin ready-for-commit backend revision))))))) | ||
| 1095 | ;; locked by somebody else (locking VCSes only) | 1101 | ;; locked by somebody else (locking VCSes only) |
| 1096 | ((stringp state) | 1102 | ((stringp state) |
| 1097 | ;; In the old days, we computed the revision once and used it on | 1103 | ;; In the old days, we computed the revision once and used it on |