emacs: lisp/vc.el comparison

comparison lisp/vc.el @ 36710:66e9d0506b71

(vc-do-command): If the destination buffer is already current, don't set it up and don't erase it. Updated doc string to reflect that. (vc-version-diff): When doing a single file diff, don't switch to the *vc-diff* buffer before the command. This is to preserve local variable bindings that might affect the diff command. (vc-print-log): Don't switch to the *vc* buffer before the command, so that local variable bindings are preserved.

author	André Spiegel <spiegel@gnu.org>
date	Sat, 10 Mar 2001 10:44:35 +0000
parents	20a768ca0cf8
children	94c0503d3f2d

comparison

equal deleted inserted replaced

-:9566f100bdd3
+:66e9d0506b71
 ;; Copyright (C) 1992,93,94,95,96,97,98,2000,2001  Free Software Foundation, Inc.
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc.el,v 1.296 2001/02/01 17:41:06 fx Exp $
+;; $Id: vc.el,v 1.297 2001/02/26 13:45:06 spiegel Exp $
 ;; 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
 ;;
 ;; HISTORY FUNCTIONS
 ;;
 ;; * print-log (file)
 ;;
-;;   Insert the revision log of FILE into the current buffer.
+;;   Insert the revision log of FILE into the *vc* buffer.
 ;;
 ;; - show-log-entry (version)
 ;;
 ;;   If provided, search the log entry for VERSION in the current buffer,
 ;;   and make sure it is displayed in the buffer's window.  The default
 ;;   default implementation runs rcs2log, which handles RCS- and
 ;;   CVS-style logs.
 ;;
 ;; * diff (file &optional rev1 rev2)
 ;;
-;;   Insert the diff for FILE into the current buffer.  If REV1 and REV2
+;;   Insert the diff for FILE into the *vc-diff* buffer.  If REV1 and REV2
 ;;   are non-nil, report differences from REV1 to REV2.  If REV1 is nil,
 ;;   use the current workfile version (as found in the repository) as the
 ;;   older version; if REV2 is nil, use the current workfile contents as
 ;;   the newer version.  This function should return a status of either 0
 ;;   (no differences found), or 1 (either non-empty diff or the diff is
 Each function is called inside the buffer in which the command was run
 and is passed 3 argument: the COMMAND, the FILE and the FLAGS.")
 (defun vc-do-command (buffer okstatus command file &rest flags)
 "Execute a version control command, notifying user and checking for errors.
-Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the current
+Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
-buffer (which is assumed to be properly setup) if BUFFER is t.  The
+current buffer if BUFFER is t.  If the destination buffer is not
-command is considered successful if its exit status does not exceed
+already current, set it up properly and erase it.  The command is
-OKSTATUS (if OKSTATUS is nil, that means to ignore errors, if it is 'async,
+considered successful if its exit status does not exceed OKSTATUS (if
-that means not to wait for termination of the subprocess).  FILE is
+OKSTATUS is nil, that means to ignore errors, if it is 'async, that
-the name of the working file (may also be nil, to execute commands
+means not to wait for termination of the subprocess).  FILE is the
-that don't expect a file name).  If an optional list of FLAGS is present,
+name of the working file (may also be nil, to execute commands that
+don't expect a file name).  If an optional list of FLAGS is present,
 that is inserted into the command line before the filename."
 (and file (setq file (expand-file-name file)))
 (if vc-command-messages
 (message "Running %s on %s..." command file))
 (save-current-buffer
-(unless (eq buffer t) (vc-setup-buffer buffer))
+(unless (or (eq buffer t)
+(and (stringp buffer)
+(string= (buffer-name) buffer))
+(eq buffer (current-buffer)))
+(vc-setup-buffer buffer))
 (let ((squeezed nil)
 	  (inhibit-read-only t)
 	  (status 0))
 (setq squeezed (delq nil (copy-sequence flags)))
 (when file
 (read-string (if rel2-default
 			    (concat "Newer version: (default "
 				    rel2-default ") ")
 			  "Newer version (default: current source): ")
 			nil nil rel2-default))))
-(vc-setup-buffer "*vc-diff*")
 (if (file-directory-p file)
 ;; recursive directory diff
-(let ((inhibit-read-only t))
+(progn
+(vc-setup-buffer "*vc-diff*")
 	(if (string-equal rel1 "") (setq rel1 nil))
 	(if (string-equal rel2 "") (setq rel2 nil))
-	(insert "Diffs between "
+(let ((inhibit-read-only t))
-		(or rel1 "last version checked in")
+(insert "Diffs between "
-		" and "
+(or rel1 "last version checked in")
-		(or rel2 "current workfile(s)")
+" and "
-		":\n\n")
+(or rel2 "current workfile(s)")
+":\n\n"))
 	(setq default-directory (file-name-as-directory file))
 	;; FIXME: this should do a single exec in CVS.
 	(vc-file-tree-walk
 	 default-directory
 	 (lambda (f)
 (let ((file-rel1 (vc-version-backup-file file rel1))
 	  (file-rel2 (if (not rel2)
 			 file
 		       (vc-version-backup-file file rel2))))
 (if (and file-rel1 file-rel2)
-	  (apply 'vc-do-command t 1 "diff" nil
+	  (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
 		 (append (if (listp diff-switches)
 			     diff-switches
 			   (list diff-switches))
 (if (listp vc-diff-switches)
 vc-diff-switches
 (list vc-diff-switches))
 			 (list (file-relative-name file-rel1)
 			       (file-relative-name file-rel2))))
-	(cd (file-name-directory file))
 	(vc-call diff file rel1 rel2))))
+(set-buffer "*vc-diff*")
 (if (and (zerop (buffer-size))
 	   (not (get-buffer-process (current-buffer))))
 (progn
 	(if rel1
 	    (if rel2
 (defun vc-print-log ()
 "List the change log of the current buffer in a window."
 (interactive)
 (vc-ensure-vc-buffer)
 (let ((file buffer-file-name))
-(vc-setup-buffer nil)
-(setq default-directory (file-name-directory file))
 (vc-call print-log file)
+(set-buffer "*vc*")
 (pop-to-buffer (current-buffer))
 (if (fboundp 'log-view-mode) (log-view-mode))
 (vc-exec-after
 `(progn
 	(goto-char (point-max)) (forward-line -1)

Mercurial > emacs

comparison lisp/vc.el @ 36710:66e9d0506b71