Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cargo: enable the watchman feature by default #2234

Merged
merged 1 commit into from
Sep 8, 2023
Merged

cargo: enable the watchman feature by default #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
to limit the depth of the ancestor set. For example, use `jj log -r
'ancestors(@, 5)` to view the last 5 commits.

* Support for the Watchman filesystem monitor is now bundled by default. Set
`core.fsmonitor = "watchman"` in your repo to enable.

### Fixed bugs

## [0.9.0] - 2023-09-06
Expand Down
4 changes: 2 additions & 2 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ test-case = { workspace = true }
testutils = { workspace = true }

[features]
default = []
default = ["watchman"]
bench = ["dep:criterion"]
packaging = ["watchman"]
packaging = []
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
watchman = ["jj-lib/watchman"]
8 changes: 0 additions & 8 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,14 +526,6 @@ snapshots without having to rescan the entire working copy.

### Watchman

The [Watchman filesystem monitor](https://facebook.github.io/watchman/) is
currently only enabled if you compile jj with the `watchman` feature, such as
with the following invocation:

```shell
cargo install --git https://github.com/martinvonz/jj.git --locked --bin jj jj-cli --features watchman
```

To configure the Watchman filesystem monitor, set
`core.fsmonitor = "watchman"`. Ensure that you have [installed the Watchman
executable on your system](https://facebook.github.io/watchman/docs/install).
Expand Down