procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-cvs-checkin): Check both status and error message after command.

Browse source 
If there's an unexpected error, signal it instead of being silent.
This commit is contained in:
André Spiegel 2000-10-27 11:37:17 +00:00
parent e39fc3144f
commit bee48f254b
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/vc-cvs.el
View file

@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-cvs.el,v 1.5 2000/10/04 09:51:15 spiegel Exp $
;; $Id: vc-cvs.el,v 1.6 2000/10/22 15:31:11 spiegel Exp $
;; This file is part of GNU Emacs.
@ -519,14 +519,21 @@ Inappropriate for CVS"
"ci" (if rev (concat "-r" rev))
(concat "-m" comment)
switches))
;; determine and store the new workfile version
(set-buffer "*vc*")
(goto-char (point-min))
;; Check checkin problem. We could check `status' as well.
(when (re-search-forward "Up-to-date check failed" nil t)
(vc-file-setprop file 'vc-state 'needs-merge)
(error (substitute-command-keys
"Up-to-date check failed: type \\[vc-next-action] to merge in changes")))
(when (not (zerop status))
;; Check checkin problem.
(cond
((re-search-forward "Up-to-date check failed" nil t)
(vc-file-setprop file 'vc-state 'needs-merge)
(error (substitute-command-keys
(concat "Up-to-date check failed: "
"type \\[vc-next-action] to merge in changes"))))
(t
(pop-to-buffer (current-buffer))
(goto-char (point-min))
(shrink-window-if-larger-than-buffer)
(error "Check-in failed"))))
;; Update file properties
(vc-file-setprop
file 'vc-workfile-version