github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-11-26 11:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle newer CVS date formats like "2001/08/26 22:16:22" which break date-to-time

Browse source
This commit is contained in:
Steve Purcell 2012-10-20 20:22:14 +01:00
parent a69ee2af7e
commit 4b451f5dc7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package-build.el
View file

@ -82,7 +82,13 @@
"Parse STR as a time, and format as a YYYYMMDD.HHMM string." "Parse STR as a time, and format as a YYYYMMDD.HHMM string."
;; We remove zero-padding the HH portion, as it is lost ;; We remove zero-padding the HH portion, as it is lost
;; when stored in the archive-contents ;; when stored in the archive-contents
(let ((time (date-to-time (substring-no-properties str)))) (let* ((s (substring-no-properties str))
(time (condition-case nil
(date-to-time s)
('error
;; Handle newer CVS formats like "2001/08/26 22:16:22"
;; which break date-to-time
(date-to-time (replace-regexp-in-string "/" "-" s))))))
(concat (format-time-string "%Y%m%d." time) (concat (format-time-string "%Y%m%d." time)
(format "%d" (or (parse-integer (format-time-string "%H%M" time)) 0))))) (format "%d" (or (parse-integer (format-time-string "%H%M" time)) 0)))))
@ -286,6 +292,7 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(apply 'pb/run-process dir "cvs" "log" (apply 'pb/run-process dir "cvs" "log"
(pb/expand-source-file-list dir config)) (pb/expand-source-file-list dir config))
(or (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\} \\+[0-9]\\{2\\}[0-9]\\{2\\}\\)") (or (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\} \\+[0-9]\\{2\\}[0-9]\\{2\\}\\)")
(pb/find-parse-time-latest "date: \\([0-9]\\{4\\}/[0-9]\\{2\\}/[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\);")
(error "No valid timestamps found!")) (error "No valid timestamps found!"))
))) )))