Introduce :join() filter (#1348)

The filter allows to combine branches from multiple upstream
repos without a need to go though a push via Josh

Change: join-filter

Author: christian-schilling

docs/src/reference/filters.md

@@ -109,6 +109,11 @@ for all further ancestors (and so on).
 This special value `0000000000000000000000000000000000000000` can be used as a `<sha_n>` to filter
 commits that don't match any of the other shas.
 
+### Join multiple histories into one **:join(<sha_0>:filter_0,...,<sha_N>:filter_N)**
+
+Produce the history that would be the result of pushing the passed branches with the
+passed filters into the upstream.
+
 Filter order matters
 --------------------
 

josh-core/src/filter/grammar.pest

@@ -8,17 +8,22 @@ GROUP_START = _{ "[" }
 GROUP_END = _{ "]" }
 PATH = _{ (ALNUM | "/")+ }
 filter_path = { PATH }
+argument = { string | PATH }
+rev = { string | ALNUM+ }
 
-string = ${ "\"" ~ inner ~ "\"" }
+sstring = _{"\'" ~ inner ~ "\'"}
+dstring = _{"\"" ~ inner ~ "\""}
+string = ${ sstring | dstring }
 inner = @{ char* }
 char = {
-    !("\"" | "\\") ~ ANY
-    | "\\" ~ ("\"" | "\\" | "/" | "b" | "f" | "n" | "r" | "t" | "u")
+    !("\"" | "\'" | "\\") ~ ANY
+    | "\\" ~ ("\"" | "\'" | "\\" | "/" | "b" | "f" | "n" | "r" | "t" | "u")
 }
 
 filter_spec = { (
     filter_group
   | filter_rev
+  | filter_join
   | filter_replace
   | filter_squash
   | filter_presub
@@ -38,12 +43,22 @@ filter_noarg = { CMD_START ~ cmd }
 filter_rev = {
     CMD_START ~ "rev" ~ "("
     ~ NEWLINE*
-    ~ (argument ~ filter_spec)?
-    ~ (CMD_SEP+ ~ (argument ~ filter_spec))*
+    ~ (rev ~ filter_spec)?
+    ~ (CMD_SEP+ ~ (rev ~ filter_spec))*
     ~ NEWLINE*
     ~ ")"
 }
 
+filter_join = {
+    CMD_START ~ "join" ~ "("
+    ~ NEWLINE*
+    ~ (rev ~ filter_spec)?
+    ~ (CMD_SEP+ ~ (rev ~ filter_spec))*
+    ~ NEWLINE*
+    ~ ")"
+}
+
+
 filter_replace = {
     CMD_START ~ "replace" ~ "("
     ~ NEWLINE*
@@ -56,14 +71,12 @@ filter_replace = {
 filter_squash = {
     CMD_START ~ "squash" ~ "("
     ~ NEWLINE*
-    ~ (argument ~ ":" ~ string)?
-    ~ (CMD_SEP+ ~ (argument ~ ":" ~ string))*
+    ~ (rev ~ ":" ~ string)?
+    ~ (CMD_SEP+ ~ (rev ~ ":" ~ string))*
     ~ NEWLINE*
     ~ ")"
 }
 
-argument = { string | PATH }
-
 cmd = { ALNUM+ }
 
 file_entry = { dst_path ~ "=" ~ filter_spec }