1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
emacs/lisp/vc-mcvs.el

605 lines
22 KiB
EmacsLisp
Raw Normal View History

2003-04-20 00:02:37 +00:00
;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
2007-01-21 03:53:13 +00:00
;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
2003-04-20 00:02:37 +00:00
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
;; 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
2007-07-25 04:50:21 +00:00
;; the Free Software Foundation; either version 3, or (at your option)
2003-04-20 00:02:37 +00:00
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
2005-07-04 23:32:44 +00:00
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
2003-04-20 00:02:37 +00:00
;;; Commentary:
2003-05-02 18:31:55 +00:00
;; The home page of the Meta-CVS version control system is at
;;
2003-05-02 18:31:55 +00:00
;; http://users.footprints.net/~kaz/mcvs.html
;;
2003-04-20 00:02:37 +00:00
;; This is derived from vc-cvs.el as follows:
;; - cp vc-cvs.el vc-mcvs.el
;; - Replace CVS/ with MCVS/CVS/
;; - Replace 'CVS with 'MCVS
;; - Replace -cvs- with -mcvs-
;; - Replace most of the rest of CVS to Meta-CVS
;;
;; Then of course started the hacking. Only a small part of the code
;; has been touched and not much more than that was tested, so if
;; you bump into a bug, don't be surprised: just report it to me.
;;
;; What has been partly tested:
;; - C-x v v to start editing a file that was checked out with CVSREAD on.
;; - C-x v v to commit a file
;; - C-x v =
;; - C-x v l
;; - C-x v i
;; - C-x v g
;; - M-x vc-rename-file RET
2003-04-20 00:02:37 +00:00
;;; Bugs:
;; - Retrieving snapshots doesn't filter `cvs update' output and thus
;; parses bogus filenames. Don't know if it harms.
2003-04-20 00:02:37 +00:00
;;; Code:
(eval-when-compile (require 'vc))
(require 'vc-cvs)
;;;
;;; Customization options
;;;
(defcustom vc-mcvs-global-switches nil
"*Global switches to pass to any Meta-CVS command."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
(repeat :tag "Argument List"
:value ("")
string))
:version "22.1"
2003-04-20 00:02:37 +00:00
:group 'vc)
(defcustom vc-mcvs-register-switches nil
"*Extra switches for registering a file into Meta-CVS.
A string or list of strings passed to the checkin program by
\\[vc-register]."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
(repeat :tag "Argument List"
:value ("")
string))
:version "22.1"
2003-04-20 00:02:37 +00:00
:group 'vc)
(defcustom vc-mcvs-diff-switches nil
"*A string or list of strings specifying extra switches for cvs diff under VC."
:type '(choice (const :tag "None" nil)
(string :tag "Argument String")
(repeat :tag "Argument List"
:value ("")
string))
:version "22.1"
2003-04-20 00:02:37 +00:00
:group 'vc)
(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
vc-cvs-header)
"*Header keywords to be inserted by `vc-insert-headers'."
:version "22.1"
2003-04-20 00:02:37 +00:00
:type '(repeat string)
:group 'vc)
(defcustom vc-mcvs-use-edit vc-cvs-use-edit
"*Non-nil means to use `cvs edit' to \"check out\" a file.
This is only meaningful if you don't use the implicit checkout model
\(i.e. if you have $CVSREAD set)."
:type 'boolean
:version "22.1"
2003-04-20 00:02:37 +00:00
:group 'vc)
;;; Properties of the backend
(defun vc-mcvs-revision-granularity ()
'file)
2003-04-20 00:02:37 +00:00
;;;
;;; State-querying functions
;;;
;;;###autoload (defun vc-mcvs-registered (file)
;;;###autoload (if (vc-find-root file "MCVS/CVS")
;;;###autoload (progn
;;;###autoload (load "vc-mcvs")
;;;###autoload (vc-mcvs-registered file))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-root (file)
"Return the root directory of a Meta-CVS project, if any."
(or (vc-file-getprop file 'mcvs-root)
(vc-file-setprop file 'mcvs-root (vc-find-root file "MCVS/CVS"))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-read (file)
(if (file-readable-p file)
(with-temp-buffer
(insert-file-contents file)
(goto-char (point-min))
(read (current-buffer)))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-map-file (dir file)
(let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))
inode)
(dolist (x map inode)
(if (equal (nth 2 x) file) (setq inode (nth 1 x))))))
(defun vc-mcvs-registered (file)
(let (root inode cvsfile)
(when (and (setq root (vc-mcvs-root file))
(setq inode (vc-mcvs-map-file
root (file-relative-name file root))))
2003-04-20 00:02:37 +00:00
(vc-file-setprop file 'mcvs-inode inode)
;; Avoid calling `mcvs diff' in vc-workfile-unchanged-p.
(vc-file-setprop file 'vc-checkout-time
(if (vc-cvs-registered
(setq cvsfile (expand-file-name inode root)))
(vc-file-getprop cvsfile 'vc-checkout-time)
;; The file might not be registered yet because
;; of lazy-adding.
0))
t)))
(defun vc-mcvs-state (file)
;; This would assume the Meta-CVS sandbox is synchronized.
;; (vc-mcvs-cvs state file))
"Meta-CVS-specific version of `vc-state'."
(if (vc-stay-local-p file)
2003-04-20 00:02:37 +00:00
(let ((state (vc-file-getprop file 'vc-state)))
;; If we should stay local, use the heuristic but only if
;; we don't have a more precise state already available.
(if (memq state '(up-to-date edited))
(vc-mcvs-state-heuristic file)
state))
(with-temp-buffer
(setq default-directory (vc-mcvs-root file))
2003-04-20 00:02:37 +00:00
(vc-mcvs-command t 0 file "status")
(vc-cvs-parse-status t))))
(defalias 'vc-mcvs-state-heuristic 'vc-cvs-state-heuristic)
(defun vc-mcvs-dir-state (dir)
"Find the Meta-CVS state of all files in DIR."
;; if DIR is not under Meta-CVS control, don't do anything.
(when (file-readable-p (expand-file-name "MCVS/CVS/Entries" dir))
(if (vc-stay-local-p dir)
2003-04-20 00:02:37 +00:00
(vc-mcvs-dir-state-heuristic dir)
(let ((default-directory dir))
;; Don't specify DIR in this command, the default-directory is
;; enough. Otherwise it might fail with remote repositories.
(with-temp-buffer
(setq default-directory (vc-mcvs-root dir))
2003-04-20 00:02:37 +00:00
(vc-mcvs-command t 0 nil "status" "-l")
(goto-char (point-min))
(while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
(narrow-to-region (match-beginning 0) (match-end 0))
(vc-cvs-parse-status)
(goto-char (point-max))
(widen)))))))
(defun vc-mcvs-workfile-version (file)
(vc-cvs-workfile-version
(expand-file-name (vc-file-getprop file 'mcvs-inode)
(vc-file-getprop file 'mcvs-root))))
2003-04-20 00:02:37 +00:00
(defalias 'vc-mcvs-checkout-model 'vc-cvs-checkout-model)
;;;
;;; State-changing functions
;;;
(defun vc-mcvs-register (files &optional rev comment)
"Register FILES into the Meta-CVS version-control system.
2003-04-20 00:02:37 +00:00
COMMENT can be used to provide an initial description of FILE.
`vc-register-switches' and `vc-mcvs-register-switches' are passed to
the Meta-CVS command (in that order)."
;; FIXME: multiple-file case should be made to work
(if (> (length files) 1) (error "Registering filesets is not yet supported."))
(let* ((file (car files))
(filename (file-name-nondirectory file))
2003-04-20 00:02:37 +00:00
(extpos (string-match "\\." filename))
(ext (if extpos (substring filename (1+ extpos))))
(root (vc-mcvs-root file))
(types-file (expand-file-name "MCVS/TYPES" root))
(map-file (expand-file-name "MCVS/MAP" root))
(types (vc-mcvs-read types-file)))
;; Make sure meta files like MCVS/MAP are not read-only (happens with
;; CVSREAD) since Meta-CVS doesn't pay attention to it at all and goes
;; belly-up.
(unless (file-writable-p map-file)
(vc-checkout map-file t))
(unless (or (file-writable-p types-file) (not (file-exists-p types-file)))
2003-04-20 00:02:37 +00:00
(vc-checkout types-file t))
;; Make sure the `mcvs add' will not fire up the CVSEDITOR
;; to add a rule for the given file's extension.
(when (and ext (not (assoc ext types)))
2005-09-24 Emilio C. Lopes <eclig@gmx.net> * woman.el (woman-file-name): * wid-edit.el (widget-file-prompt-value) (widget-coding-system-prompt-value): * w32-fns.el (set-w32-system-coding-system): * vc.el (vc-version-diff, vc-annotate): * textmodes/reftex-auc.el (reftex-arg-cite) (reftex-arg-index-tag): * textmodes/refer.el (refer-get-bib-files): * textmodes/artist.el (artist-figlet-choose-font): * terminal.el (terminal-emulator): * replace.el (occur-read-primary-args): * rect.el (string-rectangle, string-insert-rectangle): * ps-print.el (ps-print-preprint): * progmodes/pascal.el (pascal-goto-defun): * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer): * progmodes/compile.el (compilation-find-file): * printing.el (pr-interactive-n-up): * play/animate.el (animate-birthday-present): * net/rcompile.el (remote-compile): * man.el (man, Man-goto-section, Man-follow-manual-reference): * mail/rmailsum.el (rmail-summary-search-backward) (rmail-summary-search): * mail/rmailout.el (rmail-output-read-rmail-file-name) (rmail-output-read-file-name): * mail/rmail.el (rmail-search, rmail-search-backwards): * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs): * locate.el (locate): * international/quail.el (quail-show-keyboard-layout): * international/mule.el (set-buffer-file-coding-system) (revert-buffer-with-coding-system, set-file-name-coding-system) (set-terminal-coding-system, set-keyboard-coding-system) (set-next-selection-coding-system): * international/mule-diag.el (describe-coding-system) (describe-font, describe-fontset): * international/mule-cmds.el (universal-coding-system-argument) (search-unencodable-char, describe-input-method) (set-language-environment, describe-language-environment): * international/codepage.el (codepage-setup): * international/code-pages.el (codepage-setup): * info.el (Info-search, Info-follow-reference) (Info-search-backward): * emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-clear-cache, ad-activate) (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name) (ad-enable-advice, ad-disable-advice, ad-remove-advice) (ad-read-regexp): * ediff-util.el (ediff-toggle-regexp-match): * ediff-ptch.el (ediff-prompt-for-patch-file): * dired-aux.el (dired-diff): * diff.el (diff): * cus-edit.el (custom-variable-prompt): * calendar/timeclock.el (timeclock-ask-for-project): * calc/calcalg3.el (calc-get-fit-variables): * calc/calc-store.el (calc-edit-variable) (calc-permanent-variable): * vc-mcvs.el (vc-mcvs-register): * shadowfile.el (shadow-define-literal-group): * woman.el (woman-file-name): * vc.el (vc-version-diff, vc-merge): * textmodes/reftex-index.el (reftex-index-complete-tag): * format.el (format-decode-buffer, format-decode-region): * emulation/viper-cmd.el (viper-read-string-with-history): * emacs-lisp/debug.el (cancel-debug-on-entry): * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * ediff.el (ediff-merge-revisions) (ediff-merge-revisions-with-ancestor, ediff-revision): * completion.el (interactive-completion-string-reader): * calc/calc-prog.el (calc-user-define-formula): Follow convention for reading with the minibuffer.
2005-09-24 13:44:02 +00:00
(let ((type (completing-read "Type to use (default): "
2003-04-20 00:02:37 +00:00
'("default" "name-only" "keep-old"
"binary" "value-only")
nil t nil nil "default")))
(push (list ext (make-symbol (upcase (concat ":" type)))) types)
(setq types (sort types (lambda (x y) (string< (car x) (car y)))))
(with-current-buffer (find-file-noselect types-file)
(erase-buffer)
(pp types (current-buffer))
(save-buffer)
(unless (get-buffer-window (current-buffer) t)
(kill-buffer (current-buffer)))))))
;; Now do the ADD.
(prog1 (apply 'vc-mcvs-command nil 0 file
"add"
(and comment (string-match "[^\t\n ]" comment)
(concat "-m" comment))
(vc-switches 'MCVS 'register))
;; I'm not sure exactly why, but if we don't setup the inode and root
;; prop of the file, things break later on in vc-mode-line that
;; ends up calling vc-mcvs-workfile-version.
;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p
;; doesn't try to call `mcvs diff' on the file.
(vc-mcvs-registered file)))
2003-04-20 00:02:37 +00:00
(defalias 'vc-mcvs-responsible-p 'vc-mcvs-root
"Return non-nil if CVS thinks it is responsible for FILE.")
(defalias 'vc-cvs-could-register 'vc-cvs-responsible-p
"Return non-nil if FILE could be registered in Meta-CVS.
This is only possible if Meta-CVS is responsible for FILE's directory.")
(defun vc-mcvs-checkin (files rev comment)
2003-04-20 00:02:37 +00:00
"Meta-CVS-specific version of `vc-backend-checkin'."
(unless (or (not rev) (vc-mcvs-valid-version-number-p rev))
(if (not (vc-mcvs-valid-symbolic-tag-name-p rev))
(error "%s is not a valid symbolic tag name" rev)
;; If the input revision is a valid symbolic tag name, we create it
;; as a branch, commit and switch to it.
;; This file-specific form of branching is deprecated.
;; We can't use `mcvs branch' and `mcvs switch' because they cannot
;; be applied just to this one file.
(apply 'vc-mcvs-command nil 0 files "tag" "-b" (list rev))
(apply 'vc-mcvs-command nil 0 files "update" "-r" (list rev))
(mapcar (lambda (file) (vc-file-setprop file 'vc-mcvs-sticky-tag rev))
files)
(setq rev nil)))
;; This commit might cvs-commit several files (e.g. MAP and TYPES)
;; so using numbered revs here is dangerous and somewhat meaningless.
(when rev (error "Cannot commit to a specific revision number"))
(let ((status (apply 'vc-mcvs-command nil 1 files
"ci" "-m" comment
(vc-switches 'MCVS 'checkin))))
2003-04-20 00:02:37 +00:00
(set-buffer "*vc*")
(goto-char (point-min))
(when (not (zerop status))
;; Check checkin problem.
(cond
((re-search-forward "Up-to-date check failed" nil t)
(mapcar (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
files)
2003-04-20 00:02:37 +00:00
(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"))))
;; Single-file commit? Then update the version by parsing the buffer.
;; Otherwise we can't necessarily tell what goes with what; clear
;; its properties so they have to be refetched.
(if (= (length files) 1)
(vc-file-setprop
(car files) 'vc-workfile-version
(vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
(mapc (lambda (file) (vc-file-clearprops file)) files))
;; Anyway, forget the checkout model of the file, because we might have
2003-04-20 00:02:37 +00:00
;; guessed wrong when we found the file. After commit, we can
;; tell it from the permissions of the file (see
;; vc-mcvs-checkout-model).
(mapc (lambda (file) (vc-file-setprop file 'vc-checkout-model nil))
files)
2003-04-20 00:02:37 +00:00
;; if this was an explicit check-in (does not include creation of
;; a branch), remove the sticky tag.
(if (and rev (not (vc-mcvs-valid-symbolic-tag-name-p rev)))
(vc-mcvs-command nil 0 files "update" "-A"))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-find-version (file rev buffer)
(apply 'vc-mcvs-command
buffer 0 file
"-Q" ; suppress diagnostic output
"update"
(and rev (not (string= rev ""))
(concat "-r" rev))
"-p"
(vc-switches 'MCVS 'checkout)))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-checkout (file &optional editable rev)
(message "Checking out %s..." file)
(with-current-buffer (or (get-file-buffer file) (current-buffer))
(vc-call update file editable rev (vc-switches 'MCVS 'checkout)))
2003-04-20 00:02:37 +00:00
(vc-mode-line file)
(message "Checking out %s...done" file))
(defun vc-mcvs-update (file editable rev switches)
(if (and (file-exists-p file) (not rev))
;; If no revision was specified, just make the file writable
;; if necessary (using `cvs-edit' if requested).
(and editable (not (eq (vc-mcvs-checkout-model file) 'implicit))
(if vc-mcvs-use-edit
(vc-mcvs-command nil 0 file "edit")
(set-file-modes file (logior (file-modes file) 128))
(if (equal file buffer-file-name) (toggle-read-only -1))))
;; Check out a particular version (or recreate the file).
(vc-file-setprop file 'vc-workfile-version nil)
(apply 'vc-mcvs-command nil 0 file
(if editable "-w")
"update"
;; default for verbose checkout: clear the sticky tag so
;; that the actual update will get the head of the trunk
(if (or (not rev) (string= rev ""))
"-A"
(concat "-r" rev))
switches)))
(defun vc-mcvs-rename-file (old new)
(vc-mcvs-command nil 0 new "move" (file-relative-name old)))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-revert (file &optional contents-done)
"Revert FILE to the version it was based on."
(vc-default-revert 'MCVS file contents-done)
2003-04-20 00:02:37 +00:00
(unless (eq (vc-checkout-model file) 'implicit)
(if vc-mcvs-use-edit
(vc-mcvs-command nil 0 file "unedit")
;; Make the file read-only by switching off all w-bits
(set-file-modes file (logand (file-modes file) 3950)))))
(defun vc-mcvs-merge (file first-version &optional second-version)
"Merge changes into current working copy of FILE.
The changes are between FIRST-VERSION and SECOND-VERSION."
(vc-mcvs-command nil 0 file
"update" "-kk"
(concat "-j" first-version)
(concat "-j" second-version))
(vc-file-setprop file 'vc-state 'edited)
(with-current-buffer (get-buffer "*vc*")
(goto-char (point-min))
(if (re-search-forward "conflicts during merge" nil t)
1 ; signal error
0))) ; signal success
(defun vc-mcvs-merge-news (file)
"Merge in any new changes made to FILE."
(message "Merging changes into %s..." file)
;; (vc-file-setprop file 'vc-workfile-version nil)
(vc-file-setprop file 'vc-checkout-time 0)
(vc-mcvs-command nil 0 file "update")
;; Analyze the merge result reported by Meta-CVS, and set
;; file properties accordingly.
(with-current-buffer (get-buffer "*vc*")
(goto-char (point-min))
;; get new workfile version
(if (re-search-forward
"^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t)
(vc-file-setprop file 'vc-workfile-version (match-string 1))
(vc-file-setprop file 'vc-workfile-version nil))
;; get file status
(prog1
(if (eq (buffer-size) 0)
0 ;; there were no news; indicate success
(if (re-search-forward
(concat "^\\([CMUP] \\)?"
".*"
"\\( already contains the differences between \\)?")
nil t)
(cond
;; Merge successful, we are in sync with repository now
((or (match-string 2)
(string= (match-string 1) "U ")
(string= (match-string 1) "P "))
(vc-file-setprop file 'vc-state 'up-to-date)
(vc-file-setprop file 'vc-checkout-time
(nth 5 (file-attributes file)))
0);; indicate success to the caller
;; Merge successful, but our own changes are still in the file
((string= (match-string 1) "M ")
(vc-file-setprop file 'vc-state 'edited)
0);; indicate success to the caller
;; Conflicts detected!
(t
(vc-file-setprop file 'vc-state 'edited)
1);; signal the error to the caller
)
(pop-to-buffer "*vc*")
(error "Couldn't analyze mcvs update result")))
(message "Merging changes into %s...done" file))))
;;;
;;; History functions
;;;
(defun vc-mcvs-print-log (files &optional buffer)
"Get change log associated with FILES."
(let ((default-directory (vc-mcvs-root (car files))))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(vc-mcvs-command
buffer
(if (and (vc-stay-local-p files) (fboundp 'start-process)) 'async 0)
files "log")))
(defun vc-mcvs-diff (files &optional oldvers newvers buffer)
"Get a difference report using Meta-CVS between two versions of FILES."
(let* ((async (and (not vc-disable-async-diff)
(vc-stay-local-p files)
(fboundp 'start-process)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(default-directory (vc-mcvs-root (car files)))
(status
(apply 'vc-mcvs-command (or buffer "*vc-diff*")
(if async 'async 1)
files "diff"
(and oldvers (concat "-r" oldvers))
(and newvers (concat "-r" newvers))
(vc-switches 'MCVS 'diff))))
(if async 1 status))) ; async diff, pessimistic assumption.
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-diff-tree (dir &optional rev1 rev2)
"Diff all files at and below DIR."
(with-current-buffer "*vc-diff*"
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(setq default-directory (vc-mcvs-root dir))
;; cvs diff: use a single call for the entire tree
(let ((coding-system-for-read (or coding-system-for-read 'undecided)))
(apply 'vc-mcvs-command "*vc-diff*" 1 dir "diff"
(and rev1 (concat "-r" rev1))
(and rev2 (concat "-r" rev2))
(vc-switches 'MCVS 'diff)))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-annotate-command (file buffer &optional version)
"Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER.
Optional arg VERSION is a version to annotate from."
(vc-mcvs-command
buffer
(if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
file "annotate" (if version (concat "-r" version)))
(with-current-buffer buffer
(goto-char (point-min))
(re-search-forward "^[0-9]")
(delete-region (point-min) (1- (point)))))
2003-04-20 00:02:37 +00:00
(defalias 'vc-mcvs-annotate-current-time 'vc-cvs-annotate-current-time)
(defalias 'vc-mcvs-annotate-time 'vc-cvs-annotate-time)
;;;
;;; Snapshot system
;;;
(defun vc-mcvs-create-snapshot (dir name branchp)
"Assign to DIR's current version a given NAME.
If BRANCHP is non-nil, the name is created as a branch (and the current
workspace is immediately moved to that new branch)."
(if (not branchp)
(vc-mcvs-command nil 0 dir "tag" "-c" name)
(vc-mcvs-command nil 0 dir "branch" name)
(vc-mcvs-command nil 0 dir "switch" name)))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-retrieve-snapshot (dir name update)
"Retrieve a snapshot at and below DIR.
NAME is the name of the snapshot; if it is empty, do a `cvs update'.
If UPDATE is non-nil, then update (resynch) any affected buffers."
(with-current-buffer (get-buffer-create "*vc*")
(let ((default-directory dir)
(sticky-tag))
(erase-buffer)
(if (or (not name) (string= name ""))
(vc-mcvs-command t 0 nil "update")
(vc-mcvs-command t 0 nil "update" "-r" name)
(setq sticky-tag name))
(when update
(goto-char (point-min))
(while (not (eobp))
(if (looking-at "\\([CMUP]\\) \\(.*\\)")
(let* ((file (expand-file-name (match-string 2) dir))
(state (match-string 1))
(buffer (find-buffer-visiting file)))
(when buffer
(cond
((or (string= state "U")
(string= state "P"))
(vc-file-setprop file 'vc-state 'up-to-date)
(vc-file-setprop file 'vc-workfile-version nil)
(vc-file-setprop file 'vc-checkout-time
(nth 5 (file-attributes file))))
((or (string= state "M")
(string= state "C"))
(vc-file-setprop file 'vc-state 'edited)
(vc-file-setprop file 'vc-workfile-version nil)
(vc-file-setprop file 'vc-checkout-time 0)))
(vc-file-setprop file 'vc-mcvs-sticky-tag sticky-tag)
(vc-resynch-buffer file t t))))
(forward-line 1))))))
;;;
;;; Miscellaneous
;;;
(defalias 'vc-mcvs-make-version-backups-p 'vc-stay-local-p
2003-04-20 00:02:37 +00:00
"Return non-nil if version backups should be made for FILE.")
(defalias 'vc-mcvs-check-headers 'vc-cvs-check-headers)
;;;
;;; Internal functions
;;;
(defun vc-mcvs-command (buffer okstatus file &rest flags)
"A wrapper around `vc-do-command' for use in vc-mcvs.el.
The difference to vc-do-command is that this function always invokes `mcvs',
and that it passes `vc-mcvs-global-switches' to it before FLAGS."
(let ((args (append '("--error-terminate")
(if (stringp vc-mcvs-global-switches)
(cons vc-mcvs-global-switches flags)
(append vc-mcvs-global-switches flags)))))
(if (not (member (car flags) '("diff" "log" "status")))
;; No need to filter: do it the easy way.
(apply 'vc-do-command buffer okstatus "mcvs" file args)
;; We need to filter the output.
;; The output of the filter uses filenames relative to the root,
;; so we need to change the default-directory.
;; (assert (equal default-directory (vc-mcvs-root file)))
(vc-do-command
buffer okstatus "sh" nil "-c"
(concat "mcvs "
(mapconcat
'shell-quote-argument
(append (remq nil args)
(if file (list (file-relative-name file))))
" ")
" | mcvs filt")))))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-repository-hostname (dirname)
(vc-cvs-repository-hostname (vc-mcvs-root dirname)))
2003-04-20 00:02:37 +00:00
(defun vc-mcvs-dir-state-heuristic (dir)
"Find the Meta-CVS state of all files in DIR, using only local information."
(with-temp-buffer
(vc-cvs-get-entries dir)
(goto-char (point-min))
(while (not (eobp))
;; Meta-MCVS-removed files are not taken under VC control.
(when (looking-at "/\\([^/]*\\)/[^/-]")
(let ((file (expand-file-name (match-string 1) dir)))
(unless (vc-file-getprop file 'vc-state)
(vc-cvs-parse-entry file t))))
(forward-line 1))))
(defalias 'vc-mcvs-valid-symbolic-tag-name-p 'vc-cvs-valid-symbolic-tag-name-p)
(defalias 'vc-mcvs-valid-version-number-p 'vc-cvs-valid-version-number-p)
(provide 'vc-mcvs)
2003-09-01 15:45:59 +00:00
;; arch-tag: a39c7c1c-5247-429d-88df-dd7187d2e704
2003-04-20 00:02:37 +00:00
;;; vc-mcvs.el ends here