Mercurial > emacs
comparison lisp/vc-hooks.el @ 17642:565cdf5446e2
(vc-find-cvs-master): Accept ...+ in a normal entry.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 04 May 1997 06:49:53 +0000 |
parents | 9df604cbe7cc |
children | c6e694b6de26 |
comparison
equal
deleted
inserted
replaced
17641:4650d25e48f6 | 17642:565cdf5446e2 |
---|---|
784 (setq case-fold-search nil) | 784 (setq case-fold-search nil) |
785 (cond | 785 (cond |
786 ;; normal entry | 786 ;; normal entry |
787 ((re-search-forward | 787 ((re-search-forward |
788 (concat "^/" (regexp-quote basename) | 788 (concat "^/" (regexp-quote basename) |
789 "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)") | 789 "/\\([^/]*\\)/\\([^/+]*\\+\\)?[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)") |
790 nil t) | 790 nil t) |
791 (setq case-fold-search fold) ;; restore the old value | 791 (setq case-fold-search fold) ;; restore the old value |
792 ;; We found it. Store away version number now that we | 792 ;; We found it. Store away version number now that we |
793 ;; are anyhow so close to finding it. | 793 ;; are anyhow so close to finding it. |
794 (vc-file-setprop file | 794 (vc-file-setprop file |
795 'vc-workfile-version | 795 'vc-workfile-version |
796 (match-string 1)) | 796 (match-string 1)) |
797 ;; If the file hasn't been modified since checkout, | 797 ;; If the file hasn't been modified since checkout, |
798 ;; store the checkout-time. | 798 ;; store the checkout-time. |
799 (let ((mtime (nth 5 (file-attributes file))) | 799 (let ((mtime (nth 5 (file-attributes file))) |
800 (second (string-to-number (match-string 6))) | 800 (second (string-to-number (match-string 7))) |
801 (minute (string-to-number (match-string 5))) | 801 (minute (string-to-number (match-string 6))) |
802 (hour (string-to-number (match-string 4))) | 802 (hour (string-to-number (match-string 5))) |
803 (day (string-to-number (match-string 3))) | 803 (day (string-to-number (match-string 4))) |
804 (year (string-to-number (match-string 7)))) | 804 (year (string-to-number (match-string 8)))) |
805 (if (equal mtime | 805 (if (equal mtime |
806 (encode-time | 806 (encode-time |
807 second minute hour day | 807 second minute hour day |
808 (/ (string-match | 808 (/ (string-match |
809 (match-string 2) | 809 (match-string 3) |
810 "xxxJanFebMarAprMayJunJulAugSepOctNovDec") | 810 "xxxJanFebMarAprMayJunJulAugSepOctNovDec") |
811 3) | 811 3) |
812 year 0)) | 812 year 0)) |
813 (vc-file-setprop file 'vc-checkout-time mtime) | 813 (vc-file-setprop file 'vc-checkout-time mtime) |
814 (vc-file-setprop file 'vc-checkout-time 0))) | 814 (vc-file-setprop file 'vc-checkout-time 0))) |