7939 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benjamin Tan	dddeb8b526	lib: fix various typos ... This commit fixes typos unintentionally introduced in d9c68e08, when renaming `jj branch` to `jj bookmark`.	2024-12-21 02:46:24 +08:00
dependabot[bot]	7963536068	github: bump astral-sh/setup-uv in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv). Updates `astral-sh/setup-uv` from 4.2.0 to 5.0.1 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](38f3f10444...180f8b4439) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-20 09:43:22 -06:00
Yuya Nishihara	ef49643128	tests: use toml_edit::Value in more places	2024-12-20 19:28:01 +09:00
Yuya Nishihara	d7e0ab6119	tests: use toml_edit to escape editor path, set ui.editor instead of $EDITOR ... Most callers don't need the $EDITOR variable.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	36b7f007eb	tests: split test_describe() that doesn't depend on fake-editor ... Makes it clear that test_describe_editor_env() doesn't need edit_script.	2024-12-20 19:28:01 +09:00
Yuya Nishihara	124970c81b	tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()	2024-12-20 19:28:01 +09:00
Yuya Nishihara	7ab5b6852b	tests: accept convertible type by set_config_path(), add_config(), add_env_var() ... It's convenient. We occasionally pass format!()-ed value to these functions.	2024-12-20 19:28:01 +09:00
Tim Janik	e3c8dce06a	docs/config.md: the op log needs a builtin_op_log_* template ... Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-20 06:15:34 +01:00
Jochen Kupperschmidt	07e01c1ba6	docs: Git does not use bookmarks	2024-12-19 20:59:45 -08:00
Anton Älgmyr	85adde923a	Add links to release and license badges	2024-12-20 02:07:07 +01:00
Yuya Nishihara	89d3a8b8b7	config: remove check for relative path patterns, add doc about path equivalence ... I originally added the check so we would never canonicalize path relative to random cwd, but Windows CI failed because "/" is a relative path. Suppose user would want to share the same configuration file between native Windows and WSL, this check would be too nitpicky.	2024-12-20 09:23:46 +09:00
George Tsiamasiotis	843e0edcf7	jj-lib: fix typo in tests	2024-12-19 11:35:44 -08:00
George Tsiamasiotis	79421c6685	cli: fix typo in comment	2024-12-19 11:35:44 -08:00
George Tsiamasiotis	9ea329f03f	changelog: fix typo	2024-12-19 11:35:44 -08:00
dependabot[bot]	c9b78dd5d3	cargo: bump libc from 0.2.168 to 0.2.169 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [libc](https://github.com/rust-lang/libc). Updates `libc` from 0.2.168 to 0.2.169 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.169/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.168...0.2.169) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-19 12:41:38 -06:00
Yuya Nishihara	f5d450d7c3	cli: resolve conditional config scopes ... This is an alternative way to achieve includeIf of Git without adding "include" directive. Conditional include (or include in general) is a bit trickier to implement than loading all files and filtering the contents. Closes #616	2024-12-19 11:09:02 +09:00
Yuya Nishihara	1a0d3ae3d7	cli: keep separate copy of "raw" StackedConfig loaded from files ... The next patch will introduce the resolution stage of conditional tables. Since it wasn't easy to detect misuse of "raw" StackedConfig, I added a thin newtype.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	38d0ca7234	cli: just parse config args in helper function, apply them by caller ... I'm going to add config post-processing stage in order to enable config variables conditionally, and handle/parse_early_args() doesn't have enough information to evaluate the condition. The deprecation warning could be emitted by parse_early_args(), but it's probably better to print it after --color option is applied.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	eecb8d0746	cli: normalize repository path specified by -R ... This will simplify path comparison in config resolver. <cwd>/.. shouldn't match path prefix <cwd>. Maybe we should do path canonicalization globally (or never do canonicalization), but I'm not sure where that should be made.	2024-12-19 11:09:02 +09:00
Yuya Nishihara	dc9caa5b0a	config: add function to resolve conditional tables ... This provides an inline version of Git's includeIf. The idea is that each config layer has an optional key "--when" to enable the layer, and a layer may have multiple sub-layer tables "--scope" to inline stuff. Layers can be nested, but that wouldn't be useful in practice. I choose "--" prefix to make these meta keys look special (and are placed earlier in lexicographical order), but I don't have strong opinion about that. We can use whatever names that are unlikely to conflict with the other config sections. resolve() isn't exported as a StackedConfig method because it doesn't make sense to call resolve() on "resolved" StackedConfig. I'll add a newtype in CLI layer to distinguish raw config from resolved one. Most consumers will just see the "resolved" config. #616	2024-12-19 11:09:02 +09:00
Yuya Nishihara	7d46207fa6	config: wrap ConfigLayer in Arc so it can be cheaply cloned ... ConfigLayers will be cloned to new StackedConfig instance at resolution stage. ConfigFile could own ConfigLayer instead of Arc<_>, but copy-on-write behavior is probably better for the current users.	2024-12-19 11:09:02 +09:00
Stephen Jennings	3316180dc1	config: Add commit_timestamp(commit) template alias ... Adds an extension point for changing which date is displayed in log formats. The function should return a timestamp, not a formatted string.	2024-12-18 17:55:03 -08:00
Martin von Zweigbergk	822f01648d	cli: refer to revset argument using REVSET(S) in synopsis ... This should help clarify that the arguments are not just simple change ids or commit ids.	2024-12-18 10:13:44 -08:00
Martin von Zweigbergk	a414441dd6	cli: refer to fileset argument using FILESETS in synopsis ... This should help clarify that the arguments are not just simple paths (assuming `ui.allow-filesets` is not disabled).	2024-12-18 10:13:44 -08:00
dependabot[bot]	02497e6a12	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [clap_complete](https://github.com/clap-rs/clap) and [thiserror](https://github.com/dtolnay/thiserror). Updates `clap_complete` from 4.5.39 to 4.5.40 - [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.39...clap_complete-v4.5.40) Updates `thiserror` from 2.0.7 to 2.0.8 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.7...2.0.8) --- updated-dependencies: - dependency-name: clap_complete 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-18 10:16:05 -06:00
dependabot[bot]	26becafd9f	github: bump actions/upload-artifact in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4.4.3 to 4.5.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](b4b15b8c7c...6f51ac03b9) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-18 10:15:50 -06:00
Tim Janik	779272c105	cli/src/diff_util.rs: fix typo in diff --name-only ... cli/tests/cli-reference@.md.snap: update snapshots Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-18 14:04:40 +01:00
Yuya Nishihara	6bbaf79ca5	settings: parse TOML date-time value as well as string timestamp ... We can usually omit quotes in --config=NAME=VALUE, but an RFC3339 string is a valid TOML date-time expression. It's weird that quoting is required to specify a date-time value.	2024-12-18 09:51:56 +09:00
Yuya Nishihara	4f08c62fe5	settings: propagate error from UserSettings::from_config() ... All variables parsed here are debug options, but it would be annoying if timestamp options were silently ignored because of a typo.	2024-12-18 09:51:56 +09:00
Yuya Nishihara	8fc06690d2	settings: cache "debug.operation-timestamp" value ... This will make error handling easier in later commit.	2024-12-18 09:51:56 +09:00
Martin von Zweigbergk	b836e0ae95	docs/cli: update URLs to from martinvonz user to jj-vcs org ... We just migrated to the jj-vcs GitHub org, so we should point to the new GitHub URLs.	2024-12-17 12:44:44 -08:00
dependabot[bot]	867e204d91	cargo: bump clap_complete in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [clap_complete](https://github.com/clap-rs/clap). Updates `clap_complete` from 4.5.38 to 4.5.39 - [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.38...clap_complete-v4.5.39) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-17 20:45:31 +01:00
dploch	396833f803	absorb: move core functionality from cli to lib	2024-12-17 14:42:30 -05:00
scored wrench	2a563039a5	docs: fix incorrect gitignore path	2024-12-17 10:02:55 -08:00
Yuya Nishihara	f87c6ed337	cli: deprecate --config-toml ... Typical usage should now be covered by --config=NAME=VALUE. Closes #3867	2024-12-17 20:12:12 +09:00
Yuya Nishihara	abf48576ea	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
Scott Taylor	d75cc94c64	gitignore: remove FIXME comment about passing path ... I looked through the code for the `ignore` crate, and this optional path is not used anywhere. The only reason to pass it would be to be able to get the path from the `Glob` when we call `Gitignore::matched` or `Gitignore::matched_path_or_any_parents`, but we ignore the returned `Glob` completely anyway. Passing the path would require an unnecessary clone of the path for each line in every .gitignore file, so it's better not to pass it since we don't need it.	2024-12-16 21:02:56 -06:00
Yuya Nishihara	60078e9887	cli: add simpler --config=NAME=VALUE argument ... This supersedes #3867. I'll probably replace all uses of --config-toml and mark --config-toml as deprecated.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	7a1e27daed	completion: pass --config-file down to jj command ... Spotted while adding --config NAME=VALUE.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	17ad708e44	cli: externalize ConfigArg value from enum, group arguments of the same type ... This will simplify handling of multiple ConfigArg items of the same type. Consecutive --config NAME=VALUE arguments will be inserted to the same ConfigLayer.	2024-12-17 10:33:29 +09:00
Yuya Nishihara	3f115cbea5	cli: parse "jj config set" value a bit stricter, report syntax error ... The same parsing function will be used for --config NAME=VALUE. I don't think we'll add schema-based type inference anytime soon, so I moved the value parsing to clap layer.	2024-12-17 10:33:29 +09:00
Milo Moisson	acaf7afc5b	docs: document JJ_LOG and --debug	2024-12-17 01:51:35 +01:00
Milo Moisson	f3a9b6d84b	cli_util: use JJ_LOG to specify log configuration ... Using the default `RUST_LOG` env var, conflicts when working on rust projects.	2024-12-17 01:51:35 +01:00
Scott Taylor	9591523db4	gitignore: add more detail to errors on invalid pattern	2024-12-16 18:49:48 -06:00
Scott Taylor	7f1d902f57	snapshot: demo unreadable error message on invalid ignore ... A user on Discord ran into this error message, and they were confused about why they were getting it. The next commit will improve the error messages.	2024-12-16 18:49:48 -06:00
Tim Janik	25117d7d01	docs/github.md: Useful Revsets: fix revset for @ ancestry without remotes ... This also fixes a mismatch between using ::@ to list ancestors and calling them descendants. Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-16 21:23:09 +01:00
dependabot[bot]	d57425964e	github: bump dtolnay/rust-toolchain in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain). Updates `dtolnay/rust-toolchain` from 1482605bfc5719782e1267fd0c0cc350fe7646b8 to a54c7afa936fefeb4456b2dd8068152669aa8203 - [Release notes](https://github.com/dtolnay/rust-toolchain/releases) - [Commits](1482605bfc...a54c7afa93) --- updated-dependencies: - dependency-name: dtolnay/rust-toolchain dependency-type: direct:production dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 10:49:31 -06:00
dependabot[bot]	740ee76eeb	cargo: bump thiserror in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [thiserror](https://github.com/dtolnay/thiserror). Updates `thiserror` from 2.0.6 to 2.0.7 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.6...2.0.7) --- updated-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-16 10:48:56 -06:00
Martin von Zweigbergk	8907e692d4	help: add more keyword topics (for jj help -k) ... We have the keyword-help feature now so let's use it a bit more. I'm not sure how we should advertise it better, but that's a different topic anyway.	2024-12-15 23:10:31 -08:00
Matt Kulukundis	c82483b088	cli: make split more explicit that it uses filesets	2024-12-15 18:44:19 -05:00