7659 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yuya Nishihara	f4fdc19d9e	working_copy: plumbing to propagate untracked paths to caller	2024-12-11 20:19:51 +09:00
Yuya Nishihara	e1936a2e8b	docs: suggest "jj bookmark move" where makes sense ... Closes #5067	2024-12-11 10:37:45 +09:00
Yuya Nishihara	32ee480942	formatter: leverage serde to parse color styles ... Here we don't use an untagged enum to dispatch deserializer by type. An untagged enum wouldn't propagate underlying parse errors.	2024-12-11 10:37:34 +09:00
Yuya Nishihara	7ae1a97d2b	formatter: rename Style fields to match configuration keys ... We could rename fields at serde layer, but it's probably better to use the same names if possible.	2024-12-11 10:37:34 +09:00
Yuya Nishihara	564ce044fb	ui: define default ui.color in config/misc.toml, use serde to parse value ... It looks a bit odd that FromStr is forwarded to Deserialize, not the other way around, but that's convenient because Deserialize can be derived.	2024-12-11 10:37:34 +09:00
dependabot[bot]	bcfe8ef783	github: bump github/codeql-action in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.27.6 to 3.27.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](aa57810251...babb554ede) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 14:52:58 -06:00
Yuya Nishihara	0975cb5374	cargo: drop dependency on config crate	2024-12-10 16:08:50 +09:00
Yuya Nishihara	118e76e5c2	config: add ConfigLoadError, replace uses of config::ConfigError	2024-12-10 16:08:50 +09:00
Yuya Nishihara	67f8a59643	config: remove unused ConfigEnvError variant, convert io::Error explicitly ... It wasn't obvious which io::Error was mapped to a "file creation" error. Perhaps, file creation will be moved to caller, but let's make the error handling explicit so we'll remove the unused error variant later.	2024-12-10 16:08:50 +09:00
Yuya Nishihara	4b1a057fd4	config: construct "unset" error without using config::ConfigError ... I also changed the error type from Config to User. They are failures of user action, not configuration.	2024-12-10 16:08:50 +09:00
Yuya Nishihara	1c7634fcf0	formatter: in tests, use IndexMap to preserve definition order of colors	2024-12-10 12:11:39 +09:00
Yuya Nishihara	1d58bdc8eb	config: preserve definition order of table items ... toml_edit uses IndexMap internally, so the order of table items is deterministic.	2024-12-10 12:11:39 +09:00
Yuya Nishihara	e2be4fa1ac	config: migrate underlying data structure to toml_edit ... This patch does not change the handling of inline tables yet. Both inline and non-inline tables are merged as before. OTOH, .set_value() is strict about table types because it should refuse to overwrite a table whereas an inline table should be overwritten as a value. This matches "jj config set"/"unset" semantics. rules_from_config() in formatter.rs uses .as_inline_table(), which is valid because toml_edit::Value type never contains non-inline table. Since toml_edit::Value doesn't implement PartialEq, stacking tests now use insta::assert_snapshot!().	2024-12-10 12:11:39 +09:00
Yuya Nishihara	45c80c2a5f	local_working_copy: optimize path comparison in prefixed file states ... Since all entries in filtered file states share the same directory prefix, we don't need to compare full file paths. The added functions take (path, name) instead of (path, sub_path) because the comparison can be slightly faster if the name is guaranteed to be a single path component. Benchmark: 1. original (omitted) 2. per-directory spawn (omitted) 3. per-directory deleted files (previous patch) 4. shorter path comparison (this patch) gecko-dev (~357k files, ~25k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 480.1 ms ± 8.8 ms [User: 3190.5 ms, System: 2127.2 ms] Range (min … max): 471.2 ms … 509.8 ms 30 runs Benchmark 4: target/release-with-debug/jj-4 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 404.0 ms ± 4.4 ms [User: 1933.4 ms, System: 2148.8 ms] Range (min … max): 396.4 ms … 416.9 ms 30 runs Relative speed comparison 1.19 ± 0.03 target/release-with-debug/jj-3 -R ~/mirrors/gecko-dev debug snapshot 1.00 target/release-with-debug/jj-4 -R ~/mirrors/gecko-dev debug snapshot ``` linux (~87k files, ~6k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 204.2 ms ± 3.0 ms [User: 667.3 ms, System: 545.6 ms] Range (min … max): 197.1 ms … 209.2 ms 30 runs Benchmark 4: target/release-with-debug/jj-4 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 191.3 ms ± 3.3 ms [User: 467.4 ms, System: 542.2 ms] Range (min … max): 186.1 ms … 200.6 ms 30 runs Relative speed comparison 1.07 ± 0.02 target/release-with-debug/jj-3 -R ~/mirrors/linux debug snapshot 1.00 target/release-with-debug/jj-4 -R ~/mirrors/linux debug snapshot ``` nixpkgs (~45k files, ~31k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 173.3 ms ± 6.7 ms [User: 899.4 ms, System: 889.0 ms] Range (min … max): 166.5 ms … 197.9 ms 30 runs Benchmark 4: target/release-with-debug/jj-4 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 161.7 ms ± 2.5 ms [User: 739.1 ms, System: 881.7 ms] Range (min … max): 156.5 ms … 166.4 ms 30 runs Relative speed comparison 1.07 ± 0.04 target/release-with-debug/jj-3 -R ~/mirrors/nixpkgs debug snapshot 1.00 target/release-with-debug/jj-4 -R ~/mirrors/nixpkgs debug snapshot ``` git (~4.5k files, 0.2k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 30 --runs 50 .. Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/git debug snapshot Time (mean ± σ): 28.8 ms ± 1.0 ms [User: 33.0 ms, System: 37.6 ms] Range (min … max): 26.8 ms … 31.3 ms 50 runs Benchmark 4: target/release-with-debug/jj-4 -R ~/mirrors/git debug snapshot Time (mean ± σ): 28.8 ms ± 1.9 ms [User: 30.3 ms, System: 36.5 ms] Range (min … max): 26.0 ms … 39.2 ms 50 runs Relative speed comparison 1.00 target/release-with-debug/jj-3 -R ~/mirrors/git debug snapshot 1.00 ± 0.08 target/release-with-debug/jj-4 -R ~/mirrors/git debug snapshot ```	2024-12-10 10:51:04 +09:00
Yuya Nishihara	8caec186c1	local_working_copy: filter deleted files per directory (or job) ... This greatly reduces the amount of paths to be sent over the channel and the strings to be hashed. Benchmark: 1. original (omitted) 2. per-directory spawn (previous patch) 3. per-directory deleted files (this patch) 4. shorter path comparison (omitted) gecko-dev (~357k files, ~25k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 710.7 ms ± 9.1 ms [User: 3070.7 ms, System: 2142.6 ms] Range (min … max): 695.9 ms … 740.1 ms 30 runs Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 480.1 ms ± 8.8 ms [User: 3190.5 ms, System: 2127.2 ms] Range (min … max): 471.2 ms … 509.8 ms 30 runs Relative speed comparison 1.76 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/gecko-dev debug snapshot 1.19 ± 0.03 target/release-with-debug/jj-3 -R ~/mirrors/gecko-dev debug snapshot ``` linux (~87k files, ~6k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 242.3 ms ± 3.3 ms [User: 656.8 ms, System: 538.0 ms] Range (min … max): 236.9 ms … 252.3 ms 30 runs Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 204.2 ms ± 3.0 ms [User: 667.3 ms, System: 545.6 ms] Range (min … max): 197.1 ms … 209.2 ms 30 runs Relative speed comparison 1.27 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/linux debug snapshot 1.07 ± 0.02 target/release-with-debug/jj-3 -R ~/mirrors/linux debug snapshot ``` nixpkgs (~45k files, ~31k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 190.7 ms ± 4.1 ms [User: 859.3 ms, System: 881.1 ms] Range (min … max): 184.6 ms … 202.4 ms 30 runs Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 173.3 ms ± 6.7 ms [User: 899.4 ms, System: 889.0 ms] Range (min … max): 166.5 ms … 197.9 ms 30 runs Relative speed comparison 1.18 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/nixpkgs debug snapshot 1.07 ± 0.04 target/release-with-debug/jj-3 -R ~/mirrors/nixpkgs debug snapshot ``` git (~4.5k files, 0.2k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 30 --runs 50 .. Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/git debug snapshot Time (mean ± σ): 30.6 ms ± 1.1 ms [User: 33.8 ms, System: 39.0 ms] Range (min … max): 29.0 ms … 35.0 ms 50 runs Benchmark 3: target/release-with-debug/jj-3 -R ~/mirrors/git debug snapshot Time (mean ± σ): 28.8 ms ± 1.0 ms [User: 33.0 ms, System: 37.6 ms] Range (min … max): 26.8 ms … 31.3 ms 50 runs Relative speed comparison 1.06 ± 0.05 target/release-with-debug/jj-2 -R ~/mirrors/git debug snapshot 1.00 target/release-with-debug/jj-3 -R ~/mirrors/git debug snapshot ```	2024-12-10 10:51:04 +09:00
Yuya Nishihara	99d8703d3b	local_working_copy: spawn snapshot job per directory with file count threshold ... This change basically means two things: a. a directory scan isn't split into too many small jobs, and b. a directory scan isn't blocked by recursive visit_directory() calls. Before, small jobs were created at each recursion depth, so there were silent time slice before these jobs started producing work. I don't know if this mitigates the issue #4508, but it's slightly faster on my Linux machine. matcher.visit(dir) is moved to caller because it's silly to spawn an empty job. TreeState::snapshot() already checks that for the root path. Benchmark: 1. original 2. per-directory spawn (this patch) 3. per-directory deleted files (omitted) 4. shorter path comparison (omitted) gecko-dev (~357k files, ~25k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 1: target/release-with-debug/jj-1 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 764.9 ms ± 16.7 ms [User: 3274.7 ms, System: 2183.3 ms] Range (min … max): 731.9 ms … 814.2 ms 30 runs Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/gecko-dev debug snapshot Time (mean ± σ): 710.7 ms ± 9.1 ms [User: 3070.7 ms, System: 2142.6 ms] Range (min … max): 695.9 ms … 740.1 ms 30 runs Relative speed comparison 1.89 ± 0.05 target/release-with-debug/jj-1 -R ~/mirrors/gecko-dev debug snapshot 1.76 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/gecko-dev debug snapshot ``` linux (~87k files, ~6k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 1: target/release-with-debug/jj-1 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 268.2 ms ± 11.3 ms [User: 636.6 ms, System: 518.5 ms] Range (min … max): 247.5 ms … 295.2 ms 30 runs Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/linux debug snapshot Time (mean ± σ): 242.3 ms ± 3.3 ms [User: 656.8 ms, System: 538.0 ms] Range (min … max): 236.9 ms … 252.3 ms 30 runs Relative speed comparison 1.40 ± 0.06 target/release-with-debug/jj-1 -R ~/mirrors/linux debug snapshot 1.27 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/linux debug snapshot ``` nixpkgs (~45k files, ~31k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 3 --runs 30 .. Benchmark 1: target/release-with-debug/jj-1 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 201.0 ms ± 8.5 ms [User: 929.3 ms, System: 917.6 ms] Range (min … max): 170.3 ms … 218.5 ms 30 runs Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/nixpkgs debug snapshot Time (mean ± σ): 190.7 ms ± 4.1 ms [User: 859.3 ms, System: 881.1 ms] Range (min … max): 184.6 ms … 202.4 ms 30 runs Relative speed comparison 1.24 ± 0.06 target/release-with-debug/jj-1 -R ~/mirrors/nixpkgs debug snapshot 1.18 ± 0.03 target/release-with-debug/jj-2 -R ~/mirrors/nixpkgs debug snapshot ``` git (~4.5k files, 0.2k dirs) ``` % JJ_CONFIG=/dev/null hyperfine --sort command --warmup 30 --runs 50 .. Benchmark 1: target/release-with-debug/jj-1 -R ~/mirrors/git debug snapshot Time (mean ± σ): 30.3 ms ± 1.1 ms [User: 40.5 ms, System: 39.4 ms] Range (min … max): 28.3 ms … 35.7 ms 50 runs Benchmark 2: target/release-with-debug/jj-2 -R ~/mirrors/git debug snapshot Time (mean ± σ): 30.6 ms ± 1.1 ms [User: 33.8 ms, System: 39.0 ms] Range (min … max): 29.0 ms … 35.0 ms 50 runs Relative speed comparison 1.05 ± 0.05 target/release-with-debug/jj-1 -R ~/mirrors/git debug snapshot 1.06 ± 0.05 target/release-with-debug/jj-2 -R ~/mirrors/git debug snapshot ``` - CPU: 8-core AMD Ryzen 7 PRO 4750U with Radeon Graphics (-MT MCP-) - speed/min/max: 1600/1400/1700 MHz Kernel: 6.11.10-amd64 x86_64 - Filesystem: ext4	2024-12-10 10:51:04 +09:00
Yuya Nishihara	e98589a15a	local_working_copy: extract loop body of visit_directory() to function ... It's annoying that rustfmt indents a large code block depending on the length of parameters and method calls needed to configure the parallel iterator.	2024-12-10 10:51:04 +09:00
Yuya Nishihara	60d3354923	local_working_copy: extract function that visits gitignore-d tracked files ... .try_for_each_with() wasn't needed because mpsc::Sender can be Sync from Rust 1.72.0.	2024-12-10 10:51:04 +09:00
Yuya Nishihara	6d23d5ac8b	local_working_copy: extract helper function that emits new file value and state ... visit_directory() is big. Let's make it fit in one screen.	2024-12-10 10:51:04 +09:00
dependabot[bot]	632c07216f	cargo: bump the cargo-dependencies group with 6 updates ... Bumps the cargo-dependencies group with 6 updates: | Package | From | To | | --- | --- | --- | | [chrono](https://github.com/chronotope/chrono) | `0.4.38` | `0.4.39` | | [libc](https://github.com/rust-lang/libc) | `0.2.167` | `0.2.168` | | [pest](https://github.com/pest-parser/pest) | `2.7.14` | `2.7.15` | | [pest_derive](https://github.com/pest-parser/pest) | `2.7.14` | `2.7.15` | | [rustix](https://github.com/bytecodealliance/rustix) | `0.38.41` | `0.38.42` | | [thiserror](https://github.com/dtolnay/thiserror) | `2.0.4` | `2.0.6` | Updates `chrono` from 0.4.38 to 0.4.39 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.38...v0.4.39) Updates `libc` from 0.2.167 to 0.2.168 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.168/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.167...0.2.168) Updates `pest` from 2.7.14 to 2.7.15 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.14...v2.7.15) Updates `pest_derive` from 2.7.14 to 2.7.15 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.14...v2.7.15) Updates `rustix` from 0.38.41 to 0.38.42 - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Changelog](https://github.com/bytecodealliance/rustix/blob/main/CHANGELOG.md) - [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.41...v0.38.42) Updates `thiserror` from 2.0.4 to 2.0.6 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.4...2.0.6) --- updated-dependencies: - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest_derive dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 10:11:15 +09:00
Martin von Zweigbergk	27c2882b10	progress: fix progress to not redraw every time there's new data ... I think the idea of the code was try do 30 updates per second even if events arrive at, say, every 20 milliseconds. If we had reset the timer every time we printed, we would otherwise reset the timer every 40 milliseconds and end up with 25 updates per second. However, a bug in the code caused it to print every update because it always set the threshold to print the next update to `now`. I tried to keep what I think was the intent of the original code while fixing the bug.	2024-12-09 17:08:56 -08:00
Martin von Zweigbergk	4fc539b801	progress: add test of progress bar's periodic output ... The progress bar is supposed to update only 30 times per second, but as was reported in #5057, that doesn't seem to be what's happening. This patch adds tests showing how we update the progress bar for every event.	2024-12-09 17:08:56 -08:00
Yuya Nishihara	0017747f53	cargo: bump url and idna to address security advisory ... https://rustsec.org/advisories/RUSTSEC-2024-0421	2024-12-09 23:16:59 +09:00
Yuya Nishihara	ec14d0820b	cli: replace uses of .get_table() to include better error indication ... This will also help migrate to toml_edit, where a value type doesn't provide a deserialization helper.	2024-12-09 10:09:23 +09:00
Yuya Nishihara	514803dc09	config: add method to iterate over merged table keys ... .get_table() callers will be migrated to .table_keys() + .get() to attach source indication to error message. It might be a bit more expensive, but we can get by without introducing table wrapper that tracks source config layers.	2024-12-09 10:09:23 +09:00
Yuya Nishihara	6b67d5eeec	cli: drop support for deprecated (singular) [alias] section ... This will simplify config API migration. It's been deprecated since jj 0.7.0.	2024-12-09 10:09:23 +09:00
Yuya Nishihara	8c4ba4a144	diff: fix unified diff to emit one-lower start line number for empty hunks ... Both Mercurial and Git (xdiff) have a special case for empty hunks. https://repo.mercurial-scm.org/hg/rev/2b1ec74c961f I also changed the internal line numbers to start from 0 so we wouldn't have to think about whether "N - 1" would underflow. Fixes #5049	2024-12-09 09:52:07 +09:00
Vamsi Avula	0794f87324	templates: align attributes in builtin_log_detailed ... Change-Id: Id00000003feb0508bf7f08e0a0275ba7f7695b70	2024-12-08 15:17:43 +05:30
Yuya Nishihara	6c72a3d1c1	docs: revert string formatting change of "jj help util exec" ... Appears that "cargo test" parses indented text as a code block, and fails to run doc tests. Spotted by running "cargo insta test". This doc comment is a CLI help which is usually rendered to console, so I think markdown annotation should be minimal. This backs out commit ed84468cb8, "docs: in `jj help util exec`, use Markdown `warning` admonition."	2024-12-08 18:04:26 +09:00
Yuya Nishihara	85816f2c9b	settings: explicitly convert integer to HumanByteSize ... Since config::Value type was lax about data types, an integer value could be deserialized through a string. This won't apply to new toml_edit-based value types.	2024-12-08 09:19:35 +09:00
Yuya Nishihara	2461602b56	settings: extract HumanByteSize parsing wrapper to FromStr trait ... I'm going to rewrite the deserialization constructor to accept either integer or string, but the from_str() API is generally useful. This patch also fixes lifetime of the parse error message.	2024-12-08 09:19:35 +09:00
Yuya Nishihara	b681df0c93	config: add .get_value_with() to handle type not implementing Deserialize ... The serde::Deserialize interface isn't always useful. Suppose we're going to make parsing of color tables stricter, we would have to process a string|table value. It could be encoded as an untagged enum in serde, but that means the error message has to be static str (e.g. "expected string or color table") and a detailed error (e.g. "invalid color name: xxx") would be lost. It's way easier to dispatch based on the ConfigValue type, than on serde data model.	2024-12-08 09:19:35 +09:00
Yuya Nishihara	f3a44ca56b	config: omit uninteresting toml_edit::Decor { .. } from test snapshots ... It was noisy, and we would see more Decor { .. } when we migrate the value types to toml_edit.	2024-12-08 09:19:26 +09:00
Yuya Nishihara	b560e72222	config: remove PartialEq from AnnotatedValue ... toml_edit::Value doesn't implement PartialEq.	2024-12-08 09:19:26 +09:00
Waleed Khan	652d16369a	docs: in sparse-v2.md, use Markdown warning admonition ... Renders more nicely on the documentation website.	2024-12-07 13:50:44 -08:00
Waleed Khan	129ea5262f	docs: in contributing.md, use Markdown warning admonition ... This has special rendering on the website, which makes it stand out more clearly.	2024-12-07 13:50:44 -08:00
Waleed Khan	ed84468cb8	docs: in jj help util exec, use Markdown warning admonition ... We're scraping the CLI help text and rendering it as markdown, so we can use an "admonition" to have this warning text render nicer in the web documentation. You could argue that `!!! warning` is a little weird to see on the CLI. Some alternatives: - We could opt to not design the CLI help text around markdown and skip the change to the `jj util exec` help in this commit. - We could adopt some kind of format that can be rendered well in both contexts. - Could sticking to specific formatting constructs by convention. - Could use/create an actual translation tool from CLI format to Markdwon. - We could keep separate versions of web and CLI documentation. (Seems like a bad idea for the foreseeable future, because we don't have the resources to constantly keep both up-to-date and sync.) I'm in favor of just writing Markdown in the CLI help text for now.	2024-12-07 13:50:44 -08:00
Yuya Nishihara	da3c75b3cb	config: add convenient method to insert value into layer, migrate callers ... The current implementation is silly, which will be reimplemented to be using toml_edit::DocumentMut. "jj config set" will probably be ported to this API.	2024-12-07 11:06:21 +09:00
Yuya Nishihara	4e1b71b6b1	cli: load default/command-arg layers per source, clean up return types ... This patch removes pre-merge steps which depend on the ConfigBuilder API. Some of Vec<ConfigLayer> could be changed to Vec<config::Config> (or Vec<ConfigTable>) to drop the layer parameter, but I'm not sure which is better. parse_config_args() will have to construct ConfigLayer (or ConfigTable + Option<PathBuf>) if we add support for --config-file=PATH argument.	2024-12-07 11:06:21 +09:00
Yuya Nishihara	d226bc2762	config: extract helper method that inserts multiple layers ... Default configuration will be split to per-source layers.	2024-12-07 11:06:21 +09:00
Yuya Nishihara	a7339244b8	ui: define default ui.quiet and .progress-indicator in config/misc.toml	2024-12-07 11:06:21 +09:00
Yuya Nishihara	3a38d7a670	ui: inline and simplify one-line config.get() functions	2024-12-07 11:06:21 +09:00
Martin von Zweigbergk	256218d1e5	cli: respect $NO_COLOR only if it's non-empty ... This is what the spec says.	2024-12-06 17:37:10 -08:00
Martin von Zweigbergk	66723276fc	cli: make crossterm not respect NO_COLOR ... The `NO_COLOR` spec says that user-specified config is supposed to override the `$NO_COLOR` environment variable, and we do correctly use the `ColorFormatter` when `ui.color= "always"` is set in the user's config. However, it turns out that `NO_COLOR=1` still resulted in no color because `crossterm` also respects the variable, so the color codes the `ColorFormatter` requested had no effect. Since `crossterm` doesn't know about our user configs, it cannot decide whether to respect `$NO_COLOR`, so let's tell `crossterm` to always use the colors we tell it to use.	2024-12-06 17:37:10 -08:00
Martin von Zweigbergk	23f9cc7a4f	tests: fix test to show that NO_COLOR=1 results in no color ... This reproduces the problem in reported in #5041.	2024-12-06 17:37:10 -08:00
Remo Senekowitsch	8c6024c71f	completion: teach log about files	2024-12-06 20:44:43 +01:00
dependabot[bot]	6288b184ec	cargo: bump clap from 4.5.22 to 4.5.23 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [clap](https://github.com/clap-rs/clap). Updates `clap` from 4.5.22 to 4.5.23 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.22...clap_complete-v4.5.23) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-06 10:35:16 -06:00
Martin von Zweigbergk	b7ba3fc0be	docs: update installation docs to say that cmake is needed ... Since we enabled the `zlib-ng` feature from `gix` in 2412fd4, `cmake` is needed when installing from source.	2024-12-06 08:23:27 -08:00
Yuya Nishihara	f58145b47d	cargo: enable zlib-ng and fast sha1 in gix ... I noticed miniz_oxide appears in perf samples. While miniz_oxide is safer, I think zlib-ng is pretty reliable. https://docs.rs/gix/latest/gix/#performance libz-ng-sys is downgraded to 1.1.16 due to the Windows linking issue. The benchmark result is obtained with libz-ng-sys 1.1.20. https://github.com/rust-lang/libz-sys/issues/225 ``` % hyperfine --sort command --warmup 3 --runs 10 -L bin jj-0,jj-1 \ 'target/release-with-debug/{bin} --ignore-working-copy log README.md' Benchmark 1: target/release-with-debug/jj-0 .. Time (mean ± σ): 256.6 ms ± 4.3 ms [User: 214.1 ms, System: 38.6 ms] Range (min … max): 245.4 ms … 261.2 ms 10 runs Benchmark 2: target/release-with-debug/jj-1 .. Time (mean ± σ): 223.0 ms ± 4.2 ms [User: 174.7 ms, System: 44.4 ms] Range (min … max): 212.4 ms … 225.8 ms 10 runs ```	2024-12-06 14:38:44 +09:00
Yuya Nishihara	c0ce88003e	config: introduce our ConfigGetError type ... Since most callers don't need to handle loading/parsing errors, it's probably better to add a separate error type for "get" operations. The other uses of ConfigError will be migrated later. Since ConfigGetError can preserve the source name/path information, this patch also removes some ad-hock error handling codes.	2024-12-06 10:52:10 +09:00