Index: fossil-utils/fossilrebase.scm ================================================================== --- fossil-utils/fossilrebase.scm +++ fossil-utils/fossilrebase.scm @@ -116,21 +116,22 @@ ;; get cherrypicks ;; (define (get-cherry-picks db) (let* ((res '())) (for-each-row - (lambda (rowkey tag0 cherrypick do-commit usedate comment recomment) + (lambda (rowkey tag0 cherrypick firstmerge do-commit usedate comment recomment) (set! res (cons `((uuid . ,rowkey) (tag0 . ,tag0) (cherrypick . ,cherrypick) + (firstmerge . ,firstmerge) (do-commit . ,do-commit) (usedate . ,usedate) (comment . ,comment) (recomment . ,recomment)) res))) db ;; sort desc and the cons puts it back in correct order - "SELECT rowkey,tag0,cherrypick,do_commit,usedate,comment,recomment FROM timeline WHERE cherrypick != '' AND cherrypick NOT NULL ORDER BY timestamp_sec DESC;") + "SELECT rowkey,tag0,cherrypick,firstmerge,do_commit,usedate,comment,recomment FROM timeline WHERE cherrypick != '' AND cherrypick NOT NULL ORDER BY timestamp_sec DESC;") res)) ;; always private and same time as parent node + 1 second ;; ;; fossil branch new BRANCH-NAME BASIS ?OPTIONS? @@ -160,32 +161,39 @@ ;; (pp parent-info) ;; (print "") )))) (define (do-cherrypick db cherrypick dbfname) - (let* ((tag0 (alist-ref 'tag0 cherrypick)) - (uuid (alist-ref 'uuid cherrypick)) - (nodeinf (get-node-details db uuid)) - (nodedate (alist-ref 'timestamp nodeinf)) - (user (alist-ref 'user nodeinf)) - (targ (alist-ref 'cherrypick cherrypick)) ;; do fossil up to this node + (let* ((tag0 (alist-ref 'tag0 cherrypick)) + (uuid (alist-ref 'uuid cherrypick)) + (nodeinf (get-node-details db uuid)) + (nodedate (alist-ref 'timestamp nodeinf)) + (user (alist-ref 'user nodeinf)) + (targ (alist-ref 'cherrypick cherrypick)) ;; do fossil up to this node + (firstmerge (alist-ref 'firstmerge cherrypick)) (do-commit (alist-ref 'do-commit cherrypick)) ;; if yes do a commit - (usedate (alist-ref 'usedate cherrypick)) ;; if no use current time - (comment (alist-ref 'comment cherrypick)) - (recomment (alist-ref 'recomment cherrypick))) + (usedate (alist-ref 'usedate cherrypick)) ;; if no use current time + (comment (alist-ref 'comment cherrypick)) + (recomment (alist-ref 'recomment cherrypick))) (print "#======= Start of cherrypick for " uuid "=======") (print "fossil checkout " targ) + ;; first - do we have a firstmerge? + (if (and (string? firstmerge) + (> (string-length firstmerge) 0)) + (print "fossil merge " firstmerge)) + (print "fossil merge --cherrypick " uuid) (if #t ;;(member do-commit '("x" "yes")) (print "fossil commit -m '" (escape-string-for-bash comment) "' " (if (equal? usedate "no") "" (conc " --date-override '" nodedate "'")) " --user-override " user )) (print "if [[ $(fossil status | grep CONFLICT | wc -l) -gt 0 ]];then") - (print " echo HAVE CONFLICT - STOPPING") + (print " echo \"\nHAVE CONFLICT - STOPPING\n\"") + (print " echo \"cherry pick of " uuid " into " targ " resulted in conflicts\"") (print " exit 1") (print "else") (print " echo GOOD, marking node " uuid " as DONE") (print " refdb set " dbfname " timeline " uuid " status DONE") (print "fi") Index: fossil-utils/justtesting/sxml/_sheets.sxml ================================================================== --- fossil-utils/justtesting/sxml/_sheets.sxml +++ fossil-utils/justtesting/sxml/_sheets.sxml @@ -29,13 +29,13 @@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2")) (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta (http://purl.org/dc/elements/1.1/:date - "2020-05-31T05:18:38Z") + "2020-05-31T22:40:56Z") (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date - "2020-05-31T05:18:24Z"))) + "2020-05-31T22:40:29Z"))) (http://www.gnumeric.org/v10.dtd:Calculation (@ (MaxIterations "100") (ManualRecalc "0") (IterationTolerance "0.001") (FloatRadix "2") @@ -59,6 +59,6 @@ (http://www.gnumeric.org/v10.dtd:Cols "256")) "setup")) (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647"))) (http://www.gnumeric.org/v10.dtd:UIData - (@ (SelectedTab "3")))) + (@ (SelectedTab "0")))) Index: fossil-utils/justtesting/sxml/setup.sxml ================================================================== --- fossil-utils/justtesting/sxml/setup.sxml +++ fossil-utils/justtesting/sxml/setup.sxml @@ -8,11 +8,11 @@ (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) (http://www.gnumeric.org/v10.dtd:MaxCol "1") - (http://www.gnumeric.org/v10.dtd:MaxRow "9") + (http://www.gnumeric.org/v10.dtd:MaxRow "8") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name "Print_Area") @@ -74,37 +74,10 @@ (@ (PrintErrorsAs "GNM_PRINT_ERRORS_AS_DISPLAYED")))) (http://www.gnumeric.org/v10.dtd:Styles (http://www.gnumeric.org/v10.dtd:StyleRegion (@ (startRow "0") (startCol "0") - (endRow "65534") - (endCol "255")) - (http://www.gnumeric.org/v10.dtd:Style - (@ (WrapText "0") - (VAlign "GNM_VALIGN_BOTTOM") - (ShrinkToFit "0") - (Shade "0") - (Rotation "0") - (PatternColor "0:0:0") - (Locked "1") - (Indent "0") - (Hidden "0") - (HAlign "GNM_HALIGN_GENERAL") - (Format "General") - (Fore "0:0:0") - (Back "FFFF:FFFF:FFFF")) - (http://www.gnumeric.org/v10.dtd:Font - (@ (Unit "10") - (Underline "0") - (StrikeThrough "0") - (Script "0") - (Italic "0") - (Bold "0")) - "Sans"))) - (http://www.gnumeric.org/v10.dtd:StyleRegion - (@ (startRow "65535") - (startCol "0") (endRow "65535") (endCol "255")) (http://www.gnumeric.org/v10.dtd:Style (@ (WrapText "0") (VAlign "GNM_VALIGN_BOTTOM") Index: fossil-utils/justtesting/sxml/timeline.sxml ================================================================== --- fossil-utils/justtesting/sxml/timeline.sxml +++ fossil-utils/justtesting/sxml/timeline.sxml @@ -7,11 +7,11 @@ (HideGrid "0") (HideColHeader "0") (GridColor "0:0:0") (DisplayOutlines "1") (DisplayFormulas "0")) - (http://www.gnumeric.org/v10.dtd:MaxCol "15") + (http://www.gnumeric.org/v10.dtd:MaxCol "17") (http://www.gnumeric.org/v10.dtd:MaxRow "65535") (http://www.gnumeric.org/v10.dtd:Zoom "1") (http://www.gnumeric.org/v10.dtd:Names (http://www.gnumeric.org/v10.dtd:Name (http://www.gnumeric.org/v10.dtd:name @@ -106,25 +106,37 @@ (@ (Unit "243.8") (No "0"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "89.25") (No "1") (HardSize "1") - (Count "3"))) + (Count "2"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "51") (No "3") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "46.5") (No "4"))) + (@ (Unit "49.5") (No "4") (HardSize "1"))) (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "63.75") (No "5"))) (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "66.75") (No "11") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "140.2") (No "12") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "198.8") (No "13") (HardSize "1"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "104.2") (No "14"))) - (http://www.gnumeric.org/v10.dtd:ColInfo - (@ (Unit "78.75") (No "15")))) + (@ (Unit "70.5") (No "7") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "60.75") (No "9") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "34.5") (No "10") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "23.25") (No "11") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "63.75") (No "12") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "287.2") (No "13") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "213.8") (No "14") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "198.8") (No "15") (HardSize "1"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "104.2") (No "16"))) + (http://www.gnumeric.org/v10.dtd:ColInfo + (@ (Unit "78.75") (No "17")))) (http://www.gnumeric.org/v10.dtd:Rows (@ (DefaultSizePts "12.1")) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "0"))) (http://www.gnumeric.org/v10.dtd:RowInfo @@ -194,30 +206,30 @@ (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "488") (Hidden "1"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "489") (Count "4"))) (http://www.gnumeric.org/v10.dtd:RowInfo - (@ (Unit "13.5") (No "498") (Count "2"))) + (@ (Unit "13.5") (No "498") (Count "3"))) (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "503") (Hidden "1") (Count "65033")))) (http://www.gnumeric.org/v10.dtd:Selections - (@ (CursorRow "497") (CursorCol "7")) + (@ (CursorRow "65535") (CursorCol "5")) (http://www.gnumeric.org/v10.dtd:Selection - (@ (startRow "497") - (startCol "7") - (endRow "497") - (endCol "7")))) + (@ (startRow "65535") + (startCol "5") + (endRow "65535") + (endCol "5")))) (http://www.gnumeric.org/v10.dtd:SheetLayout - (@ (TopLeft "A463")) + (@ (TopLeft "A470")) (http://www.gnumeric.org/v10.dtd:FreezePanes (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1")))) (http://www.gnumeric.org/v10.dtd:Filters (http://www.gnumeric.org/v10.dtd:Filter - (@ (Area "A1:O65536")) + (@ (Area "A1:Q65536")) (http://www.gnumeric.org/v10.dtd:Field (@ (ValueType0 "v1.65-newview") (Value0 "60") (Type "expr") (Op0 "eq") Index: fossil-utils/justtesting/timeline.dat ================================================================== --- fossil-utils/justtesting/timeline.dat +++ fossil-utils/justtesting/timeline.dat cannot compute difference between binary files