emacs: lisp/vc-sccs.el comparison

comparison lisp/vc-sccs.el @ 90988:492971a3f31f unicode-xft-base

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 816-823) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 59-69) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 237-238) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235

author	Miles Bader <miles@gnu.org>
date	Tue, 24 Jul 2007 01:23:55 +0000
parents	95d0cdf160ea f9f0d45ce573
children	f55f9811f5d7

comparison

equal deleted inserted replaced

-:b2d8a283f27e
+:492971a3f31f
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
+;; TODO:
+;; - remove call to vc-expand-dirs by implementing our own (which can just
+;;   list the SCCS subdir instead).
 ;;; Code:
 (eval-when-compile
 (require 'vc))
 ;;;
 (defconst vc-sccs-name-assoc-file "VC-names")
+;;; Properties of the backend
+(defun vc-sccs-revision-granularity ()
+'file)
 ;;;
 ;;; State-querying functions
 ;;;
 ;;; The autoload cookie below places vc-sccs-registered directly into
 ;;;
 ;;; State-changing functions
 ;;;
-(defun vc-sccs-register (file &optional rev comment)
+(defun vc-sccs-create-repo ()
-"Register FILE into the SCCS version-control system.
+"Create a new SCCS repository."
+;; SCCS is totally file-oriented, so all we have to do is make the directory
+(make-directory "SCCS"))
+(defun vc-sccs-register (files &optional rev comment)
+"Register FILES into the SCCS version-control system.
 REV is the optional revision number for the file.  COMMENT can be used
-to provide an initial description of FILE.
+to provide an initial description of FILES.
 `vc-register-switches' and `vc-sccs-register-switches' are passed to
 the SCCS command (in that order).
-Automatically retrieve a read-only version of the file with keywords
+Automatically retrieve a read-only version of the files with keywords
 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
+(dolist (file files)
 (let* ((dirname (or (file-name-directory file) ""))
 	   (basename (file-name-nondirectory file))
 	   (project-file (vc-sccs-search-project-dir dirname basename)))
 (let ((vc-name
 	     (or project-file
 		 (format (car vc-sccs-master-templates) dirname basename))))
 	(apply 'vc-do-command nil 0 "admin" vc-name
-	       (and rev (concat "-r" rev))
+	       (and rev (not (string= rev "")) (concat "-r" rev))
 	       "-fb"
 	       (concat "-i" (file-relative-name file))
 	       (and comment (concat "-y" comment))
 	       (vc-switches 'SCCS 'register)))
 (delete-file file)
 (if vc-keep-workfiles
-	  (vc-do-command nil 0 "get" (vc-name file)))))
+	  (vc-do-command nil 0 "get" (vc-name file))))))
 (defun vc-sccs-responsible-p (file)
 "Return non-nil if SCCS thinks it would be responsible for registering FILE."
 ;; TODO: check for all the patterns in vc-sccs-master-templates
 (or (file-directory-p (expand-file-name "SCCS" (file-name-directory file)))
 (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "")
 					   (file-name-nondirectory file)))))
-(defun vc-sccs-checkin (file rev comment)
+(defun vc-sccs-checkin (files rev comment)
 "SCCS-specific version of `vc-backend-checkin'."
-(apply 'vc-do-command nil 0 "delta" (vc-name file)
+(dolist (file files)
-	 (if rev (concat "-r" rev))
+(apply 'vc-do-command nil 0 "delta" (vc-name file)
-	 (concat "-y" comment)
+	   (if rev (concat "-r" rev))
-	 (vc-switches 'SCCS 'checkin))
+	   (concat "-y" comment)
-(if vc-keep-workfiles
+	   (vc-switches 'SCCS 'checkin))
-(vc-do-command nil 0 "get" (vc-name file))))
+(if vc-keep-workfiles
+	(vc-do-command nil 0 "get" (vc-name file)))))
 (defun vc-sccs-find-version (file rev buffer)
 (apply 'vc-do-command
 	 buffer 0 "get" (vc-name file)
 	 "-s" ;; suppress diagnostic output
 		 (if editable "-e")
 		 (and rev (concat "-r" (vc-sccs-lookup-triple file rev)))
 		 switches))))
 (message "Checking out %s...done" file)))
