Mercurial > emacs
comparison lisp/vc-cvs.el @ 47840:868ca431eff1
(vc-cvs-parse-entry): Don't barf when an `Entries' files contains an
invalid timestamp.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 11 Oct 2002 06:47:49 +0000 |
parents | 677f4ca67bbe |
children | ca7641fe56ba |
comparison
equal
deleted
inserted
replaced
47839:8d4ba9addc8e | 47840:868ca431eff1 |
---|---|
1 ;;; vc-cvs.el --- non-resident support for CVS version-control | 1 ;;; vc-cvs.el --- non-resident support for CVS version-control |
2 | 2 |
3 ;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1995,98,99,2000,2001,2002 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: FSF (see vc.el for full credits) | 5 ;; Author: FSF (see vc.el for full credits) |
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
7 | 7 |
8 ;; $Id: vc-cvs.el,v 1.46 2002/10/09 15:59:39 rost Exp $ | 8 ;; $Id: vc-cvs.el,v 1.47 2002/10/10 08:44:58 spiegel Exp $ |
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
882 (vc-file-setprop file 'vc-cvs-sticky-tag | 882 (vc-file-setprop file 'vc-cvs-sticky-tag |
883 (vc-cvs-parse-sticky-tag (match-string 5) (match-string 6))) | 883 (vc-cvs-parse-sticky-tag (match-string 5) (match-string 6))) |
884 ;; compare checkout time and modification time | 884 ;; compare checkout time and modification time |
885 (let ((mtime (nth 5 (file-attributes file)))) | 885 (let ((mtime (nth 5 (file-attributes file)))) |
886 (require 'parse-time) | 886 (require 'parse-time) |
887 (cond ((equal mtime | 887 (let ((parsed-time |
888 (apply 'encode-time | 888 (parse-time-string (concat (match-string 2) " +0000")))) |
889 (parse-time-string | 889 (cond ((and (car parsed-time) |
890 (concat (match-string 2) " +0000")))) | 890 (equal mtime (apply 'encode-time parsed-time))) |
891 (vc-file-setprop file 'vc-checkout-time mtime) | 891 (vc-file-setprop file 'vc-checkout-time mtime) |
892 (if set-state (vc-file-setprop file 'vc-state 'up-to-date))) | 892 (if set-state (vc-file-setprop file 'vc-state 'up-to-date))) |
893 (t | 893 (t |
894 (vc-file-setprop file 'vc-checkout-time 0) | 894 (vc-file-setprop file 'vc-checkout-time 0) |
895 (if set-state (vc-file-setprop file 'vc-state 'edited)))))))) | 895 (if set-state (vc-file-setprop file 'vc-state 'edited))))))))) |
896 | 896 |
897 (provide 'vc-cvs) | 897 (provide 'vc-cvs) |
898 | 898 |
899 ;;; vc-cvs.el ends here | 899 ;;; vc-cvs.el ends here |