emacs: lisp/vc.el comparison

comparison lisp/vc.el @ 21324:b0abfde79536

* vc.el (vc-resolve-conflicts): New function. (vc-next-action-on-file): Use it. (vc-backend-revert): For CVS, revert to the version the buffer was based on, not the latest on the current branch (same behavior as for RCS). For SCCS, forget vc-workfile-version so that it gets recomputed. (vc-revert-buffer): Rewrote doc string to explain the above. (vc-finish-logentry): Don't add extra newline.

author	André Spiegel <spiegel@gnu.org>
date	Tue, 31 Mar 1998 17:19:32 +0000
parents	8972762c8ca6
children	8b4db8ce1da3

comparison

equal deleted inserted replaced

-:6fe4f59fab8c
+:b0abfde79536
 ;; Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
-;; $Id: vc.el,v 1.211 1998/03/18 13:25:00 spiegel Exp spiegel $
+;; $Id: vc.el,v 1.212 1998/03/20 15:40:24 spiegel Exp spiegel $
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 		     (not (yes-or-no-p
 			   (format
 			    "Buffer %s modified; merge file on disc anyhow? "
 			    (buffer-name buffer)))))
 		(error "Merge aborted"))
-	    (if (not (zerop (vc-backend-merge-news file)))
+	    (let ((status (vc-backend-merge-news file)))
-		;; Overlaps detected - what now?  Should use some
+(and buffer
-		;; fancy RCS conflict resolving package, or maybe
+(vc-resynch-buffer file t
-		;; emerge, but for now, simply warn the user with a
+(not (buffer-modified-p buffer))))
-		;; message.
+(if (not (zerop status))
-		(message "Conflicts detected!"))
+(if (y-or-n-p "Conflicts detected.  Resolve them now? ")
-	    (and buffer
+(vc-resolve-conflicts)))))
-		 (vc-resynch-buffer file t (not (buffer-modified-p buffer)))))
 	(error "%s needs update" (buffer-name))))
 ;; For CVS files with implicit checkout: if unmodified, don't do anything
 ((and (eq vc-type 'CVS)
 (eq (vc-checkout-model file) 'implicit)
 	  ;; that in.
 	  (if (not (verify-visited-file-modtime (current-buffer)))
 	      (if (yes-or-no-p "Replace file on disk with buffer contents? ")
 		  (write-file (buffer-file-name))
 		(error "Aborted"))
-	    ;; give luser a chance to save before checking in.
+;; if buffer is not saved, give user a chance to do it
 	    (vc-buffer-sync))
 	  ;; Revert if file is unchanged and buffer is too.
 	  ;; If buffer is modified, that means the user just said no
 	  ;; to saving it; in that case, don't revert,
 "Complete the operation implied by the current log entry."
 (interactive)
 ;; Check and record the comment, if any.
 (if (not nocomment)
 (progn
-	(goto-char (point-max))
-	(if (not (bolp))
-	    (newline))
 	;; Comment too long?
 	(vc-backend-logentry-check vc-log-file)
 	;; Record the comment in the comment ring
 	(ring-insert vc-comment-ring (buffer-string))
 	))
 		      "RCSfile\\|Revision\\|Source\\|State\\): [^$\n]+\\$")
 	      nil t)
 	(replace-match "$\\1$")))
 (vc-restore-buffer-context context)))
