ok/jj

Yuya Nishihara 4474577ceb fileset: parse cwd/root-glob patterns

Mercurial appears to resolve cwd-relative path first, so "glob:*.c" could be
parsed as "**/*.c" if cwd was literally "**". It wouldn't practically matter,
but isn't correct. Instead, jj's parser first splits glob into literal part
and pattern. That's mainly because we want to parse the user input texts into
type-safe objects, and (RepoPathBuf, glob::Pattern) pairs are the simplest
ones. The current parser can't handle patterns like "foo/*/.." (= "foo" ?),
and errors out. I believe this restriction is acceptable.

Unlike literal paths, the 'glob:' pattern anchors to the whole file path. I
don't think "prefix"-matching glob is useful, and making it the default would
be rather confusing.

2024-04-18 11:09:54 +09:00

2 KiB

Raw Blame History

Filesets

Jujutsu supports a functional language for selecting a set of files. Expressions in this language are called "filesets" (the idea comes from Mercurial). The language consists of file patterns, operators, and functions.

Filesets support is still experimental. It can be enabled by ui.allow-filesets.

ui.allow-filesets = true

File patterns

The following patterns are supported:

"path", path (the quotes are optional), or cwd:"path": Matches cwd-relative path prefix (file or files under directory recursively.)
cwd-file:"path" or file:"path": Matches cwd-relative file (or exact) path.
cwd-glob:"pattern" or glob:"pattern": Matches file paths with cwd-relative Unix-style shell wildcard pattern. For example, glob:"*.c" will match all .c files in the current working directory non-recursively.
root:"path": Matches workspace-relative path prefix (file or files under directory recursively.)
root-file:"path": Matches workspace-relative file (or exact) path.
root-glob:"pattern": Matches file paths with workspace-relative Unix-style shell wildcard pattern.

Operators

The following operators are supported. x and y below can be any fileset 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.

You can use parentheses to control evaluation order, such as (x & y) | z or x & (y | z).

Functions

You can also specify patterns by using functions.

all(): Matches everything.
none(): Matches nothing.

Examples

Show diff excluding Cargo.lock.

jj diff '~Cargo.lock'

List files in src excluding Rust sources.

jj files 'src ~ glob:"**/*.rs"'

Split a revision in two, putting foo into the second commit.

jj split '~foo'

2 KiB Raw Blame History