/[emacs]/emacs/lisp/vc-cvs.el
ViewVC logotype

Diff of /emacs/lisp/vc-cvs.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by spiegel, Mon Oct 22 07:57:00 2001 UTC revision 1.27 by monnier, Sun Nov 25 23:52:51 2001 UTC
# Line 736  is non-nil." Line 736  is non-nil."
736               ;; revision               ;; revision
737               "/\\([^/]*\\)"               "/\\([^/]*\\)"
738               ;; timestamp               ;; timestamp
739               "/[A-Z][a-z][a-z]"       ;; week day (irrelevant)               "/\\([^/]*\\)"))
              " \\([A-Z][a-z][a-z]\\)" ;; month name  
              " *\\([0-9]*\\)"         ;; day of month  
              " \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\)"  ;; hms  
              " \\([0-9]*\\)"          ;; year  
              ;; optional conflict field  
              "\\(+[^/]*\\)?/"))  
740      (vc-file-setprop file 'vc-workfile-version (match-string 1))      (vc-file-setprop file 'vc-workfile-version (match-string 1))
741      ;; compare checkout time and modification time      ;; compare checkout time and modification time
742      (let ((second (string-to-number (match-string 6)))      (let ((mtime (nth 5 (file-attributes file)))
743            (minute (string-to-number (match-string 5)))            (system-time-locale "C"))
744            (hour (string-to-number (match-string 4)))        (cond ((equal (format-time-string "%c" mtime 'utc) (match-string 2))
           (day (string-to-number (match-string 3)))  
           (year (string-to-number (match-string 7)))  
           (month (/ (string-match  
                      (match-string 2)  
                      "xxxJanFebMarAprMayJunJulAugSepOctNovDec")  
                     3))  
           (mtime (nth 5 (file-attributes file))))  
       (cond ((equal mtime  
                     (encode-time second minute hour day month year 0))  
745               (vc-file-setprop file 'vc-checkout-time mtime)               (vc-file-setprop file 'vc-checkout-time mtime)
746               (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))               (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
747              (t              (t
748               (vc-file-setprop file 'vc-checkout-time 0)               (vc-file-setprop file 'vc-checkout-time 0)
749               (if set-state (vc-file-setprop file 'vc-state 'edited))))))               (if set-state (vc-file-setprop file 'vc-state 'edited))))))))
750     ;; entry with arbitrary text as timestamp            
    ;; (this means we should consider it modified)  
    ((looking-at  
      (concat "/[^/]+"  
              ;; revision  
              "/\\([^/]*\\)"  
              ;; timestamp (arbitrary text)  
              "/[^/]*"  
              ;; optional conflict field  
              "\\(+[^/]*\\)?/"))  
     (vc-file-setprop file 'vc-workfile-version (match-string 1))  
     (vc-file-setprop file 'vc-checkout-time 0)  
     (if set-state (vc-file-setprop file 'vc-state 'edited)))))  
   
751  (provide 'vc-cvs)  (provide 'vc-cvs)
752    
753  ;;; vc-cvs.el ends here  ;;; vc-cvs.el ends here

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26