Mercurial > emacs

changeset 105324:2701a9aa1147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-cvs-parse-entry): Be more careful with the match-data. (Bug#4555).
author Glenn Morris <rgm@gnu.org>
date Thu, 01 Oct 2009 02:23:29 +0000
parents caba6faa5726
children 42404460bd67
files lisp/ChangeLog lisp/vc-cvs.el
diffstat 2 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Oct 01 02:19:38 2009 +0000
+++ b/lisp/ChangeLog	Thu Oct 01 02:23:29 2009 +0000
@@ -1,5 +1,8 @@
 2009-10-01  Glenn Morris  <rgm@gnu.org>
 
+	* vc-cvs.el (vc-cvs-parse-entry): Be more careful with the
+	match-data.  (Bug#4555).
+
 	* cedet/semantic/bovine/gcc.el
 	(semantic-c-reset-preprocessor-symbol-map): Fix declaration.
 	(semantic-gcc-get-include-paths, semantic-gcc-setup-data): Doc fixes.
--- a/lisp/vc-cvs.el	Thu Oct 01 02:19:38 2009 +0000
+++ b/lisp/vc-cvs.el	Thu Oct 01 02:23:29 2009 +0000
@@ -955,6 +955,7 @@
   )
 
 ;; Based on vc-cvs-dir-state-heuristic from Emacs 22.
+;; FIXME does not mention unregistered files.
 (defun vc-cvs-dir-status-heuristic (dir update-function &optional basedir)
   "Find the CVS state of all files in DIR, using only local information."
   (let (file basename status result dirlist)
@@ -1164,18 +1165,18 @@
     ;; This is intentionally different from the algorithm that CVS uses
     ;; (which is based on textual comparison), because there can be problems
     ;; generating a time string that looks exactly like the one from CVS.
-    (let ((mtime (nth 5 (file-attributes file))))
-      (require 'parse-time)
-      (let ((parsed-time
-	     (parse-time-string (concat (match-string 2) " +0000"))))
-	(cond ((and (not (string-match "\\+" (match-string 2)))
-		    (car parsed-time)
-		    (equal mtime (apply 'encode-time parsed-time)))
-	       (vc-file-setprop file 'vc-checkout-time mtime)
-	       (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
-	      (t
-	       (vc-file-setprop file 'vc-checkout-time 0)
-	       (if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
+    (let* ((time (match-string 2))
+           (mtime (nth 5 (file-attributes file)))
+           (parsed-time (progn (require 'parse-time)
+                               (parse-time-string (concat time " +0000")))))
+      (cond ((and (not (string-match "\\+" time))
+                  (car parsed-time)
+                  (equal mtime (apply 'encode-time parsed-time)))
+             (vc-file-setprop file 'vc-checkout-time mtime)
+             (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
+            (t
+             (vc-file-setprop file 'vc-checkout-time 0)
+             (if set-state (vc-file-setprop file 'vc-state 'edited))))))))
 
 ;; Completion of revision names.
 ;; Just so I don't feel like I'm duplicating code from pcl-cvs, I'll use