Overview
Comment: | Added -prepend-contour when action is sync-prepend |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.64-envdebug |
Files: | files | file ages | folders |
SHA1: |
7e035f2f93ca42ea60a6438b1a2fa0a8 |
User & Date: | matt on 2017-04-10 22:42:52 |
Other Links: | branch diff | manifest | tags |
Context
2017-04-10
| ||
23:36 | fixed model in tab view check-in: 326a8e0ba4 user: pjhatwal tags: v1.64-envdebug | |
22:42 | Added -prepend-contour when action is sync-prepend check-in: 7e035f2f93 user: matt tags: v1.64-envdebug | |
19:08 | added tabbed view check-in: 1a6243bbfb user: pjhatwal tags: v1.64-envdebug | |
09:57 | Bump version to v1.6404 check-in: ba56fd8336 user: mrwellan tags: v1.64, v1.6404 | |
Changes
Modified megatest-version.scm from [f28f04440f] to [2192f48d99].
1 2 3 4 5 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00.. (declare (unit megatest-version)) | | | 1 2 3 4 5 6 7 | ;; Always use two or four digit decimal ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00.. (declare (unit megatest-version)) (define megatest-version 1.6404) |
Modified mtut.scm from [61b7ccaff4] to [2f0384f486].
︙ | ︙ | |||
109 110 111 112 113 114 115 | Called as " (string-intersperse (argv) " ") " Version " megatest-version ", built from " megatest-fossil-hash )) ;; args and pkt key specs ;; (define *arg-keys* | > | | | | | | > > | | > | < < < < < < | | | > > > > | | | | | | | | | | > | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | Called as " (string-intersperse (argv) " ") " Version " megatest-version ", built from " megatest-fossil-hash )) ;; args and pkt key specs ;; (define *arg-keys* '( ("-area" . G) ;; maps to group ("-contour" . c) ("-append-config" . d) ("-state" . e) ("-item-patt" . i) ("-sync-to" . k) ("-run-name" . n) ("-mode-patt" . o) ("-test-patt" . p) ;; idea, enhance margs ("-test-patt" "-testpatt") => yields one value in "-test-patt" ("-status" . s) ("-target" . t) ("-tag-expr" . x) ;; misc ("-debug" . #f) ;; for *verbosity* > 2 ("-load" . #f) ;; load and exectute a scheme file ("-log" . #f) ("-msg" . M) ("-start-dir" . S) ("-set-vars" . v) )) (define *switch-keys* '( ("-h" . #f) ("-help" . #f) ("--help" . #f) ("-manual" . #f) ("-version" . #f) ;; misc ("-repl" . #f) ("-immediate" . I) ("-preclean" . r) ("-rerun-all" . u) ("-prepend-contour" . w) )) ;; alist to map actions to old megatest commands (define *action-keys* '((run . "-run") (sync . "") (archive . "-archive") |
︙ | ︙ | |||
483 484 485 486 487 488 489 | (print " message: " ((condition-property-accessor 'exn 'message) exn)) runkey) ((hash-table-ref *target-mappers* xlatr-key) runkey new-runname area area-path reason contour mode-patt))) (begin (print "ERROR: Failed to find named target translator " xlatr-key ", using original target.") runkey))) | | > > > > > | | > | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 | (print " message: " ((condition-property-accessor 'exn 'message) exn)) runkey) ((hash-table-ref *target-mappers* xlatr-key) runkey new-runname area area-path reason contour mode-patt))) (begin (print "ERROR: Failed to find named target translator " xlatr-key ", using original target.") runkey))) runkey)) (actual-action (if action (if (equal? action "sync-prepend") "sync" action) "run"))) ;; this has gotten a bit ugly. Need a function to handle actions processing. ;; some hacks to remove switches not needed in certain cases (case (string->symbol (or action "run")) ((sync sync-prepend) (set! new-target #f) (set! runame #f))) (print "area-path: " area-path " area-xlatr: " area-xlatr " orig-target: " runkey " new-target: " new-target) (let-values (((uuid pkt) (command-line->pkt actual-action (append `(("-start-dir" . ,area-path) ("-msg" . ,reason) ("-contour" . ,contour)) (if (good-val new-runname) `(("-run-name" . ,new-runname)) '()) (if (good-val new-target) `(("-target" . ,new-target)) '()) (if (good-val mode-patt) `(("-mode-patt" . ,mode-patt)) '()) (if (good-val tag-expr) `(("-tag-expr" . ,tag-expr)) '()) (if (good-val dbdest) `(("-sync-to" . ,dbdest)) '()) (if (good-val append-conf) `(("-append-config" . ,append-conf)) '()) (if (equal? action "sync-prepend") '(("-prepend-contour" . " ")) '()) (if (not (or mode-patt tag-expr)) `(("-testpatt" . "%")) '()) (if (or (not action) (equal? action "run")) `(("-preclean" . " ") ("-rerun-all" . " ")) ;; if run we *always* want preclean set, use single space as placeholder |
︙ | ︙ | |||
598 599 600 601 602 603 604 | (crontab (alist-ref 'cron val-alist)) ;; (action (alist-ref 'action val-alist)) (cron-safe-string (string-translate (string-intersperse (string-split (alist-ref 'cron val-alist)) "-") "*" "X")) (runname std-runname)) ;; (conc "sched" (time->string (seconds->local-time (current-seconds)) "%M%H%d"))))) ;; (print "last-run: " last-run " need-run: " need-run) ;; (if need-run (case (string->symbol action) | | | 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 | (crontab (alist-ref 'cron val-alist)) ;; (action (alist-ref 'action val-alist)) (cron-safe-string (string-translate (string-intersperse (string-split (alist-ref 'cron val-alist)) "-") "*" "X")) (runname std-runname)) ;; (conc "sched" (time->string (seconds->local-time (current-seconds)) "%M%H%d"))))) ;; (print "last-run: " last-run " need-run: " need-run) ;; (if need-run (case (string->symbol action) ((sync sync-prepend) (if (common:extended-cron crontab #f last-sync) (push-run-spec torun contour runkey `((message . ,(conc ruletype ":sync-" cron-safe-string)) (action . ,action) (dbdest . ,(alist-ref 'dbdest val-alist)) (append . ,(alist-ref 'appendconf val-alist)))))) ((run) |
︙ | ︙ | |||
784 785 786 787 788 789 790 | (dbdest (alist-ref 'dbdest runkeydat)) (append (alist-ref 'append runkeydat)) (target (or (alist-ref 'target runkeydat) runkey))) ;; override with target if forced (print "Have: runkey=" runkey " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt " target=" target) (if (case (or (and action (string->symbol action)) 'noaction) ;; ensure we have the needed data to run this action ((noaction) #f) ((run) (and runname reason)) | | | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 | (dbdest (alist-ref 'dbdest runkeydat)) (append (alist-ref 'append runkeydat)) (target (or (alist-ref 'target runkeydat) runkey))) ;; override with target if forced (print "Have: runkey=" runkey " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt " target=" target) (if (case (or (and action (string->symbol action)) 'noaction) ;; ensure we have the needed data to run this action ((noaction) #f) ((run) (and runname reason)) ((sync sync-prepend) (and reason dbdest)) (else #f)) ;; instead of unwrapping the runkeydat alist, pass it directly to create-run-pkt (create-run-pkt mtconf action area runkey runname mode-patt tag-expr pktsdir reason contour sched dbdest append runtrans) (print "ERROR: Missing info to make a " action " call: runkey=" runkey " contour=" contour " area=" area " tag-expr=" tag-expr " mode-patt=" mode-patt " dbdest=" dbdest) ))) all-areas)) runkeydats))) |
︙ | ︙ |
Modified runconfigs.config from [ec027ebaff] to [cd844a0844].
1 2 3 4 5 6 7 8 9 10 11 | # To get emacs font highlighing in the various megatest configs do this: # # Install emacs-goodies-el: # sudo apt install emacs-goodies-el # Add to your ~/.emacs file: # (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode)) # # example of a cron entry to run sync using db spec pgdb, with pgdb setting in file local.config # [a/b/c] | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # To get emacs font highlighing in the various megatest configs do this: # # Install emacs-goodies-el: # sudo apt install emacs-goodies-el # Add to your ~/.emacs file: # (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode)) # # example of a cron entry to run sync using db spec pgdb, with pgdb setting in file local.config # [a/b/c] all:scheduled:sync cron= 0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config quick:scheduled:sync cron= 0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config fast:scheduled:sync-prepend cron= 0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config [scriptinc ./gentargets.sh #{getenv USER}] # [v1.23/45/67] # tip will be replaced with hashkey? # [%/%/%] doesn't work |
︙ | ︙ |
Added utils/fslrept.scm version [a7525c0b51].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | (use json fmt posix) ;; abstract out the alist-ref a bit and re-order the params ;; (define-inline (aref dat key) (alist-ref key dat equal?)) ;; convert silly vectors in json data to nice clean alist ;; (define (to-alist inlst) (handle-exceptions exn (begin (print-call-chain) (print inlst)) (cond ((proper-list? inlst) (map to-alist inlst)) ((or (list? inlst) ;; it is a pair (pair? inlst)) (cons (car inlst) (to-alist (cdr inlst)))) ((vector? inlst) (to-alist (vector->list inlst))) (else inlst)))) ;; columnar line printer ;; (define (print-rows inlist) (define (print-line x) (cat (car x) (space-to 10)(pad/left 3 (cadr x)) (space-to 25)(pad/left 3 (caddr x)) )) (fmt #t (pad-char #\ (fmt-join/suffix print-line inlist nl)))) ;; from the command line pull branch, start-tag, end-tag ;; (define (extract-history branch start-tag end-tag) (let* ((data (to-alist ;; get all the data (with-input-from-pipe "fossil json timeline checkin -n 0" json-read))) (timeline (aref (aref data "payload") "timeline")) ;; extract the timeline alists (start-flag #f) (end-flag #f)) ;; now we have all needed data as a list of alists in time order, extract the ;; messages for given branch starting at start-tag and ending at end-tag (reverse ;; return results oldest to newest (filter (lambda (x) x) (map (lambda (entry) (let ((tags (aref entry "tags"))) (if (or (not tags) ;; eh? (not (list? tags))) (begin ;; (with-output-to-port (current-error-port) ;; (lambda () ;; (print "ERROR: bad entry. tags: " tags))) #f) (let* ((btag (car tags)) ;; first tag is the primary branch (tags (cdr tags)) ;; remainder are actual tags (cmt (aref entry "comment")) (usr (aref entry "user")) (tms (aref entry "timestamp"))) ;; (print "btag: " btag " tags: " tags " usr: " usr) (if (equal? btag branch) ;; we are on the branch (begin (if (member start-tag tags)(set! start-flag #t)) (let ((res (if (and start-flag (not end-flag)) `(,usr ,(time->string (seconds->local-time tms) "WW%U.%w %H:%M") ,cmt) #f))) (if (member end-tag tags)(set! end-flag #t)) res)) #f))))) (reverse timeline)))))) (define (process-fossil branch start-tag end-tag) (print-rows (extract-history branch start-tag end-tag))) ;; process command line args and dispatch the call to fossil processing ;; (if (and (> (length (argv)) 3) (< (length (argv)) 5)) (apply process-fossil (cdr (argv))) (begin ;; no inputs, exit with message (print "Usage: fslrept branch start-tag end-tag") )) |