mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

(vc-cvs-parse-entry): Don't barf when an `Entries' files contains an

Browse Source 
invalid timestamp.
This commit is contained in:
Miles Bader 2002-10-11 06:49:49 +00:00
parent d77b70e557
commit 6c150da9f5
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2002-10-11 Miles Bader <miles@gnu.org>
* vc-cvs.el (vc-cvs-parse-entry): Don't barf when an `Entries'
files contains an invalid timestamp.
2002-10-11 Simon Josefsson <jas@extundo.com>
* mail/sendmail.el (mail-envelope-from): New option `header' to

22
lisp/vc-cvs.el
View File

@ -1,11 +1,11 @@
;;; vc-cvs.el --- non-resident support for CVS version-control
;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc.
;; Copyright (C) 1995,98,99,2000,2001,2002 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-cvs.el,v 1.46 2002/10/09 15:59:39 rost Exp $
;; $Id: vc-cvs.el,v 1.47 2002/10/10 08:44:58 spiegel Exp $
;; This file is part of GNU Emacs.
@ -884,15 +884,15 @@ is non-nil."
;; compare checkout time and modification time
(let ((mtime (nth 5 (file-attributes file))))
(require 'parse-time)
(cond ((equal mtime
(apply 'encode-time
(parse-time-string
(concat (match-string 2) " +0000"))))
(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 ((parsed-time
(parse-time-string (concat (match-string 2) " +0000"))))
(cond ((and (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)))))))))
(provide 'vc-cvs)