+(defun vc-resolve-conflicts ()
+"Invoke ediff to resolve conflicts in the current buffer.
+The conflicts must be marked with rcsmerge conflict markers."
+(interactive)
+(let* ((found nil)
+(file-name (file-name-nondirectory buffer-file-name))
+	 (your-buffer   (generate-new-buffer
+(concat "*" file-name " WORKFILE*")))
+	 (other-buffer  (generate-new-buffer
+(concat "*" file-name " CHECKED-IN*")))
+(result-buffer (current-buffer)))
+(save-excursion
+(set-buffer your-buffer)
+(erase-buffer)
+(insert-buffer result-buffer)
+(goto-char (point-min))
+(while (re-search-forward (concat "^<<<<<<< "
+					(regexp-quote file-name) "\n") nil t)
+(setq found t)
+	(replace-match "")
+	(if (not (re-search-forward "^=======\n" nil t))
+	    (error "Malformed conflict marker"))
+	(replace-match "")
+	(let ((start (point)))
+	  (if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t))
+	      (error "Malformed conflict marker"))
+	  (delete-region start (point))))
+(if (not found)
+(progn
+(kill-buffer your-buffer)
+(kill-buffer other-buffer)
+(error "No conflict markers found")))
+(set-buffer other-buffer)
+(erase-buffer)
+(insert-buffer result-buffer)
+(goto-char (point-min))
+(while (re-search-forward (concat "^<<<<<<< "
+					(regexp-quote file-name) "\n") nil t)
+	(let ((start (match-beginning 0)))
+	(if (not (re-search-forward "^=======\n" nil t))
+	    (error "Malformed conflict marker"))
+	(delete-region start (point))
+	(if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t))
+	    (error "Malformed conflict marker"))
+	(replace-match "")))
+(let ((config (current-window-configuration))
+(ediff-default-variant 'default-B))
+;; Fire up ediff.
+(set-buffer (ediff-merge-buffers your-buffer other-buffer))
+;; Ediff is now set up, and we are in the control buffer.
+;; Do a few further adjustments and take precautions for exit.
+(make-local-variable 'vc-ediff-windows)
+(setq vc-ediff-windows config)
+(make-local-variable 'vc-ediff-result)
+(setq vc-ediff-result result-buffer)
+(make-local-variable 'ediff-quit-hook)
+(setq ediff-quit-hook
+(function
+(lambda ()
+(let ((buffer-A ediff-buffer-A)
+(buffer-B ediff-buffer-B)
+(buffer-C ediff-buffer-C)
+(result vc-ediff-result)
+(windows vc-ediff-windows))
+(ediff-cleanup-mess)
+(set-buffer result)
+(erase-buffer)
+(insert-buffer buffer-C)
+(kill-buffer buffer-A)
+(kill-buffer buffer-B)
+(kill-buffer buffer-C)
+(set-window-configuration windows)
+(message "Conflict resolution finished; you may save the buffer")))))
+(message "Please resolve conflicts now; exit ediff when done")
+nil))))
 ;; The VC directory major mode.  Coopt Dired for this.
 ;; All VC commands get mapped into logical equivalents.
 (define-derived-mode vc-dired-mode dired-mode "Dired under VC"
 "The major mode used in VC directory buffers.  It is derived from Dired.
 )
 )
 ;;;###autoload
 (defun vc-revert-buffer ()
-"Revert the current buffer's file back to the latest checked-in version.
+"Revert the current buffer's file back to the version it was based on.
 This asks for confirmation if the buffer contents are not identical
-to that version.
+to that version.  Note that for RCS and CVS, this function does not
-If the back-end is CVS, this will give you the most recent revision of
+automatically pick up newer changes found in the master file;
-the file on the branch you are editing."
+use C-u \\[vc-next-action] RET to do so."
 (interactive)
 (if vc-dired-mode
 (find-file-other-window (dired-get-filename)))
 (while vc-parent-buffer
 (pop-to-buffer vc-parent-buffer))
 	  (vc-file-setprop file 'vc-checkout-time
 			   (nth 5 (file-attributes file)))))))
 (message "Checking in %s...done" file))
 (defun vc-backend-revert (file)
-;; Revert file to latest checked-in version.
+;; Revert file to the version it was based on.
-;; (for RCS, to workfile version)
 (message "Reverting %s..." file)
 (vc-file-clear-masterprops file)
 (vc-backend-dispatch
 file
 ;; SCCS
 (progn
 (vc-do-command nil 0 "unget" file 'MASTER nil)
-(vc-do-command nil 0 "get" file 'MASTER nil))
+(vc-do-command nil 0 "get" file 'MASTER nil)
+;; Checking out explicit versions is not supported under SCCS, yet.
+;; We always "revert" to the latest version; therefore
+;; vc-workfile-version is cleared here so that it gets recomputed.
+(vc-file-setprop 'vc-workfile-version nil))
 ;; RCS
 (vc-do-command nil 0 "co" file 'MASTER
 		  "-f" (concat "-u" (vc-workfile-version file)))
 ;; CVS
 (progn
 (delete-file file)
-(vc-do-command nil 0 "cvs" file 'WORKFILE "update")))
+(vc-do-command nil 0 "cvs" file 'WORKFILE "update"
+(concat "-r" (vc-workfile-version file)))))
 (vc-file-setprop file 'vc-locking-user 'none)
 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file)))
 (message "Reverting %s...done" file)
 )

Mercurial > emacs

comparison lisp/vc.el @ 21324:b0abfde79536