diff --git a/CHANGELOG.md b/CHANGELOG.md index 7548cc62e..5a2267596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b3643375e..76d76f01c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -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"] diff --git a/docs/config.md b/docs/config.md index e0a4aaf79..3127cd5ea 100644 --- a/docs/config.md +++ b/docs/config.md @@ -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).