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
|
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
|
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
|
;; given branch and baseline commit generate list of commands to cherry pick commits
;;
;;
;; Usage: fsl-rebase basecommit branch
;;
(use regex posix)
(let* ((basecommit (cadr (argv)))
(branch (caddr (argv)))
(cmd (conc "fossil timeline after " basecommit " -n 1000000 -W 0"))
(theregex (conc ;; "^[^\\]]+"
;; "\\[([\\]]+)\\]\\s+"
;; "(.*)"
"\\[([a-z0-9]+)\\]\\s+"
"(.*)"
"\\s+\\(.*tags:\\s+" branch
;; ".*\\)"
)))
(print "basecommit: " basecommit ", branch: " branch ", theregex: " theregex ", cmd: \"" cmd "\"")
(with-input-from-pipe
cmd
(lambda ()
(let loop ((inl (read-line)))
(let loop ((inl (read-line))
(res '()))
(if (not (eof-object? inl))
(let ((have-match (string-search theregex inl)))
(if have-match
(loop (read-line)
(cons (conc "fossil merge --cherrypick " (cadr have-match)
"\nfossil commit -m \"Cherry pick from " (cadr have-match)
": " (caddr have-match) "\"")
res))
(loop (read-line) res)))
(map print res))))))
(print "match: " inl)
(print "no match: " theregex " " inl))
(loop (read-line))))))))
|