From: Nick Roberts <nickrob@snap.net.nz>
Date: Tue, 4 Nov 2008 07:27:26 +0000 (+0000)
Subject: * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
X-Git-Tag: emacs-pretest-23.0.90~1987
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=644896e1fa8b0b9b9367b2561061f0fef12bc3f4;p=emacs.git

* vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
* vc-dir.el (vc-dir-headers): Order headers as in PCL-CVS.
---

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 81db5a08576..cd5c86fe7f2 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -993,7 +993,7 @@ state."
 	       (insert-file-contents "CVS/Root")
 	       (goto-char (point-min))
 	       (and (looking-at ":ext:") (delete-char 5))
-	       (buffer-substring (point) (1- (point-max))))
+	       (concat (buffer-substring (point) (1- (point-max))) "\n"))
 	   (file-error nil)))
 	(module
 	 (condition-case nil
@@ -1004,14 +1004,27 @@ state."
 	       (concat (buffer-substring (point-min) (point)) "\n"))
 	   (file-error nil))))
     (concat
-     (cond (module
-	    (concat (propertize "Module     : " 'face 'font-lock-type-face)
-                    (propertize module 'face 'font-lock-variable-name-face)))
-	   (t ""))
      (cond (repo
 	    (concat (propertize "Repository : " 'face 'font-lock-type-face)
                     (propertize repo 'face 'font-lock-variable-name-face)))
 	   (t ""))
+     (cond (module
+	    (concat (propertize "Module     : " 'face 'font-lock-type-face)
+                    (propertize module 'face 'font-lock-variable-name-face)))
+	   (t ""))
+     (if (file-readable-p "CVS/Tag")
+	 (let ((tag (vc-cvs-file-to-string "CVS/Tag")))
+	   (cond
+	    ((string-match "\\`T" tag)
+	     (concat (propertize "Tag        : " 'face 'font-lock-type-face)
+		     (propertize (substring tag 1)
+				 'face 'font-lock-variable-name-face)))
+	    ((string-match "\\`D" tag)
+	     (concat (propertize "Date       : " 'face 'font-lock-type-face)
+		     (propertize (substring tag 1)
+				 'face 'font-lock-variable-name-face)))
+	    (t ""))))
+
      ;; In CVS, branch is a per-file property, not a per-directory property.
      ;; We can't really do this here without making dangerous assumptions.
      ;;(propertize "Branch:     " 'face 'font-lock-type-face)