mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-13 06:06:56 +03:00
48580ed8b1
The `--allow-large-revsets` flag we have on `jj rebase` and `jj new` allows the user to do e.g. `jj rebase --allow-large-revsets -b main.. -d main` to rebase all commits that are not in main onto main. The reason we don't allow these revsets to resolve to multiple commits by default is that we think users might specify multiple commits by mistake. That's probably not much of a problem with `jj rebase -b` (maybe we should always allow that to resolve to multiple commits), but the user might want to know if `jj rebase -d @-` resolves to multiple commits. One problem with having a flag to allow multiple commits is that it needs to be added to every command where we want to allow multiple commits but default to one. Also, it should probably apply to each revset argument those commands take. For example, even if the user meant `-b main..` to resolve to multiple commits, they might not have meant `-d main` to resolve to multiple commits (which it will in case of a conflicted branch), so we might want separate `--allow-large-revsets-in-destination` and `--allow-large-revsets-in-source`, which gets quite cumbersome. It seems better to have some syntax in the individual revsets for saying that multiple commits are allowed. One proposal I had was to use a `multiple()` revset function which would have no effect in general but would be used as a marker if used at the top level (e.g. `jj rebase -d 'multiple(@-)'`). After some discussion on the PR adding that function (#1911), it seems that the consensus is to instead use a prefix like `many:` or `all:`. That avoids the problem with having a function that has no effect unless it's used at the top level (`jj rebase -d 'multiple(x)|y'` would have no effect). Since we already have the `:` operator for DAG ranges, we need to change it to make room for `many:`/`all:` syntax. This commit starts that by allowing both `:` and `::`. I have tried to update the documentation in this commit to either mention both forms, or just the new and preferred `::` form. However, it's useless to search for `:` in Rust code, so I'm sure I've missed many instances. We'll have to address those as we notice them. I'll let most tests use `:` until we deprecate it or delete it.
71 lines
1.5 KiB
Plaintext
71 lines
1.5 KiB
Plaintext
# Revsets to pass to `jj bench revsets` on the Git
|
|
|
|
# Single tags
|
|
v1.0.0
|
|
v2.40.0
|
|
# Old history
|
|
::v1.0.0
|
|
..v1.0.0
|
|
# More history
|
|
::v2.40.0
|
|
..v2.40.0
|
|
# Only recent history
|
|
v2.39.0..v2.40.0
|
|
::v2.40.0 ~ ::v2.39.0
|
|
v2.39.0::v2.40.0
|
|
# Tags and branches
|
|
tags()
|
|
branches()
|
|
# Intersection of range with a small subset
|
|
tags() & ::v2.40.0
|
|
v2.39.0 & ::v2.40.0
|
|
# Author and committer
|
|
author(peff)
|
|
committer(gitster)
|
|
# Intersection and union of large subsets
|
|
author(peff) & committer(gitster)
|
|
author(peff) | committer(gitster)
|
|
# Intersection of filter with a small subset
|
|
::v1.0.0 & (author(peff) & committer(gitster))
|
|
::v1.0.0 & (author(peff) | committer(gitster))
|
|
# Roots and heads of small subsets
|
|
roots(tags())
|
|
heads(tags())
|
|
# Roots and heads of large subsets
|
|
roots(author(peff))
|
|
heads(author(peff))
|
|
# Roots and heads of range
|
|
roots(::v2.40.0)
|
|
heads(::v2.40.0)
|
|
# Parents and ancestors of old commit
|
|
v1.0.0-
|
|
v1.0.0---
|
|
::v1.0.0---
|
|
# Children and descendants of old commit
|
|
v1.0.0+
|
|
v1.0.0+++
|
|
v1.0.0+++::
|
|
# Parents and ancestors of recent commit
|
|
v2.40.0-
|
|
v2.40.0---
|
|
::v2.40.0---
|
|
# Children and descendants of recent commit
|
|
v2.40.0+
|
|
v2.40.0+++
|
|
v2.40.0+++::
|
|
# Parents and ancestors of small subset
|
|
tags()-
|
|
tags()---
|
|
::tags()---
|
|
# Children and descendants of small subset
|
|
tags()+
|
|
tags()+++
|
|
tags()+++::
|
|
# Filter that doesn't read commit object
|
|
merges()
|
|
~merges()
|
|
# These are unbearably slow, so only filter within small set
|
|
file(Makefile) & v1.0.0..v1.2.0
|
|
empty() & v1.0.0..v1.2.0
|
|
conflict() & v1.0.0..v1.2.0
|