Mercurial > emacs
comparison lisp/vc-mcvs.el @ 85184:025303f3b74d
(vc-mcvs-checkin): Use mapc rather than mapcar.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 12 Oct 2007 03:01:13 +0000 |
parents | b16f7408cd3f |
children | 43a9834cf1a6 d38543a1c0f9 |
comparison
equal
deleted
inserted
replaced
85183:d18b96e2d51f | 85184:025303f3b74d |
---|---|
275 ;; This file-specific form of branching is deprecated. | 275 ;; This file-specific form of branching is deprecated. |
276 ;; We can't use `mcvs branch' and `mcvs switch' because they cannot | 276 ;; We can't use `mcvs branch' and `mcvs switch' because they cannot |
277 ;; be applied just to this one file. | 277 ;; be applied just to this one file. |
278 (apply 'vc-mcvs-command nil 0 files "tag" "-b" (list rev)) | 278 (apply 'vc-mcvs-command nil 0 files "tag" "-b" (list rev)) |
279 (apply 'vc-mcvs-command nil 0 files "update" "-r" (list rev)) | 279 (apply 'vc-mcvs-command nil 0 files "update" "-r" (list rev)) |
280 (mapcar (lambda (file) (vc-file-setprop file 'vc-mcvs-sticky-tag rev)) | 280 (mapc (lambda (file) (vc-file-setprop file 'vc-mcvs-sticky-tag rev)) |
281 files) | 281 files) |
282 (setq rev nil))) | 282 (setq rev nil))) |
283 ;; This commit might cvs-commit several files (e.g. MAP and TYPES) | 283 ;; This commit might cvs-commit several files (e.g. MAP and TYPES) |
284 ;; so using numbered revs here is dangerous and somewhat meaningless. | 284 ;; so using numbered revs here is dangerous and somewhat meaningless. |
285 (when rev (error "Cannot commit to a specific revision number")) | 285 (when rev (error "Cannot commit to a specific revision number")) |
286 (let ((status (apply 'vc-mcvs-command nil 1 files | 286 (let ((status (apply 'vc-mcvs-command nil 1 files |
290 (goto-char (point-min)) | 290 (goto-char (point-min)) |
291 (when (not (zerop status)) | 291 (when (not (zerop status)) |
292 ;; Check checkin problem. | 292 ;; Check checkin problem. |
293 (cond | 293 (cond |
294 ((re-search-forward "Up-to-date check failed" nil t) | 294 ((re-search-forward "Up-to-date check failed" nil t) |
295 (mapcar (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) | 295 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) |
296 files) | 296 files) |
297 (error (substitute-command-keys | 297 (error (substitute-command-keys |
298 (concat "Up-to-date check failed: " | 298 (concat "Up-to-date check failed: " |
299 "type \\[vc-next-action] to merge in changes")))) | 299 "type \\[vc-next-action] to merge in changes")))) |
300 (t | 300 (t |