mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-30 16:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

docs: sort list of operators in order of binding strengths

Browse source 
We can add a separate precedence/associativity table, but I think the ordered
list is good enough. Nullary :: and .. have no binding, but inserted after the
infix versions for brevity.
This commit is contained in:
Yuya Nishihara 2024-06-06 16:19:26 +09:00
parent 539edad216
commit 186f639dfb
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/filesets.md
View file

@ -46,10 +46,12 @@ The following patterns are supported:
The following operators are supported. `x` and `y` below can be any fileset The following operators are supported. `x` and `y` below can be any fileset
expressions. expressions.
* `x & y`: Matches both `x` and `y`.
* `x | y`: Matches either `x` or `y` (or both).
* `x ~ y`: Matches `x` but not `y`.
* `~x`: Matches everything but `x`. * `~x`: Matches everything but `x`.
* `x & y`: Matches both `x` and `y`.
* `x ~ y`: Matches `x` but not `y`.
* `x | y`: Matches either `x` or `y` (or both).
(listed in order of binding strengths)
You can use parentheses to control evaluation order, such as `(x & y) | z` or You can use parentheses to control evaluation order, such as `(x & y) | z` or
`x & (y | z)`. `x & (y | z)`.

24
docs/revsets.md
View file

@ -50,24 +50,26 @@ Jujutsu attempts to resolve a symbol in the following order:
The following operators are supported. `x` and `y` below can be any revset, not The following operators are supported. `x` and `y` below can be any revset, not
only symbols. only symbols.
* `x & y`: Revisions that are in both `x` and `y`.
* `x | y`: Revisions that are in either `x` or `y` (or both).
* `x ~ y`: Revisions that are in `x` but not in `y`.
* `~x`: Revisions that are not in `x`.
* `x-`: Parents of `x`. * `x-`: Parents of `x`.
* `x+`: Children of `x`. * `x+`: Children of `x`.
* `::x`: Ancestors of `x`, including the commits in `x` itself.
* `x::`: Descendants of `x`, including the commits in `x` itself. * `x::`: Descendants of `x`, including the commits in `x` itself.
* `x::y`: Descendants of `x` that are also ancestors of `y`. Equivalent * `x..`: Revisions that are not ancestors of `x`.
to `x:: & ::y`. This is what `git log` calls `--ancestry-path x..y`. * `::x`: Ancestors of `x`, including the commits in `x` itself.
* `::`: All visible commits in the repo. Equivalent to `all()`.
* `x..y`: Ancestors of `y` that are not also ancestors of `x`. Equivalent to
`::y ~ ::x`. This is what `git log` calls `x..y` (i.e. the same as we call it).
* `..x`: Ancestors of `x`, including the commits in `x` itself, but excluding * `..x`: Ancestors of `x`, including the commits in `x` itself, but excluding
the root commit. Equivalent to `::x ~ root()`. the root commit. Equivalent to `::x ~ root()`.
* `x..`: Revisions that are not ancestors of `x`. * `x::y`: Descendants of `x` that are also ancestors of `y`. Equivalent
to `x:: & ::y`. This is what `git log` calls `--ancestry-path x..y`.
* `x..y`: Ancestors of `y` that are not also ancestors of `x`. Equivalent to
`::y ~ ::x`. This is what `git log` calls `x..y` (i.e. the same as we call it).
* `::`: All visible commits in the repo. Equivalent to `all()`.
* `..`: All visible commits in the repo, but excluding the root commit. * `..`: All visible commits in the repo, but excluding the root commit.
Equivalent to `~root()`. Equivalent to `~root()`.
* `~x`: Revisions that are not in `x`.
* `x & y`: Revisions that are in both `x` and `y`.
* `x ~ y`: Revisions that are in `x` but not in `y`.
* `x | y`: Revisions that are in either `x` or `y` (or both).
(listed in order of binding strengths)
You can use parentheses to control evaluation order, such as `(x & y) | z` or You can use parentheses to control evaluation order, such as `(x & y) | z` or
`x & (y | z)`. `x & (y | z)`.

2
docs/templates.md
View file

@ -35,6 +35,8 @@ The following operators are supported.
* `x || y`: Logical or, short-circuiting. * `x || y`: Logical or, short-circuiting.
* `x ++ y`: Concatenate `x` and `y` templates. * `x ++ y`: Concatenate `x` and `y` templates.
(listed in order of binding strengths)
## Global functions ## Global functions
The following functions are defined. The following functions are defined.