mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

revset: add support for explicit substring:"..." prefix

Browse source 
git-branchless calls it a substring, so let's do the same.

FWIW, I copied literal:_ from Mercurial, but it's exact:_ in git-branchless.
I have no idea which one is preferred. Since this feature isn't released, we
can freely change it if exact:_ makes more sense.

https://github.com/arxanas/git-branchless/wiki/Reference:-Revsets#patterns
This commit is contained in:
Yuya Nishihara 2023-08-18 15:57:50 +09:00
parent 2062abdc9d
commit ebdc22a65e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/revsets.md
View file

@ -141,7 +141,7 @@ revsets (expressions) as arguments.
Functions that perform string matching support the following pattern syntax. Functions that perform string matching support the following pattern syntax.
* `"substring"`: Matches strings that contain `substring`. * `"string"`, `substring:"string"`: Matches strings that contain `string`.
* `literal:"string"`: Matches strings exactly equal to `string`. * `literal:"string"`: Matches strings exactly equal to `string`.
## Aliases ## Aliases

8
lib/src/revset.rs
View file

@ -1324,7 +1324,7 @@ fn parse_function_argument_to_string_pattern(
}; };
match kind.as_ref() { match kind.as_ref() {
"literal" => StringPattern::Literal(needle.clone()), "literal" => StringPattern::Literal(needle.clone()),
// TODO: maybe add explicit kind for substring match? "substring" => StringPattern::Substring(needle.clone()),
_ => { _ => {
// TODO: error span can be narrowed to the lhs node // TODO: error span can be narrowed to the lhs node
return Err(make_error(format!( return Err(make_error(format!(
@ -2699,6 +2699,12 @@ mod tests {
"foo".to_owned() "foo".to_owned()
))) )))
); );
assert_eq!(
parse(r#"branches(substring:"foo")"#),
Ok(RevsetExpression::branches(StringPattern::Substring(
"foo".to_owned()
)))
);
assert_eq!( assert_eq!(
parse(r#"branches("literal:foo")"#), parse(r#"branches("literal:foo")"#),
Ok(RevsetExpression::branches(StringPattern::Substring( Ok(RevsetExpression::branches(StringPattern::Substring(