[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el
From: |
André Spiegel |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el |
Date: |
Fri, 26 Sep 2003 03:23:36 -0400 |
Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.64 emacs/lisp/vc-cvs.el:1.65
*** emacs/lisp/vc-cvs.el:1.64 Wed Sep 24 07:55:45 2003
--- emacs/lisp/vc-cvs.el Fri Sep 26 03:23:36 2003
***************
*** 5,11 ****
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-cvs.el,v 1.64 2003/09/24 11:55:45 spiegel Exp $
;; This file is part of GNU Emacs.
--- 5,11 ----
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <address@hidden>
! ;; $Id: vc-cvs.el,v 1.65 2003/09/26 07:23:36 spiegel Exp $
;; This file is part of GNU Emacs.
***************
*** 921,943 ****
"\\(.*\\)")) ;Sticky tag
(vc-file-setprop file 'vc-workfile-version (match-string 1))
(vc-file-setprop file 'vc-cvs-sticky-tag
! (vc-cvs-parse-sticky-tag (match-string 4) (match-string
5)))
;; Compare checkout time and modification time.
;; This is intentionally different from the algorithm that CVS uses
! ;; (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)))))))))
(provide 'vc-cvs)
--- 921,943 ----
"\\(.*\\)")) ;Sticky tag
(vc-file-setprop file 'vc-workfile-version (match-string 1))
(vc-file-setprop file 'vc-cvs-sticky-tag
! (vc-cvs-parse-sticky-tag (match-string 4)
! (match-string 5)))
;; Compare checkout time and modification time.
;; 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)))
! (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))))))))
(provide 'vc-cvs)