Mercurial > emacs

changeset 94804:33d1e8fb0ae5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make SCCS backend directory-aware.
author Eric S. Raymond <esr@snark.thyrsus.com>
date Fri, 09 May 2008 16:33:30 +0000
parents 0c63a93bf877
children 89d37b54b964
files lisp/ChangeLog lisp/vc-sccs.el
diffstat 2 files changed, 59 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri May 09 16:01:50 2008 +0000
+++ b/lisp/ChangeLog	Fri May 09 16:33:30 2008 +0000
@@ -1,3 +1,10 @@
+2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+	* vc-scs.el (vc-sccs-checkin, vc-sccs-checkout, vc-sccs-rollback, 
+	vc-sccs-revert, vc-sccs-steal-lock, vc-sccs-modify-change-comment,
+	vc-sccs-print-log, vc-sccs-diff): Teach SCCS back end to grok 
+	directories.
+
 2008-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc.el (vc-deduce-fileset): Don't require the checkout-model and the
@@ -21,8 +28,8 @@
 2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* vc.el (vc-deduce-fileset, vc-next-action, vc-version-diff)
-	(vc-diff, vc-revert, vc-rollback, vc-update):
-	* vc-dispatcher.el (vc-dispatcher-selection-set):
+	(vc-diff, vc-revert, vc-rollback, vc-update),
+	vc-dispatcher.el (vc-dispatcher-selection-set):
 	Get rid of 4 special cases in fileset selection.  This involved
 	changing the return value of (vc-deduce-fileset) so that it passes
 	back a deduced state as well as a deduced back end,
--- a/lisp/vc-sccs.el	Fri May 09 16:01:50 2008 +0000
+++ b/lisp/vc-sccs.el	Fri May 09 16:33:30 2008 +0000
@@ -24,10 +24,6 @@
 
 ;;; Commentary:
 
