;;; vc.el --- drive a version-control system from within Emacs
-;; Copyright (C) 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Version: 5.3
-
-;; $Id: vc.el,v 1.29 1993/03/28 06:40:46 eric Exp eric $
+;; Maintainer: eggert@twinsun.com
+;; Version: 5.5
;; This file is part of GNU Emacs.
;; and Richard Stallman contributed valuable criticism, support, and testing.
;;
;; Supported version-control systems presently include SCCS and RCS;
-;; your RCS version should be 5.6.2 or later for proper operation of
-;; the lock-breaking code.
+;; the RCS lock-stealing code doesn't work right unless you use RCS 5.6.2
+;; or newer. Currently (January 1994) that is only a beta test release.
;;
;; The RCS code assumes strict locking. You can support the RCS -x option
;; by adding pairs to the vc-master-templates list.
;; to be installed somewhere on Emacs's path for executables.
;;
;; If your site uses the ChangeLog convention supported by Emacs, the
-;; function vc-comment-to-changelog should prove a useful checkin hook.
+;; function vc-comment-to-change-log should prove a useful checkin hook.
;;
;; This code depends on call-process passing back the subprocess exit
-;; status. Thus, you need Emacs 18.58 or later to run it.
+;; status. Thus, you need Emacs 18.58 or later to run it. For the
+;; vc-directory command to work properly as documented, you need 19.
+;; You also need Emacs 19's ring.el.
;;
;; The vc code maintains some internal state in order to reduce expensive
;; version-control operations to a minimum. Some names are only computed
-;; once. If you perform version control operations with RCS/SCCS/CVS while
+;; once. If you perform version control operations with RCS/SCCS/CVS while
;; vc's back is turned, or move/rename master files while vc is running,
;; vc may get seriously confused. Don't do these things!
;;
;;; Code:
(require 'vc-hooks)
+(require 'ring)
+(eval-when-compile (require 'dired)) ; for dired-map-over-marks macro
+
+(if (not (assoc 'vc-parent-buffer minor-mode-alist))
+ (setq minor-mode-alist
+ (cons '(vc-parent-buffer vc-parent-buffer-name)
+ minor-mode-alist)))
;; General customization
(defvar vc-default-back-end nil
"*Back-end actually used by this interface; may be SCCS or RCS.
The value is only computed when needed to avoid an expensive search.")
-(defvar vc-diff-options '("-a" "-c1")
- "*The command/flags list to be used in constructing diff commands.")
(defvar vc-suppress-confirm nil
- "*If non-nil, reat user as expert; suppress yes-no prompts on some things.")
+ "*If non-nil, treat user as expert; suppress yes-no prompts on some things.")
(defvar vc-keep-workfiles t
"*If non-nil, don't delete working files after registering changes.")
(defvar vc-initial-comment nil
"*Display run messages from back-end commands.")
(defvar vc-mistrust-permissions 'file-symlink-p
"*Don't assume that permissions and ownership track version-control status.")
-
(defvar vc-checkin-switches nil
"*Extra switches passed to the checkin program by \\[vc-checkin].")
+(defvar vc-path
+ (if (file-exists-p "/usr/sccs")
+ '("/usr/sccs") nil)
+ "*List of extra directories to search for version control commands.")
+
+(defconst vc-maximum-comment-ring-size 32
+ "Maximum number of saved comments in the comment ring.")
+
+;;; This is duplicated in diff.el.
+(defvar diff-switches "-c"
+ "*A string or list of strings specifying switches to be be passed to diff.")
;;;###autoload
(defvar vc-checkin-hook nil
- "*List of functions called after a vc-checkin is done. See `run-hooks'.")
+ "*List of functions called after a checkin is done. See `run-hooks'.")
;; Header-insertion hair
(defvar vc-header-alist
'((SCCS "\%W\%") (RCS "\$Id\$"))
- "*Header keywords to be inserted when vc-insert-header is executed.")
-(defconst vc-static-header-alist
+ "*Header keywords to be inserted when `vc-insert-headers' is executed.")
+(defvar vc-static-header-alist
'(("\\.c$" .
"\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
"*Associate static header string templates with file types. A \%s in the
template is replaced with the first string associated with the file's
-verson-control type in vc-header-alist.")
+version-control type in `vc-header-alist'.")
(defvar vc-comment-alist
'((nroff-mode ".\\\"" ""))
and comment-end variables. This will only be necessary if the mode language
is sensitive to blank lines.")
+;; Default is to be extra careful for super-user.
+(defvar vc-checkout-carefully (= (user-uid) 0)
+ "*Non-nil means be extra-careful in checkout.
+Verify that the file really is not locked
+and that its contents match what the master file says.")
+
;; Variables the user doesn't need to know about.
(defvar vc-log-entry-mode nil)
(defvar vc-log-operation nil)
(defvar vc-log-after-operation-hook nil)
-(defvar vc-checkout-writeable-buffer-hook 'vc-checkout-writeable-buffer)
+(defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer)
+;; In a log entry buffer, this is a local variable
+;; that points to the buffer for which it was made
+;; (either a file, or a VC dired buffer).
(defvar vc-parent-buffer nil)
+(defvar vc-parent-buffer-name nil)
(defvar vc-log-file)
(defvar vc-log-version)
(defconst vc-name-assoc-file "VC-names")
+(defvar vc-dired-mode nil)
+(make-variable-buffer-local 'vc-dired-mode)
+
+(defvar vc-comment-ring nil)
+(defvar vc-comment-ring-index nil)
+(defvar vc-last-comment-match nil)
+
;; File property caching
(defun vc-file-clearprops (file)
;; clear all properties of a given file
(setplist (intern file vc-file-prop-obarray) nil))
+(defun vc-clear-context ()
+ "Clear all cached file properties and the comment ring."
+ (interactive)
+ (fillarray vc-file-prop-obarray nil)
+ ;; Note: there is potential for minor lossage here if there is an open
+ ;; log buffer with a nonzero local value of vc-comment-ring-index.
+ (setq vc-comment-ring nil))
+
;; Random helper functions
-(defun vc-name (file)
- "Return the master name of a file, nil if it is not registered"
- (or (vc-file-getprop file 'vc-name)
- (vc-file-setprop file 'vc-name
- (let ((name-and-type (vc-registered file)))
- (and name-and-type (car name-and-type))))))
+(defun vc-registration-error (file)
+ (if file
+ (error "File %s is not under version control" file)
+ (error "Buffer %s is not associated with a file" (buffer-name))))
(defvar vc-binary-assoc nil)
(defun vc-find-binary (name)
"Look for a command anywhere on the subprocess-command search path."
(or (cdr (assoc name vc-binary-assoc))
- (let ((full nil))
- (catch 'found
- (mapcar
- (function (lambda (s)
- (if (and s (file-exists-p (setq full (concat s "/" name))))
- (throw 'found nil))))
- exec-path))
- (if full
- (setq vc-binary-assoc (cons (cons name full) vc-binary-assoc)))
- full)))
+ (catch 'found
+ (mapcar
+ (function
+ (lambda (s)
+ (if s
+ (let ((full (concat s "/" name)))
+ (if (file-executable-p full)
+ (progn
+ (setq vc-binary-assoc
+ (cons (cons name full) vc-binary-assoc))
+ (throw 'found full)))))))
+ exec-path)
+ nil)))
(defun vc-do-command (okstatus command file &rest flags)
"Execute a version-control command, notifying user and checking for errors.
(vc-file (and file (vc-name file)))
status)
(set-buffer (get-buffer-create "*vc*"))
- (make-local-variable 'vc-parent-buffer)
- (setq vc-parent-buffer camefrom)
+ (set (make-local-variable 'vc-parent-buffer) camefrom)
+ (set (make-local-variable 'vc-parent-buffer-name)
+ (concat " from " (buffer-name camefrom)))
+
(erase-buffer)
;; This is so that command arguments typed in the *vc* buffer will
flags)
(if vc-file
(setq squeezed (append squeezed (list vc-file))))
- (let ((default-directory (file-name-directory (or file "./"))))
+ (let ((default-directory (file-name-directory (or file "./")))
+ (exec-path (if vc-path (append exec-path vc-path) exec-path))
+ ;; Add vc-path to PATH for the execution of this command.
+ (process-environment
+ (cons (concat "PATH=" (getenv "PATH")
+ ":" (mapconcat 'identity vc-path ":"))
+ process-environment)))
(setq status (apply 'call-process command nil t nil squeezed)))
(goto-char (point-max))
- (previous-line 1)
+ (forward-line -1)
(if (or (not (integerp status)) (< okstatus status))
(progn
- (previous-line 1)
- (print (cons command squeezed))
- (next-line 1)
(pop-to-buffer "*vc*")
- (vc-shrink-to-fit)
(goto-char (point-min))
+ (shrink-window-if-larger-than-buffer)
(error "Running %s...FAILED (%s)" command
(if (integerp status)
(format "status %d" status)
(mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
(vc-position-context (mark-marker))))
;; Make the right thing happen in transient-mark-mode.
- (mark-active nil))
+ (mark-active nil)
+ ;; We may want to reparse the compilation buffer after revert
+ (reparse (and (boundp 'compilation-error-list) ;compile loaded
+ (let ((curbuf (current-buffer)))
+ ;; Construct a list; each elt is nil or a buffer
+ ;; iff that buffer is a compilation output buffer
+ ;; that contains markers into the current buffer.
+ (save-excursion
+ (mapcar (function
+ (lambda (buffer)
+ (set-buffer buffer)
+ (let ((errors (or
+ compilation-old-error-list
+ compilation-error-list))
+ (buffer-error-marked-p nil))
+ (while (and (consp errors)
+ (not buffer-error-marked-p))
+ (and (markerp (cdr (car errors)))
+ (eq buffer
+ (marker-buffer
+ (cdr (car errors))))
+ (setq buffer-error-marked-p t))
+ (setq errors (cdr errors)))
+ (if buffer-error-marked-p buffer))))
+ (buffer-list)))))))
;; the actual revisit
(revert-buffer arg no-confirm)
+ ;; Reparse affected compilation buffers.
+ (while reparse
+ (if (car reparse)
+ (save-excursion
+ (set-buffer (car reparse))
+ (let ((compilation-last-buffer (current-buffer)) ;select buffer
+ ;; Record the position in the compilation buffer of
+ ;; the last error next-error went to.
+ (error-pos (marker-position
+ (car (car-safe compilation-error-list)))))
+ ;; Reparse the error messages as far as they were parsed before.
+ (compile-reinitialize-errors '(4) compilation-parsing-end)
+ ;; Move the pointer up to find the error we were at before
+ ;; reparsing. Now next-error should properly go to the next one.
+ (while (and compilation-error-list
+ (/= error-pos (car (car compilation-error-list))))
+ (setq compilation-error-list (cdr compilation-error-list))))))
+ (setq reparse (cdr reparse)))
+
;; Restore point and mark
(let ((new-point (vc-find-position-by-context point-context)))
(if new-point (goto-char new-point)))
(if new-mark (set-mark new-mark))))))
-(defun vc-buffer-sync ()
+(defun vc-buffer-sync (&optional not-urgent)
;; Make sure the current buffer and its working file are in sync
- (if (and (buffer-modified-p)
- (or
- vc-suppress-confirm
- (y-or-n-p (format "%s has been modified. Write it out? "
- (buffer-name)))))
- (save-buffer)))
-
-(defun vc-workfile-unchanged-p (file)
+ ;; NOT-URGENT means it is ok to continue if the user says not to save.
+ (if (buffer-modified-p)
+ (if (or vc-suppress-confirm
+ (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
+ (save-buffer)
+ (if not-urgent
+ nil
+ (error "Aborted")))))
+
+
+(defun vc-workfile-unchanged-p (file &optional want-differences-if-changed)
;; Has the given workfile changed since last checkout?
(let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
(lastmod (nth 5 (file-attributes file))))
- (if checkout-time
- (equal lastmod checkout-time)
- (if (zerop (vc-backend-diff file nil))
- (progn
- (vc-file-setprop file 'vc-checkout-time lastmod)
- t)
- (progn
- (vc-file-setprop file 'vc-checkout-time '(0 . 0))
- nil
- ))
- )))
+ (or (equal checkout-time lastmod)
+ (and (or (not checkout-time) want-differences-if-changed)
+ (let ((unchanged (zerop (vc-backend-diff file nil nil
+ (not want-differences-if-changed)))))
+ ;; 0 stands for an unknown time; it can't match any mod time.
+ (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
+ unchanged)))))
+
+(defun vc-next-action-on-file (file verbose &optional comment)
+ ;;; If comment is specified, it will be used as an admin or checkin comment.
+ (let (owner version (vc-file (vc-name file)))
+ (cond
+
+ ;; if there is no master file corresponding, create one
+ ((not vc-file)
+ (vc-register verbose comment))
+
+ ;; if there is no lock on the file, assert one and get it
+ ((not (setq owner (vc-locking-user file)))
+ (if (and vc-checkout-carefully
+ (not (vc-workfile-unchanged-p file t)))
+ (if (save-window-excursion
+ (pop-to-buffer "*vc*")
+ (goto-char (point-min))
+ (insert-string (format "Changes to %s since last lock:\n\n"
+ file))
+ (not (beep))
+ (yes-or-no-p
+ (concat "File has unlocked changes, "
+ "claim lock retaining changes? ")))
+ (progn (vc-backend-steal file)
+ (vc-mode-line file))
+ (if (not (yes-or-no-p "Revert to checked-in version, instead? "))
+ (error "Checkout aborted.")
+ (vc-revert-buffer1 t t)
+ (vc-checkout-writable-buffer file))
+ )
+ (vc-checkout-writable-buffer file)))
+
+ ;; a checked-out version exists, but the user may not own the lock
+ ((not (string-equal owner (user-login-name)))
+ (if comment
+ (error "Sorry, you can't steal the lock on %s this way" file))
+ (vc-steal-lock
+ file
+ (and verbose (read-string "Version to steal: "))
+ owner))
+
+ ;; OK, user owns the lock on the file
+ (t
+ (find-file file)
+
+ ;; give luser a chance to save before checking in.
+ (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,
+ ;; because the user might intend to save
+ ;; after finishing the log entry.
+ (if (and (vc-workfile-unchanged-p file)
+ (not (buffer-modified-p)))
+ (progn
+ (vc-backend-revert file)
+ ;; DO NOT revert the file without asking the user!
+ (vc-resynch-window file t nil))
+
+ ;; user may want to set nonstandard parameters
+ (if verbose
+ (setq version (read-string "New version level: ")))
+
+ ;; OK, let's do the checkin
+ (vc-checkin file version comment)
+ )))))
+
+(defun vc-next-action-dired (file rev comment)
+ ;; We've accepted a log comment, now do a vc-next-action using it on all
+ ;; marked files.
+ (set-buffer vc-parent-buffer)
+ (dired-map-over-marks
+ (save-window-excursion
+ (let ((file (dired-get-filename)))
+ (message "Processing %s..." file)
+ (vc-next-action-on-file file nil comment)
+ (message "Processing %s...done" file)))
+ nil t)
+ )
;; Here's the major entry point.
(defun vc-next-action (verbose)
"Do the next logical checkin or checkout operation on the current file.
If the file is not already registered, this registers it for version
-control and then retrieves a writeable, locked copy for editing.
+control and then retrieves a writable, locked copy for editing.
If the file is registered and not locked by anyone, this checks out
-a writeable and locked file ready for editing.
+a writable and locked file ready for editing.
If the file is checked out and locked by the calling user, this
first checks to see if the file has changed since checkout. If not,
it performs a revert.
- If the file has been changed, this pops up a buffer for creation of
-a log message; when the message has been entered, it checks in the
+ If the file has been changed, this pops up a buffer for entry
+of a log message; when the message has been entered, it checks in the
resulting changes along with the log message as change commentary. If
-the variable vc-keep-workfiles is non-nil (which is its default), a
+the variable `vc-keep-workfiles' is non-nil (which is its default), a
read-only copy of the changed file is left in place afterwards.
If the file is registered and locked by someone else, you are given
-the option to steal the lock."
+the option to steal the lock.
+ If you call this from within a VC dired buffer with no files marked,
+it will operate on the file in the current line.
+ If you call this from within a VC dired buffer, and one or more
+files are marked, it will accept a log message and then operate on
+each one. The log message will be used as a comment for any register
+or checkin operations, but ignored when doing checkouts. Attempted
+lock steals will raise an error.
+
+ For checkin, a prefix argument lets you specify the version number to use."
(interactive "P")
- (while vc-parent-buffer
+ (catch 'nogo
+ (if vc-dired-mode
+ (let ((files (dired-get-marked-files)))
+ (if (= (length files) 1)
+ (find-file-other-window (car files))
+ (vc-start-entry nil nil nil
+ "Enter a change comment for the marked files."
+ 'vc-next-action-dired)
+ (throw 'nogo nil))))
+ (while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
- (if buffer-file-name
- (let
- (do-update owner version
- (file buffer-file-name)
- (vc-file (vc-name buffer-file-name))
- (err-msg nil)
- owner)
-
- (cond
-
- ;; if there is no master file corresponding, create one
- ((not vc-file)
- (vc-register verbose)
- (if vc-initial-comment
- (setq vc-log-after-operation-hook
- 'vc-checkout-writeable-buffer-hook)
- (vc-checkout-writeable-buffer)))
-
- ;; if there is no lock on the file, assert one and get it
- ((not (setq owner (vc-locking-user file)))
- (vc-checkout-writeable-buffer))
-
- ;; a checked-out version exists, but the user may not own the lock
- ((not (string-equal owner (user-login-name)))
- (vc-steal-lock
- file
- (and verbose (read-string "Version to steal: "))
- owner))
-
- ;; OK, user owns the lock on the file
- (t (progn
-
- ;; give luser a chance to save before checking in.
- (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,
- ;; because the user might intend to save
- ;; after finishing the log entry.
- (if (and (vc-workfile-unchanged-p file)
- (not (buffer-modified-p)))
- (progn
- (vc-backend-revert file)
- ;; DO NOT revert the file without asking the user!
- (vc-resynch-window file t nil))
-
- ;; user may want to set nonstandard parameters
- (if verbose
- (setq version (read-string "New version level: ")))
-
- ;; OK, let's do the checkin
- (vc-checkin file version))))))
- (error "There is no file associated with buffer %s" (buffer-name))))
+ (if buffer-file-name
+ (vc-next-action-on-file buffer-file-name verbose)
+ (vc-registration-error nil))))
;;; These functions help the vc-next-action entry point
-(defun vc-checkout-writeable-buffer ()
- "Retrieve a writeable copy of the latest version of the current buffer's file."
- (vc-checkout (buffer-file-name) t)
+(defun vc-checkout-writable-buffer (&optional file)
+ "Retrieve a writable copy of the latest version of the current buffer's file."
+ (vc-checkout (or file (buffer-file-name)) t)
)
;;;###autoload
-(defun vc-register (&optional override)
+(defun vc-register (&optional override comment)
"Register the current file into your version-control system."
(interactive "P")
- (if (vc-name buffer-file-name)
- (error "This file is already registered."))
+ (let ((master (vc-name buffer-file-name)))
+ (and master (file-exists-p master)
+ (error "This file is already registered"))
+ (and master
+ (not (y-or-n-p "Previous master file has vanished. Make a new one? "))
+ (error "This file is already registered")))
;; Watch out for new buffers of size 0: the corresponding file
;; does not exist yet, even though buffer-modified-p is nil.
(if (and (not (buffer-modified-p))
(vc-buffer-sync)
(vc-admin
buffer-file-name
- (and override (read-string "Initial version level: ")))
+ (and override
+ (read-string
+ (format "Initial version level for %s: " buffer-file-name))))
)
(defun vc-resynch-window (file &optional keep noquery)
(delete-window)
(kill-buffer (current-buffer))))))
-
-(defun vc-admin (file rev)
+(defun vc-start-entry (file rev comment msg action &optional after-hook)
+ ;; Accept a comment for an operation on FILE revision REV. If COMMENT
+ ;; is nil, pop up a VC-log buffer, emit MSG, and set the
+ ;; action on close to ACTION; otherwise, do action immediately.
+ ;; Remember the file's buffer in vc-parent-buffer (current one if no file).
+ ;; AFTER-HOOK specifies the local value for vc-log-operation-hook.
+ (let ((parent (if file (find-file-noselect file) (current-buffer))))
+ (if comment
+ (set-buffer (get-buffer-create "*VC-log*"))
+ (pop-to-buffer (get-buffer-create "*VC-log*")))
+ (set (make-local-variable 'vc-parent-buffer) parent)
+ (set (make-local-variable 'vc-parent-buffer-name)
+ (concat " from " (buffer-name vc-parent-buffer)))
+ (vc-mode-line (or file " (no file)"))
+ (vc-log-mode)
+ (make-local-variable 'vc-log-after-operation-hook)
+ (if after-hook
+ (setq vc-log-after-operation-hook after-hook))
+ (setq vc-log-operation action)
+ (setq vc-log-file file)
+ (setq vc-log-version rev)
+ (if comment
+ (progn
+ (erase-buffer)
+ (if (eq comment t)
+ (vc-finish-logentry t)
+ (insert comment)
+ (vc-finish-logentry nil)))
+ (message "%s Type C-c C-c when done." msg))))
+
+(defun vc-admin (file rev &optional comment)
"Check a file into your version-control system.
FILE is the unmodified name of the file. REV should be the base version
-level to check it in under."
- (if vc-initial-comment
- (let ((camefrom (current-buffer)))
- (pop-to-buffer (get-buffer-create "*VC-log*"))
- (make-local-variable 'vc-parent-buffer)
- (setq vc-parent-buffer camefrom)
- (vc-log-mode)
- (narrow-to-region (point-max) (point-max))
- (vc-mode-line file (file-name-nondirectory file))
- (setq vc-log-operation 'vc-backend-admin)
- (setq vc-log-file file)
- (setq vc-log-version rev)
- (message "Enter initial comment. Type C-c C-c when done."))
- (progn
- (vc-backend-admin file rev)
- ;; Inhibit query here, since otherwise we always get asked.
- (vc-resynch-window file vc-keep-workfiles t))))
-
-(defun vc-steal-lock (file rev &optional owner)
- "Steal the lock on the current workfile."
- (interactive)
- (if (not owner)
- (setq owner (vc-locking-user file)))
- (if (not (y-or-n-p (format "Take the lock on %s:%s from %s?" file rev owner)))
- (error "Steal cancelled."))
- (require 'sendmail)
- (pop-to-buffer (get-buffer-create "*VC-mail*"))
- (setq default-directory (expand-file-name "~/"))
- (auto-save-mode auto-save-default)
- (mail-mode)
- (erase-buffer)
- (mail-setup owner (format "%s:%s" file rev) nil nil nil
- (list (list 'vc-finish-steal file rev)))
- (goto-char (point-max))
- (insert
- (format "I stole the lock on %s:%s, " file rev)
- (current-time-string)
- ".\n")
- (message "Please explain why you stole the lock. Type C-c C-c when done."))
-
-;; This is called when the notification has been sent.
-(defun vc-finish-steal (file version)
- (vc-backend-steal file version)
- (vc-resynch-window file t t))
+level to check it in under. COMMENT, if specified, is the checkin comment."
+ (vc-start-entry file rev
+ (or comment (not vc-initial-comment))
+ "Enter initial comment." 'vc-backend-admin
+ nil))
-(defun vc-checkout (file &optional writeable)
+(defun vc-checkout (file &optional writable)
"Retrieve a copy of the latest version of the given file."
;; If ftp is on this system and the name matches the ange-ftp format
;; for a remote file, the user is trying something that won't work.
(if (and (string-match "^/[^/:]+:" file) (vc-find-binary "ftp"))
(error "Sorry, you can't check out files over FTP"))
- (vc-backend-checkout file writeable)
+ (vc-backend-checkout file writable)
(if (string-equal file buffer-file-name)
(vc-resynch-window file t t))
)
+(defun vc-steal-lock (file rev &optional owner)
+ "Steal the lock on the current workfile."
+ (let (file-description)
+ (if (not owner)
+ (setq owner (vc-locking-user file)))
+ (if rev
+ (setq file-description (format "%s:%s" file rev))
+ (setq file-description file))
+ (if (not (y-or-n-p (format "Take the lock on %s from %s? "
+ file-description owner)))
+ (error "Steal cancelled"))
+ (pop-to-buffer (get-buffer-create "*VC-mail*"))
+ (setq default-directory (expand-file-name "~/"))
+ (auto-save-mode auto-save-default)
+ (mail-mode)
+ (erase-buffer)
+ (mail-setup owner (format "Stolen lock on %s" file-description) nil nil nil
+ (list (list 'vc-finish-steal file rev)))
+ (goto-char (point-max))
+ (insert
+ (format "I stole the lock on %s, " file-description)
+ (current-time-string)
+ ".\n")
+ (message "Please explain why you stole the lock. Type C-c C-c when done.")))
+
+;; This is called when the notification has been sent.
+(defun vc-finish-steal (file version)
+ (vc-backend-steal file version)
+ (if (get-file-buffer file)
+ (save-excursion
+ (set-buffer (get-file-buffer file))
+ (vc-resynch-window file t t))))
+
(defun vc-checkin (file &optional rev comment)
"Check in the file specified by FILE.
The optional argument REV may be a string specifying the new version level
\(if nil increment the current level). The file is either retained with write
-permissions zeroed, or deleted (according to the value of vc-keep-workfiles).
+permissions zeroed, or deleted (according to the value of `vc-keep-workfiles').
COMMENT is a comment string; if omitted, a buffer is
popped up to accept a comment."
- (let ((camefrom (current-buffer)))
- (pop-to-buffer (get-buffer-create "*VC-log*"))
- (make-local-variable 'vc-parent-buffer)
- (setq vc-parent-buffer camefrom))
- (vc-log-mode)
- (narrow-to-region (point-max) (point-max))
- (vc-mode-line file (file-name-nondirectory file))
- (setq vc-log-operation 'vc-backend-checkin
- vc-log-file file
- vc-log-version rev
- vc-log-after-operation-hook 'vc-checkin-hook)
- (message "Enter log message. Type C-c C-c when done.")
- (if comment
- (progn
- (insert comment)
- (vc-finish-logentry))))
+ (vc-start-entry file rev comment
+ "Enter a change comment." 'vc-backend-checkin
+ 'vc-checkin-hook))
;;; Here is a checkin hook that may prove useful to sites using the
;;; ChangeLog facility supported by Emacs.
-(defun vc-comment-to-changelog ()
- (let ((log (find-change-log)))
- (if log
- (let ((default-directory (or (file-name-directory log)
- default-directory)))
- (vc-update-change-log
- (file-relative-name buffer-file-name))))))
-
-(defun vc-finish-logentry ()
+(defun vc-comment-to-change-log (&optional whoami file-name)
+ "Enter last VC comment into change log file for current buffer's file.
+Optional arg (interactive prefix) non-nil means prompt for user name and site.
+Second arg is file name of change log. \
+If nil, uses `change-log-default-name'."
+ (interactive (if current-prefix-arg
+ (list current-prefix-arg
+ (prompt-for-change-log-name))))
+ ;; Make sure the defvar for add-log-current-defun-function has been executed
+ ;; before binding it.
+ (require 'add-log)
+ (let (;; Extract the comment first so we get any error before doing anything.
+ (comment (ring-ref vc-comment-ring 0))
+ ;; Don't let add-change-log-entry insert a defun name.
+ (add-log-current-defun-function 'ignore)
+ end)
+ ;; Call add-log to do half the work.
+ (add-change-log-entry whoami file-name t t)
+ ;; Insert the VC comment, leaving point before it.
+ (setq end (save-excursion (insert comment) (point-marker)))
+ (if (looking-at "\\s *\\s(")
+ ;; It starts with an open-paren, as in "(foo): Frobbed."
+ ;; So remove the ": " add-log inserted.
+ (delete-char -2))
+ ;; Canonicalize the white space between the file name and comment.
+ (just-one-space)
+ ;; Indent rest of the text the same way add-log indented the first line.
+ (let ((indentation (current-indentation)))
+ (save-excursion
+ (while (< (point) end)
+ (forward-line 1)
+ (indent-to indentation))
+ (setq end (point))))
+ ;; Fill the inserted text, preserving open-parens at bol.
+ (let ((paragraph-separate (concat paragraph-separate "\\|^\\s *\\s("))
+ (paragraph-start (concat paragraph-start "\\|^\\s *\\s(")))
+ (beginning-of-line)
+ (fill-region (point) end))
+ ;; Canonicalize the white space at the end of the entry so it is
+ ;; separated from the next entry by a single blank line.
+ (skip-syntax-forward " " end)
+ (delete-char (- (skip-syntax-backward " ")))
+ (or (eobp) (looking-at "\n\n")
+ (insert "\n"))))
+
+
+(defun vc-finish-logentry (&optional nocomment)
"Complete the operation implied by the current log entry."
(interactive)
- (goto-char (point-max))
- (if (not (bolp)) (newline))
- ;; Append the contents of the log buffer to the comment ring
+ ;; 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
+ (if (null vc-comment-ring)
+ (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size)))
+ (ring-insert vc-comment-ring (buffer-string))
+ ))
+ ;; Sync parent buffer in case the user modified it while editing the comment.
+ ;; But not if it is a vc-dired buffer.
(save-excursion
- (set-buffer (get-buffer-create "*VC-comment-ring*"))
- (goto-char (point-max))
- (set-mark (point))
- (insert-buffer-substring "*VC-log*")
- (if (and (not (bobp)) (not (= (char-after (1- (point))) ?\f)))
- (insert-char ?\f 1))
- (if (not (bobp))
- (forward-char -1))
- (exchange-point-and-mark)
- ;; Check for errors
- (vc-backend-logentry-check vc-log-file)
- )
+ (set-buffer vc-parent-buffer)
+ (or vc-dired-mode
+ (vc-buffer-sync)))
;; OK, do it to it
(if vc-log-operation
- (funcall vc-log-operation
- vc-log-file
- vc-log-version
- (buffer-string))
- (error "No log operation is pending."))
- ;; Return to "parent" buffer of this checkin and remove checkin window
- (pop-to-buffer (get-file-buffer vc-log-file))
- (delete-window (get-buffer-window "*VC-log*"))
- (bury-buffer "*VC-log*")
- (bury-buffer "*VC-comment-ring*")
- ;; Now make sure we see the expanded headers
- (vc-resynch-window buffer-file-name vc-keep-workfiles t)
- (run-hooks vc-log-after-operation-hook)
- )
+ (save-excursion
+ (funcall vc-log-operation
+ vc-log-file
+ vc-log-version
+ (buffer-string)))
+ (error "No log operation is pending"))
+ ;; save the vc-log-after-operation-hook of log buffer
+ (let ((after-hook vc-log-after-operation-hook))
+ ;; Return to "parent" buffer of this checkin and remove checkin window
+ (pop-to-buffer vc-parent-buffer)
+ (let ((logbuf (get-buffer "*VC-log*")))
+ (delete-windows-on logbuf)
+ (kill-buffer logbuf))
+ ;; Now make sure we see the expanded headers
+ (if buffer-file-name
+ (vc-resynch-window buffer-file-name vc-keep-workfiles t))
+ (run-hooks after-hook)))
;; Code for access to the comment ring
-(defun vc-next-comment ()
- "Fill the log buffer with the next message in the msg ring."
- (interactive)
- (erase-buffer)
- (save-excursion
- (set-buffer "*VC-comment-ring*")
- (forward-page)
- (if (= (point) (point-max))
- (goto-char (point-min)))
- (mark-page)
- (append-to-buffer "*VC-log*" (point) (1- (mark)))
- ))
-
-(defun vc-previous-comment ()
- "Fill the log buffer with the previous message in the msg ring."
- (interactive)
- (erase-buffer)
- (save-excursion
- (set-buffer "*VC-comment-ring*")
- (if (= (point) (point-min))
- (goto-char (point-max)))
- (backward-page)
- (mark-page)
- (append-to-buffer "*VC-log*" (point) (1- (mark)))
- ))
-
-(defun vc-comment-search-backward (regexp)
- "Fill the log buffer with the last message in the msg ring matching REGEXP."
- (interactive "sSearch backward for: ")
- (erase-buffer)
- (save-excursion
- (set-buffer "*VC-comment-ring*")
- (if (= (point) (point-min))
- (goto-char (point-max)))
- (re-search-backward regexp nil t)
- (mark-page)
- (append-to-buffer "*VC-log*" (point) (1- (mark)))
- ))
-
-(defun vc-comment-search-forward (regexp)
- "Fill the log buffer with the next message in the msg ring matching REGEXP."
- (interactive "sSearch forward for: ")
- (erase-buffer)
- (save-excursion
- (set-buffer "*VC-comment-ring*")
- (if (= (point) (point-max))
- (goto-char (point-min)))
- (re-search-forward regexp nil t)
- (mark-page)
- (append-to-buffer "*VC-log*" (point) (1- (mark)))
- ))
+(defun vc-previous-comment (arg)
+ "Cycle backwards through comment history."
+ (interactive "*p")
+ (let ((len (ring-length vc-comment-ring)))
+ (cond ((<= len 0)
+ (message "Empty comment ring")
+ (ding))
+ (t
+ (erase-buffer)
+ ;; Initialize the index on the first use of this command
+ ;; so that the first M-p gets index 0, and the first M-n gets
+ ;; index -1.
+ (if (null vc-comment-ring-index)
+ (setq vc-comment-ring-index
+ (if (> arg 0) -1
+ (if (< arg 0) 1 0))))
+ (setq vc-comment-ring-index
+ (mod (+ vc-comment-ring-index arg) len))
+ (message "%d" (1+ vc-comment-ring-index))
+ (insert (ring-ref vc-comment-ring vc-comment-ring-index))))))
+
+(defun vc-next-comment (arg)
+ "Cycle forwards through comment history."
+ (interactive "*p")
+ (vc-previous-comment (- arg)))
+
+(defun vc-comment-search-reverse (str)
+ "Searches backwards through comment history for substring match."
+ (interactive "sComment substring: ")
+ (if (string= str "")
+ (setq str vc-last-comment-match)
+ (setq vc-last-comment-match str))
+ (if (null vc-comment-ring-index)
+ (setq vc-comment-ring-index -1))
+ (let ((str (regexp-quote str))
+ (len (ring-length vc-comment-ring))
+ (n (1+ vc-comment-ring-index)))
+ (while (and (< n len) (not (string-match str (ring-ref vc-comment-ring n))))
+ (setq n (+ n 1)))
+ (cond ((< n len)
+ (vc-previous-comment (- n vc-comment-ring-index)))
+ (t (error "Not found")))))
+
+(defun vc-comment-search-forward (str)
+ "Searches forwards through comment history for substring match."
+ (interactive "sComment substring: ")
+ (if (string= str "")
+ (setq str vc-last-comment-match)
+ (setq vc-last-comment-match str))
+ (if (null vc-comment-ring-index)
+ (setq vc-comment-ring-index 0))
+ (let ((str (regexp-quote str))
+ (len (ring-length vc-comment-ring))
+ (n vc-comment-ring-index))
+ (while (and (>= n 0) (not (string-match str (ring-ref vc-comment-ring n))))
+ (setq n (- n 1)))
+ (cond ((>= n 0)
+ (vc-next-comment (- n vc-comment-ring-index)))
+ (t (error "Not found")))))
;; Additional entry points for examining version histories
;;;###autoload
-(defun vc-diff (historic)
- "Display diffs between file versions."
+(defun vc-diff (historic &optional not-urgent)
+ "Display diffs between file versions.
+Normally this compares the current file and buffer with the most recent
+checked in version of that file. This uses no arguments.
+With a prefix argument, it reads the file name to use
+and two version designators specifying which versions to compare."
(interactive "P")
+ (if vc-dired-mode
+ (set-buffer (find-file-noselect (dired-get-filename))))
(while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
(if historic
(call-interactively 'vc-version-diff)
+ (if (or (null buffer-file-name) (null (vc-name buffer-file-name)))
+ (error
+ "There is no version-control master associated with this buffer"))
(let ((file buffer-file-name)
unchanged)
- (vc-buffer-sync)
+ (or (and file (vc-name file))
+ (vc-registration-error file))
+ (vc-buffer-sync not-urgent)
(setq unchanged (vc-workfile-unchanged-p buffer-file-name))
(if unchanged
(message "No changes to %s since latest version." file)
+ (vc-backend-diff file)
+ ;; Ideally, we'd like at this point to parse the diff so that
+ ;; the buffer effectively goes into compilation mode and we
+ ;; can visit the old and new change locations via next-error.
+ ;; Unfortunately, this is just too painful to do. The basic
+ ;; problem is that the `old' file doesn't exist to be
+ ;; visited. This plays hell with numerous assumptions in
+ ;; the diff.el and compile.el machinery.
(pop-to-buffer "*vc*")
- (vc-backend-diff file nil)
- (vc-shrink-to-fit)
- (goto-char (point-min))
- )
- (not unchanged)
- )
- )
- )
+ (pop-to-buffer "*vc*")
+ (if (= 0 (buffer-size))
+ (progn
+ (setq unchanged t)
+ (message "No changes to %s since latest version." file))
+ (goto-char (point-min))
+ (shrink-window-if-larger-than-buffer)))
+ (not unchanged))))
(defun vc-version-diff (file rel1 rel2)
"For FILE, report diffs between two stored versions REL1 and REL2 of it.
(if (file-directory-p file)
(let ((camefrom (current-buffer)))
(set-buffer (get-buffer-create "*vc-status*"))
- (make-local-variable 'vc-parent-buffer)
- (setq vc-parent-buffer camefrom)
+ (set (make-local-variable 'vc-parent-buffer) camefrom)
+ (set (make-local-variable 'vc-parent-buffer-name)
+ (concat " from " (buffer-name camefrom)))
(erase-buffer)
(insert "Diffs between "
(or rel1 "last version checked in")
(or rel2 "current workfile(s)")
":\n\n")
(set-buffer (get-buffer-create "*vc*"))
+ (cd file)
(vc-file-tree-walk
(function (lambda (f)
(message "Looking at %s" f)
(goto-char (point-min))
(set-buffer-modified-p nil)
)
- (progn
- (vc-backend-diff file rel1 rel2)
- (goto-char (point-min))
- (if (equal (point-min) (point-max))
- (message "No changes to %s between %s and %s." file rel1 rel2)
- (pop-to-buffer "*vc*")
- (goto-char (point-min))
- )
- )
- )
- )
+ (if (zerop (vc-backend-diff file rel1 rel2))
+ (message "No changes to %s between %s and %s." file rel1 rel2)
+ (pop-to-buffer "*vc*"))))
+
+;;;###autoload
+(defun vc-version-other-window (rev)
+ "Visit version REV of the current buffer in another window.
+If the current buffer is named `F', the version is named `F.~REV~'.
+If `F.~REV~' already exists, it is used instead of being re-created."
+ (interactive "sVersion to visit (default is latest version): ")
+ (if vc-dired-mode
+ (set-buffer (find-file-noselect (dired-get-filename))))
+ (while vc-parent-buffer
+ (pop-to-buffer vc-parent-buffer))
+ (if (and buffer-file-name (vc-name buffer-file-name))
+ (let* ((version (if (string-equal rev "")
+ (vc-latest-version buffer-file-name)
+ rev))
+ (filename (concat buffer-file-name ".~" version "~")))
+ (or (file-exists-p filename)
+ (vc-backend-checkout buffer-file-name nil version filename))
+ (find-file-other-window filename))
+ (vc-registration-error buffer-file-name)))
;; Header-insertion code
(defun vc-insert-headers ()
"Insert headers in a file for use with your version-control system.
Headers desired are inserted at the start of the buffer, and are pulled from
-the variable vc-header-alist"
+the variable `vc-header-alist'."
(interactive)
+ (if vc-dired-mode
+ (find-file-other-window (dired-get-filename)))
(while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
(save-excursion
(save-restriction
(widen)
(if (or (not (vc-check-headers))
- (y-or-n-p "Version headers already exist. Insert another set?"))
+ (y-or-n-p "Version headers already exist. Insert another set? "))
(progn
(let* ((delims (cdr (assq major-mode vc-comment-alist)))
(comment-start-vc (or (car delims) comment-start "#"))
)
)))))
-;; Status-checking functions
+;; The VC directory submode. Coopt Dired for this.
+;; All VC commands get mapped into logical equivalents.
+
+(defvar vc-dired-prefix-map (make-sparse-keymap))
+(define-key vc-dired-prefix-map "\C-xv" vc-prefix-map)
+
+(or (not (boundp 'minor-mode-map-alist))
+ (assq 'vc-dired-mode minor-mode-map-alist)
+ (setq minor-mode-map-alist
+ (cons (cons 'vc-dired-mode vc-dired-prefix-map)
+ minor-mode-map-alist)))
+
+(defun vc-dired-mode ()
+ "The augmented Dired minor mode used in VC directory buffers.
+All Dired commands operate normally. Users currently locking listed files
+are listed in place of the file's owner and group.
+Keystrokes bound to VC commands will execute as though they had been called
+on a buffer attached to the file named in the current Dired buffer line."
+ (setq vc-dired-mode t)
+ (setq vc-mode " under VC"))
+
+(defun vc-dired-reformat-line (x)
+ ;; Hack a directory-listing line, plugging in locking-user info in
+ ;; place of the user and group info. Should have the beneficial
+ ;; side-effect of shortening the listing line. Each call starts with
+ ;; point immediately following the dired mark area on the line to be
+ ;; hacked.
+ ;;
+ ;; Simplest possible one:
+ ;; (insert (concat x "\t")))
+ ;;
+ ;; This code, like dired, assumes UNIX -l format.
+ (forward-word 1) ;; skip over any extra field due to -ibs options
+ (if x (setq x (concat "(" x ")")))
+ (if (re-search-forward "\\([0-9]+ \\).................\\( .*\\)" nil 0)
+ (let ((rep (substring (concat x " ") 0 9)))
+ (replace-match (concat "\\1" rep "\\2") t)))
+ )
+;;; Note in Emacs 18 the following defun gets overridden
+;;; with the symbol 'vc-directory-18. See below.
;;;###autoload
(defun vc-directory (verbose)
"Show version-control status of all files under the current directory."
(interactive "P")
- (let (nonempty)
+ (let (nonempty
+ (dl (length default-directory))
+ (filelist nil) (userlist nil)
+ dired-buf
+ dired-buf-mod-count)
+ (vc-file-tree-walk
+ (function (lambda (f)
+ (if (vc-registered f)
+ (let ((user (vc-locking-user f)))
+ (and (or verbose user)
+ (setq filelist (cons (substring f dl) filelist))
+ (setq userlist (cons user userlist))))))))
+ (save-excursion
+ ;; This uses a semi-documented feature of dired; giving a switch
+ ;; argument forces the buffer to refresh each time.
+ (dired
+ (cons default-directory (nreverse filelist))
+ dired-listing-switches)
+ (setq dired-buf (current-buffer))
+ (setq nonempty (not (zerop (buffer-size)))))
+ (if nonempty
+ (progn
+ (pop-to-buffer dired-buf)
+ (vc-dired-mode)
+ (goto-char (point-min))
+ (setq buffer-read-only nil)
+ (forward-line 1) ;; Skip header line
+ (mapcar
+ (function
+ (lambda (x)
+ (forward-char 2) ;; skip dired's mark area
+ (vc-dired-reformat-line x)
+ (forward-line 1))) ;; go to next line
+ (nreverse userlist))
+ (setq buffer-read-only t)
+ (goto-char (point-min))
+ )
+ (message "No files are currently %s under %s"
+ (if verbose "registered" "locked") default-directory))
+ ))
+
+;; Emacs 18 version
+(defun vc-directory-18 (verbose)
+ "Show version-control status of all files under the current directory."
+ (interactive "P")
+ (let (nonempty (dir default-directory))
(save-excursion
(set-buffer (get-buffer-create "*vc-status*"))
(erase-buffer)
+ (cd dir)
(vc-file-tree-walk
(function (lambda (f)
(if (vc-registered f)
(if nonempty
(progn
(pop-to-buffer "*vc-status*" t)
- (vc-shrink-to-fit)
- (goto-char (point-min)))
+ (goto-char (point-min))
+ (shrink-window-if-larger-than-buffer)))
(message "No files are currently %s under %s"
(if verbose "registered" "locked") default-directory))
- ))
+ )
+
+(or (boundp 'minor-mode-map-alist)
+ (fset 'vc-directory 'vc-directory-18))
+
+; Emacs 18 also lacks these.
+(or (boundp 'compilation-old-error-list)
+ (setq compilation-old-error-list nil))
;; Named-configuration support for SCCS
(save-excursion
(find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file))
(goto-char (point-min))
- (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname))
+ ;; (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname))
+ (while (re-search-forward (concat ":" (regexp-quote file) "$") nil t)
+ (replace-match (concat ":" newname) nil nil))
(basic-save-buffer)
(kill-buffer (current-buffer))
))
(defun vc-lookup-triple (file name)
;; Return the numeric version corresponding to a named snapshot of file
;; If name is nil or a version number string it's just passed through
- (cond ((null name) "")
+ (cond ((null name) name)
((let ((firstchar (aref name 0)))
(and (>= firstchar ?0) (<= firstchar ?9)))
name)
;; Named-configuration entry points
-(defun vc-quiescent-p ()
- ;; Is the current directory ready to be snapshot?
- (catch 'quiet
+(defun vc-locked-example ()
+ ;; Return an example of why the current directory is not ready to be snapshot
+ ;; or nil if no such example exists.
+ (catch 'vc-locked-example
(vc-file-tree-walk
(function (lambda (f)
(if (and (vc-registered f) (vc-locking-user f))
- (throw 'quiet nil)))))
- t))
+ (throw 'vc-locked-example f)))))
+ nil))
;;;###autoload
(defun vc-create-snapshot (name)
directory. For each file, the version level of its latest
version becomes part of the named configuration."
(interactive "sNew snapshot name: ")
- (if (not (vc-quiescent-p))
- (error "Can't make a snapshot, locked files are in the way.")
- (vc-file-tree-walk
- (function (lambda (f) (and
- (vc-name f)
- (vc-backend-assign-name f name)))))
- ))
+ (let ((locked (vc-locked-example)))
+ (if locked
+ (error "File %s is locked" locked)
+ (vc-file-tree-walk
+ (function (lambda (f) (and
+ (vc-name f)
+ (vc-backend-assign-name f name)))))
+ )))
;;;###autoload
(defun vc-retrieve-snapshot (name)
Otherwise, all registered files are checked out (unlocked) at their version
levels in the snapshot."
(interactive "sSnapshot name to retrieve: ")
- (if (not (vc-quiescent-p))
- (error "Can't retrieve a snapshot, locked files are in the way.")
- (vc-file-tree-walk
- (function (lambda (f) (and
- (vc-name f)
- (vc-error-occurred (vc-backend-checkout f nil name))))))
- ))
+ (let ((locked (vc-locked-example)))
+ (if locked
+ (error "File %s is locked" locked)
+ (vc-file-tree-walk
+ (function (lambda (f) (and
+ (vc-name f)
+ (vc-error-occurred
+ (vc-backend-checkout f nil name))))))
+ )))
;; Miscellaneous other entry points
(defun vc-print-log ()
"List the change log of the current buffer in a window."
(interactive)
+ (if vc-dired-mode
+ (set-buffer (find-file-noselect (dired-get-filename))))
(while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
(if (and buffer-file-name (vc-name buffer-file-name))
(progn
(vc-backend-print-log buffer-file-name)
(pop-to-buffer (get-buffer-create "*vc*"))
- (vc-shrink-to-fit)
+ (while (looking-at "=*\n")
+ (delete-char (- (match-end 0) (match-beginning 0)))
+ (forward-line -1))
(goto-char (point-min))
+ (if (looking-at "[\b\t\n\v\f\r ]+")
+ (delete-char (- (match-end 0) (match-beginning 0))))
+ (shrink-window-if-larger-than-buffer)
)
- (error "There is no version-control master associated with this buffer")
+ (vc-registration-error buffer-file-name)
)
)
This asks for confirmation if the buffer contents are not identical
to that version."
(interactive)
+ (if vc-dired-mode
+ (find-file-other-window (dired-get-filename)))
(while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
(let ((file buffer-file-name)
- (obuf (current-buffer)) (changed (vc-diff nil)))
+ (obuf (current-buffer)) (changed (vc-diff nil t)))
(if (and changed (or vc-suppress-confirm
(not (yes-or-no-p "Discard changes? "))))
(progn
(delete-window)
- (error "Revert cancelled."))
+ (error "Revert cancelled"))
(set-buffer obuf))
(if changed
(delete-window))
;;;###autoload
(defun vc-cancel-version (norevert)
- "Undo your latest checkin."
+ "Get rid of most recently checked in version of this file.
+A prefix argument means do not revert the buffer afterwards."
(interactive "P")
+ (if vc-dired-mode
+ (find-file-other-window (dired-get-filename)))
(while vc-parent-buffer
(pop-to-buffer vc-parent-buffer))
(let* ((target (concat (vc-latest-version (buffer-file-name))))
(yours (concat (vc-your-latest-version (buffer-file-name))))
(prompt (if (string-equal yours target)
- "Remove your version %s from master?"
- "Version %s was not your change. Remove it anyway?")))
+ "Remove your version %s from master? "
+ "Version %s was not your change. Remove it anyway? ")))
(if (null (yes-or-no-p (format prompt target)))
nil
(vc-backend-uncheck (buffer-file-name) target)
- (if norevert
+ (if (or norevert
+ (not (yes-or-no-p "Revert buffer to most recent remaining version? ")))
(vc-mode-line (buffer-file-name))
(vc-checkout (buffer-file-name) nil)))
))
+;;;###autoload
(defun vc-rename-file (old new)
- "Rename a file, taking its master files with it."
- (interactive "fOld name: \nFNew name: ")
+ "Rename file OLD to NEW, and rename its master file likewise."
+ (interactive "fVC rename file: \nFRename to: ")
(let ((oldbuf (get-file-buffer old)))
- (if (buffer-modified-p oldbuf)
- (error "Please save files before moving them."))
+ (if (and oldbuf (buffer-modified-p oldbuf))
+ (error "Please save files before moving them"))
(if (get-file-buffer new)
- (error "Already editing new file name."))
+ (error "Already editing new file name"))
+ (if (file-exists-p new)
+ (error "New file already exists"))
(let ((oldmaster (vc-name old)))
(if oldmaster
- (if (vc-locking-user old)
- (error "Please check in files before moving them."))
- (if (or (file-symlink-p oldmaster)
- ;; This had FILE, I changed it to OLD. -- rms.
- (file-symlink-p (vc-backend-subdirectory-name old)))
- (error "This is not a safe thing to do in the presence of symbolic links."))
- (rename-file oldmaster (vc-name new)))
+ (progn
+ (if (vc-locking-user old)
+ (error "Please check in files before moving them"))
+ (if (or (file-symlink-p oldmaster)
+ ;; This had FILE, I changed it to OLD. -- rms.
+ (file-symlink-p (vc-backend-subdirectory-name old)))
+ (error "This is not a safe thing to do in the presence of symbolic links"))
+ (rename-file
+ oldmaster
+ (let ((backend (vc-backend-deduce old))
+ (newdir (or (file-name-directory new) ""))
+ (newbase (file-name-nondirectory new)))
+ (catch 'found
+ (mapcar
+ (function
+ (lambda (s)
+ (if (eq backend (cdr s))
+ (let* ((newmaster (format (car s) newdir newbase))
+ (newmasterdir (file-name-directory newmaster)))
+ (if (or (not newmasterdir)
+ (file-directory-p newmasterdir))
+ (throw 'found newmaster))))))
+ vc-master-templates)
+ (error "New file lacks a version control directory"))))))
(if (or (not oldmaster) (file-exists-p old))
(rename-file old new)))
; ?? Renaming a file might change its contents due to keyword expansion.
The mark is left at the end of the text prepended to the change log.
With prefix arg of C-u, only find log entries for the current buffer's file.
With any numeric prefix arg, find log entries for all files currently visited.
+Otherwise, find log entries for all registered files in the default directory.
From a program, any arguments are passed to the `rcs2log' script."
(interactive
(cond ((consp current-prefix-arg) ;C-u
(while buffers
(setq file (buffer-file-name (car buffers)))
(and file (vc-backend-deduce file)
- (setq files (cons (file-relative-name file) files)))
+ (setq files (cons file files)))
(setq buffers (cdr buffers)))
- files))))
- (find-file-other-window "ChangeLog")
- (barf-if-buffer-read-only)
- (vc-buffer-sync)
- (undo-boundary)
- (goto-char (point-min))
- (push-mark)
- (message "Computing change log entries...")
- (message "Computing change log entries... %s"
- (if (eq 0 (apply 'call-process "rcs2log" nil t nil args))
- "done" "failed")))
+ files))
+ (t
+ (let ((RCS (concat default-directory "RCS")))
+ (and (file-directory-p RCS)
+ (mapcar (function
+ (lambda (f)
+ (if (string-match "\\(.*\\),v$" f)
+ (substring f 0 (match-end 1))
+ f)))
+ (directory-files RCS nil "...\\|^[^.]\\|^.[^.]")))))))
+ (let ((odefault default-directory))
+ (find-file-other-window (find-change-log))
+ (barf-if-buffer-read-only)
+ (vc-buffer-sync)
+ (undo-boundary)
+ (goto-char (point-min))
+ (push-mark)
+ (message "Computing change log entries...")
+ (message "Computing change log entries... %s"
+ (if (or (null args)
+ (eq 0 (apply 'call-process "rcs2log" nil t nil
+ "-n"
+ (user-login-name)
+ (user-full-name)
+ user-mail-address
+ (mapcar (function
+ (lambda (f)
+ (file-relative-name
+ (if (file-name-absolute-p f)
+ f
+ (concat odefault f)))))
+ args))))
+ "done" "failed"))))
;; Functions for querying the master and lock files.
-(defun match-substring (bn)
+(defun vc-match-substring (bn)
(buffer-substring (match-beginning bn) (match-end bn)))
(defun vc-parse-buffer (patterns &optional file properties)
(if (string-match "\\\\(.*\\\\(" p)
(let ((latest-date "") (latest-val))
(while (re-search-forward p nil t)
- (let ((date (match-substring 2)))
+ (let ((date (vc-match-substring 2)))
(if (string< latest-date date)
(progn
(setq latest-date date)
(setq latest-val
- (match-substring 1))))))
+ (vc-match-substring 1))))))
latest-val))
(prog1
- (and (re-search-forward p nil t)
- (let ((value (match-substring 1)))
- (if file
- (vc-file-setprop file (car properties) value))
- value))
+ (let ((value nil))
+ (if (re-search-forward p nil t)
+ (setq value (vc-match-substring 1)))
+ (if file
+ (vc-file-setprop file (car properties) value))
+ value)
(setq properties (cdr properties)))))
patterns)
)
(defun vc-locking-user (file)
"Return the name of the person currently holding a lock on FILE.
Return nil if there is no such person."
+ (setq file (expand-file-name file)) ;; ??? Work around bug in 19.0.4
(if (or (not vc-keep-workfiles)
(eq vc-mistrust-permissions 't)
(and vc-mistrust-permissions
;; control and has -rw-r--r-- is locked by its owner. This is true
;; for both RCS and SCCS, which keep unlocked files at -r--r--r--.
;; We have to be careful not to exclude files with execute bits on;
- ;; scripts can be under version control too. The advantage of this
- ;; hack is that calls to the very expensive vc-fetch-properties
+ ;; scripts can be under version control too. Also, we must ignore
+ ;; the group-read and other-read bits, since paranoid users turn them off.
+ ;; This hack wins because calls to the very expensive vc-fetch-properties
;; function only have to be made if (a) the file is locked by someone
;; other than the current user, or (b) some untoward manipulation
- ;; behind vc's back has twiddled the `group' or `other' write bits.
+ ;; behind vc's back has changed the owner or the `group' or `other'
+ ;; write bits.
(let ((attributes (file-attributes file)))
- (cond ((string-match ".r-.r-.r-." (nth 8 attributes))
+ (cond ((string-match ".r-..-..-." (nth 8 attributes))
nil)
((and (= (nth 2 attributes) (user-uid))
- (string-match ".rw.r-.r-." (nth 8 attributes)))
+ (string-match ".rw..-..-." (nth 8 attributes)))
(user-login-name))
(t
(vc-true-locking-user file))))))
(message "Registering %s...done" file)
)
-(defun vc-backend-checkout (file &optional writeable rev)
+(defun vc-backend-checkout (file &optional writable rev workfile)
;; Retrieve a copy of a saved version into a workfile
- (message "Checking out %s..." file)
- (vc-backend-dispatch file
- (progn
- (vc-do-command 0 "get" file ;; SCCS
- (if writeable "-e")
- (and rev (concat "-r" (vc-lookup-triple file rev))))
+ (let ((filename (or workfile file)))
+ (message "Checking out %s..." filename)
+ (vc-backend-dispatch file
+ (if workfile ;; SCCS
+ ;; Some SCCS implementations allow checking out directly to a
+ ;; file using the -G option, but then some don't so use the
+ ;; least common denominator approach and use the -p option
+ ;; ala RCS.
+ (let ((vc-modes (logior (file-modes (vc-name file))
+ (if writable 128 0)))
+ (failed t))
+ (unwind-protect
+ (progn
+ (vc-do-command
+ 0 "/bin/sh" file "-c"
+ ;; Some shells make the "" dummy argument into $0
+ ;; while others use the shell's name as $0 and
+ ;; use the "" as $1. The if-statement
+ ;; converts the latter case to the former.
+ (format "if [ x\"$1\" = x ]; then shift; fi; \
+ umask %o; exec >\"$1\" || exit; \
+ shift; umask %o; exec get \"$@\""
+ (logand 511 (lognot vc-modes))
+ (logand 511 (lognot (default-file-modes))))
+ "" ; dummy argument for shell's $0
+ filename
+ (if writable "-e")
+ "-p" (and rev (concat "-r" (vc-lookup-triple file rev))))
+ (setq failed nil))
+ (and failed (file-exists-p filename) (delete-file filename))))
+ (vc-do-command 0 "get" file ;; SCCS
+ (if writable "-e")
+ (and rev (concat "-r" (vc-lookup-triple file rev)))))
+ (if workfile ;; RCS
+ ;; RCS doesn't let us check out into arbitrary file names directly.
+ ;; Use `co -p' and make stdout point to the correct file.
+ (let ((vc-modes (logior (file-modes (vc-name file))
+ (if writable 128 0)))
+ (failed t))
+ (unwind-protect
+ (progn
+ (vc-do-command
+ 0 "/bin/sh" file "-c"
+ ;; See the SCCS case, above, regarding the if-statement.
+ (format "if [ x\"$1\" = x ]; then shift; fi; \
+ umask %o; exec >\"$1\" || exit; \
+ shift; umask %o; exec co \"$@\""
+ (logand 511 (lognot vc-modes))
+ (logand 511 (lognot (default-file-modes))))
+ "" ; dummy argument for shell's $0
+ filename
+ (if writable "-l")
+ (concat "-p" rev))
+ (setq failed nil))
+ (and failed (file-exists-p filename) (delete-file filename))))
+ (vc-do-command 0 "co" file
+ (if writable "-l")
+ (and rev (concat "-r" rev))))
)
- (vc-do-command 0 "co" file ;; RCS
- (if writeable "-l")
- (and rev (concat "-r" rev)))
- )
- (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file)))
- (message "Checking out %s...done" file)
+ (or workfile
+ (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file))))
+ (message "Checking out %s...done" filename))
)
(defun vc-backend-logentry-check (file)
(vc-backend-dispatch file
- (if (>= (- (region-end) (region-beginning)) 512) ;; SCCS
+ (if (>= (buffer-size) 512) ;; SCCS
(progn
(goto-char 512)
(error
- "Log must be less than 512 characters. Point is now at char 512.")))
+ "Log must be less than 512 characters; point is now at pos 512")))
nil)
)
(progn ;; SCCS
(vc-do-command 0 "unget" file nil)
(vc-do-command 0 "get" file nil))
- (progn
- (delete-file file) ;; RCS
- (vc-do-command 0 "co" file "-u")))
+ (vc-do-command 0 "co" file "-f" "-u")) ;; RCS. This deletes the work file.
(vc-file-setprop file 'vc-locking-user nil)
(message "Reverting %s...done" file)
)
(defun vc-backend-steal (file &optional rev)
;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M.
(message "Stealing lock on %s..." file)
- (progn
- (vc-do-command 0 "unget" file "-n" (if rev (concat "-r" rev)))
- (vc-do-command 0 "get" file "-g" (if rev (concat "-r" rev)))
- )
- (progn
- (vc-do-command 0 "rcs" "-M" (concat "-u" rev) file)
- (delete-file file)
- (vc-do-command 0 "rcs" (concat "-l" rev) file)
- )
+ (vc-backend-dispatch file
+ (progn
+ (vc-do-command 0 "unget" file "-n" (if rev (concat "-r" rev)))
+ (vc-do-command 0 "get" file "-g" (if rev (concat "-r" rev)))
+ )
+ (vc-do-command 0 "rcs" file "-M" (concat "-u" rev) (concat "-l" rev)))
(vc-file-setprop file 'vc-locking-user (user-login-name))
(message "Stealing lock on %s...done" file)
)
)
)
-(defun vc-backend-diff (file oldvers &optional newvers)
- ;; Get a difference report between two versions
+(defun vc-backend-diff (file &optional oldvers newvers cmp)
+ ;; Get a difference report between two versions of FILE.
+ ;; Get only a brief comparison report if CMP, a difference report otherwise.
(if (eq (vc-backend-deduce file) 'SCCS)
(setq oldvers (vc-lookup-triple file oldvers))
(setq newvers (vc-lookup-triple file newvers)))
- (apply 'vc-do-command 1
- (or (vc-backend-dispatch file "vcdiff" "rcsdiff")
- (error "File %s is not under version control." file))
- file
- (and oldvers (concat "-r" oldvers))
- (and newvers (concat "-r" newvers))
- vc-diff-options
- ))
+ (let* ((command (or (vc-backend-dispatch file "vcdiff" "rcsdiff")
+ (vc-registration-error file)))
+ (options (append (list (and cmp "--brief")
+ "-q"
+ (and oldvers (concat "-r" oldvers))
+ (and newvers (concat "-r" newvers)))
+ (and (not cmp)
+ (if (listp diff-switches)
+ diff-switches
+ (list diff-switches)))))
+ (status (apply 'vc-do-command 2 command file options)))
+ ;; Some RCS versions don't understand "--brief"; work around this.
+ (if (eq status 2)
+ (apply 'vc-do-command 1 command file (if cmp (cdr options) options))
+ status)))
(defun vc-check-headers ()
"Check if the current file has any headers in it."
\\[vc-revert-buffer] revert buffer to latest version
\\[vc-cancel-version] undo latest checkin
\\[vc-diff] show diffs between file versions
+\\[vc-version-other-window] visit old version in another window
\\[vc-directory] show all files locked by any user in or below .
\\[vc-update-change-log] add change log entry from recent checkins
\\[vc-next-comment] replace region with next message in comment ring
\\[vc-previous-comment] replace region with previous message in comment ring
-\\[vc-search-comment-reverse] search backward for regexp in the comment ring
-\\[vc-search-comment-forward] search backward for regexp in the comment ring
+\\[vc-comment-search-reverse] search backward for regexp in the comment ring
+\\[vc-comment-search-forward] search backward for regexp in the comment ring
Entry to the change-log submode calls the value of text-mode-hook, then
the value of vc-log-mode-hook.
vc-suppress-confirm Suppresses some confirmation prompts,
notably for reversions.
- vc-diff-options A list consisting of the flags
- to be used for generating context diffs.
-
vc-header-alist Which keywords to insert when adding headers
with \\[vc-insert-headers]. Defaults to
'(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS.
(setq mode-name "VC-Log")
(make-local-variable 'vc-log-file)
(make-local-variable 'vc-log-version)
+ (make-local-variable 'vc-comment-ring-index)
(set-buffer-modified-p nil)
(setq buffer-file-name nil)
(run-hooks 'text-mode-hook 'vc-log-mode-hook)
(setq vc-log-entry-mode (make-sparse-keymap))
(define-key vc-log-entry-mode "\M-n" 'vc-next-comment)
(define-key vc-log-entry-mode "\M-p" 'vc-previous-comment)
- (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-backward)
+ (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse)
(define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward)
(define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry)
)
;;; These things should probably be generally available
-(defun vc-shrink-to-fit ()
- "Shrink a window vertically until it's just large enough to contain its text"
- (let ((minsize (1+ (count-lines (point-min) (point-max)))))
- (if (< minsize (window-height))
- (let ((window-min-height 2))
- (shrink-window (- (window-height) minsize))))))
-
(defun vc-file-tree-walk (func &rest args)
- "Walk recursively through default directory,
-invoking FUNC f ARGS on all non-directory files f underneath it."
+ "Walk recursively through default directory.
+Invoke FUNC f ARGS on each non-directory file f underneath it."
(vc-file-tree-walk-internal default-directory func args)
(message "Traversing directory %s...done" default-directory))
;;;
;;; Window W:
;;; Between vc-locking-user and the following steal-lock (apparent
-;;; state E). This window may never cloce if the user fails to complete
+;;; state E). This window may never close if the user fails to complete
;;; the steal-lock message. Includes window X.
;;;
;;; Window X:
HCoop / bpt / emacs.git / blobdiff