comparison lisp/vc-cvs.el @ 52717:9197177c5f99

(vc-cvs-parse-entry): Revert last change to allow bootstrap.
author Dave Love <fx@gnu.org>
date Wed, 01 Oct 2003 13:22:53 +0000
parents 2b71ed49b8c6
children f0eb34e60705 74e44ab76fa5
comparison
equal deleted inserted replaced
52716:ce324221181f 52717:9197177c5f99
3 ;; Copyright (C) 1995,98,99,2000,2001,02,2003 Free Software Foundation, Inc. 3 ;; Copyright (C) 1995,98,99,2000,2001,02,2003 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.64 2003/09/24 11:55:45 spiegel Exp $ 8 ;; $Id$
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
925 (match-string 5))) 925 (match-string 5)))
926 ;; Compare checkout time and modification time. 926 ;; Compare checkout time and modification time.
927 ;; This is intentionally different from the algorithm that CVS uses 927 ;; This is intentionally different from the algorithm that CVS uses
928 ;; (which is based on textual comparison), because there can be problems 928 ;; (which is based on textual comparison), because there can be problems
929 ;; generating a time string that looks exactly like the one from CVS. 929 ;; generating a time string that looks exactly like the one from CVS.
930 (let ((mtime (nth 5 (file-attributes file))) 930 (let ((mtime (nth 5 (file-attributes file))))
931 (parsed-time 931 (require 'parse-time)
932 (parse-time-string (concat (match-string 2) " +0000")))) 932 (let ((parsed-time
933 (cond ((and (not (string-match "\\+" (match-string 2))) 933 (parse-time-string (concat (match-string 2) " +0000"))))
934 (car parsed-time) 934 (cond ((and (not (string-match "\\+" (match-string 2)))
935 (equal mtime (apply 'encode-time parsed-time))) 935 (car parsed-time)
936 (vc-file-setprop file 'vc-checkout-time mtime) 936 (equal mtime (apply 'encode-time parsed-time)))
937 (if set-state (vc-file-setprop file 'vc-state 'up-to-date))) 937 (vc-file-setprop file 'vc-checkout-time mtime)
938 (t 938 (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
939 (vc-file-setprop file 'vc-checkout-time 0) 939 (t
940 (if set-state (vc-file-setprop file 'vc-state 'edited)))))))) 940 (vc-file-setprop file 'vc-checkout-time 0)
941 (if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
941 942
942 (provide 'vc-cvs) 943 (provide 'vc-cvs)
943 944
944 ;;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432 945 ;;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432
945 ;;; vc-cvs.el ends here 946 ;;; vc-cvs.el ends here