+(defun vc-sccs-cancel-version (files)
+"Roll back, undoing the most recent checkins of FILES."
+(if (not files)
+(error "SCCS backend doesn't support directory-level rollback."))
+(dolist (file files)
+	  (let ((discard (vc-workfile-version file)))
+	    (if (null (yes-or-no-p (format "Remove version %s from %s history? "
+					   discard file)))
+		(error "Aborted"))
+	    (message "Removing revision %s from %s..." discard file)
+	    (vc-do-command nil 0 "rmdel" (vc-name file) (concat "-r" discard))
+	    (vc-do-command nil 0 "get" (vc-name file) nil))))
 (defun vc-sccs-revert (file &optional contents-done)
 "Revert FILE to the version it was based on."
 (vc-do-command nil 0 "unget" (vc-name file))
 (vc-do-command nil 0 "get" (vc-name file))
 ;; Checking out explicit versions is not supported under SCCS, yet.
 ;; We always "revert" to the latest version; therefore
 ;; vc-workfile-version is cleared here so that it gets recomputed.
 (vc-file-setprop file 'vc-workfile-version nil))
-(defun vc-sccs-cancel-version (file editable)
-"Undo the most recent checkin of FILE.
-EDITABLE non-nil means previous version should be locked."
-(vc-do-command nil 0 "rmdel"
-		 (vc-name file)
-		 (concat "-r" (vc-workfile-version file)))
-(vc-do-command nil 0 "get"
-		 (vc-name file)
-		 (if editable "-e")))
 (defun vc-sccs-steal-lock (file &optional rev)
 "Steal the lock on the current workfile for FILE and revision REV."
 (vc-do-command nil 0 "unget" (vc-name file) "-n" (if rev (concat "-r" rev)))
 (vc-do-command nil 0 "get" (vc-name file) "-g" (if rev (concat "-r" rev))))
 ;;;
 ;;; History functions
 ;;;
-(defun vc-sccs-print-log (file &optional buffer)
+(defun vc-sccs-print-log (files &optional buffer)
-"Get change log associated with FILE."
+"Get change log associated with FILES."
-(vc-do-command buffer 0 "prs" (vc-name file)))
+(vc-do-command buffer 0 "prs" (mapcar 'vc-name files)))
+(defun vc-sccs-wash-log ()
+"Remove all non-comment information from log output."
+;; FIXME: not implemented for SCCS
+nil)
 (defun vc-sccs-logentry-check ()
 "Check that the log entry in the current buffer is acceptable for SCCS."
 (when (>= (buffer-size) 512)
 (goto-char 512)
 (error "Log must be less than 512 characters; point is now at pos 512")))
-(defun vc-sccs-diff (file &optional oldvers newvers buffer)
+(defun vc-sccs-diff (files &optional oldvers newvers buffer)
-"Get a difference report using SCCS between two versions of FILE."
+"Get a difference report using SCCS between two filesets."
 (setq oldvers (vc-sccs-lookup-triple file oldvers))
 (setq newvers (vc-sccs-lookup-triple file newvers))
-(apply 'vc-do-command (or buffer "*vc-diff*") 1 "vcdiff" (vc-name file)
+(apply 'vc-do-command (or buffer "*vc-diff*")
+	 1 "vcdiff" (mapcar 'vc-name (vc-expand-dirs files))
 (append (list "-q"
 (and oldvers (concat "-r" oldvers))
 (and newvers (concat "-r" newvers)))
 (vc-switches 'SCCS 'diff))))

Mercurial > emacs

comparison lisp/vc-sccs.el @ 90988:492971a3f31f unicode-xft-base