-;; TODO:
-;; - remove call to vc-expand-dirs by implementing our own (which can just
-;;   list the SCCS subdir instead).
-
 ;;; Code:
 
 (eval-when-compile
@@ -156,7 +152,7 @@
     (vc-sccs-state file)))
 
 (defun vc-sccs-dir-status (dir update-function)
-  ;; Doing loys of undividual VC-state calls is painful, but 
+  ;; Doing lots of individual VC-state calls is painful, but 
   ;; there is no better option in SCCS-land.
   (let ((flist (vc-expand-dirs (list dir)))
 	(result nil))
@@ -233,7 +229,7 @@
 
 (defun vc-sccs-checkin (files rev comment)
   "SCCS-specific version of `vc-backend-checkin'."
-  (dolist (file files)
+  (dolist (file (vc-expand-dirs files))
     (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file)
 	   (if rev (concat "-r" rev))
 	   (concat "-y" comment)
@@ -253,35 +249,40 @@
 
 (defun vc-sccs-checkout (file &optional editable rev)
   "Retrieve a copy of a saved revision of SCCS controlled FILE.
+If FILE is a directory, all version-controlled files beneath are checked out.
 EDITABLE non-nil means that the file should be writable and
 locked.  REV is the revision to check out."
-  (let ((file-buffer (get-file-buffer file))
-	switches)
-    (message "Checking out %s..." file)
-    (save-excursion
-      ;; Change buffers to get local value of vc-checkout-switches.
-      (if file-buffer (set-buffer file-buffer))
-      (setq switches (vc-switches 'SCCS 'checkout))
-      ;; Save this buffer's default-directory
-      ;; and use save-excursion to make sure it is restored
-      ;; in the same buffer it was saved in.
-      (let ((default-directory default-directory))
-	(save-excursion
-	  ;; Adjust the default-directory so that the check-out creates
-	  ;; the file in the right place.
-	  (setq default-directory (file-name-directory file))
+  (if (file-directory-p file) 
+      (mapc 'vc-sccs-checkout (vc-expand-dirs (list file)))
+    (let ((file-buffer (get-file-buffer file))
+	  switches)
+      (message "Checking out %s..." file)
+      (save-excursion
+	;; Change buffers to get local value of vc-checkout-switches.
+	(if file-buffer (set-buffer file-buffer))
+	(setq switches (vc-switches 'SCCS 'checkout))
+	;; Save this buffer's default-directory
+	;; and use save-excursion to make sure it is restored
+	;; in the same buffer it was saved in.
+	(let ((default-directory default-directory))
+	  (save-excursion
+	    ;; Adjust the default-directory so that the check-out creates
+	    ;; the file in the right place.
+	    (setq default-directory (file-name-directory file))
 
-	  (and rev (or (string= rev "")
-                       (not (stringp rev)))
-               (setq rev nil))
-	  (apply 'vc-sccs-do-command nil 0 "get" (vc-name file)
-		 (if editable "-e")
-		 (and rev (concat "-r" (vc-sccs-lookup-triple file rev)))
-		 switches))))
-    (message "Checking out %s...done" file)))
+	    (and rev (or (string= rev "")
+			 (not (stringp rev)))
+		 (setq rev nil))
+	    (apply 'vc-sccs-do-command nil 0 "get" (vc-name file)
+		   (if editable "-e")
+		   (and rev (concat "-r" (vc-sccs-lookup-triple file rev)))
+		   switches))))
+      (message "Checking out %s...done" file))))
 
 (defun vc-sccs-rollback (files)
-  "Roll back, undoing the most recent checkins of FILES."
+  "Roll back, undoing the most recent checkins of FILES.  Directories
+are expanded to all version-controlled subfiles."
+  (setq files (vc-expand-dirs files))
   (if (not files)
       (error "SCCS backend doesn't support directory-level rollback."))
   (dolist (file files)
@@ -295,24 +296,29 @@
 	    (vc-sccs-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-sccs-do-command nil 0 "unget" (vc-name file))
-  (vc-sccs-do-command nil 0 "get" (vc-name file))
-  ;; Checking out explicit revisions is not supported under SCCS, yet.
-  ;; We always "revert" to the latest revision; therefore
-  ;; vc-working-revision is cleared here so that it gets recomputed.
-  (vc-file-setprop file 'vc-working-revision nil))
+  "Revert FILE to the version it was based on. If FILE is a directory,
+revert all subfiles."
+  (if (file-directory-p file) 
+      (mapc 'vc-sccs-revert (vc-expand-dirs (list file)))
+    (vc-sccs-do-command nil 0 "unget" (vc-name file))
+    (vc-sccs-do-command nil 0 "get" (vc-name file))
+    ;; Checking out explicit revisions is not supported under SCCS, yet.
+    ;; We always "revert" to the latest revision; therefore
+    ;; vc-working-revision is cleared here so that it gets recomputed.
+    (vc-file-setprop file 'vc-working-revision nil)))
 
 (defun vc-sccs-steal-lock (file &optional rev)
   "Steal the lock on the current workfile for FILE and revision REV."
-  (vc-sccs-do-command nil 0 "unget"
-                      (vc-name file) "-n" (if rev (concat "-r" rev)))
-  (vc-sccs-do-command nil 0 "get"
-                      (vc-name file) "-g" (if rev (concat "-r" rev))))
+  (if (file-directory-p file) 
+      (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file)))
+    (vc-sccs-do-command nil 0 "unget"
+			(vc-name file) "-n" (if rev (concat "-r" rev)))
+    (vc-sccs-do-command nil 0 "get"
+			(vc-name file) "-g" (if rev (concat "-r" rev)))))
 
 (defun vc-sccs-modify-change-comment (files rev comment)
   "Modify (actually, append to) the change comments for FILES on a specified REV."
-  (dolist (file files)
+  (dolist (file (vc-expand-dirs files))
     (vc-sccs-do-command nil 0 "cdc" (vc-name file) 
                         (concat "-y" comment) (concat "-r" rev))))
 
@@ -323,6 +329,7 @@
 
 (defun vc-sccs-print-log (files &optional buffer)
   "Get change log associated with FILES."
+  (setq files (vc-expand-dirs files))
   (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)))
 
 (defun vc-sccs-wash-log ()
@@ -332,6 +339,7 @@
 
 (defun vc-sccs-diff (files &optional oldvers newvers buffer)
   "Get a difference report using SCCS between two filesets."
+  (setq files (vc-expand-dirs files))
   (setq oldvers (vc-sccs-lookup-triple (car files) oldvers))
   (setq newvers (vc-sccs-lookup-triple (car files) newvers))
   (apply 'vc-do-command (or buffer "*vc-diff*")