7588 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Martin von Zweigbergk	4e125b6c2f	cli: move ci alias to config file ... I would like to delete this alias altogether. By moving it to the config to start with, users can start overriding it themselves, as `commit` or whatever they prefer.	2024-12-03 10:37:54 -08:00
dependabot[bot]	efe23be34a	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.5 to 3.27.6 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](f09c1c0a94...aa57810251) --- 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-03 10:41:49 -06:00
Yuya Nishihara	5db4f0bca0	cli: make jj desc and jj st aliases visible again ... This backs out commit fd271d39ad "cli: make `jj desc` and `jj st` aliases hidden." As we discussed in https://github.com/martinvonz/jj/pull/4811, completion of flags doesn't work for hidden aliases.	2024-12-03 23:10:24 +09:00
Yuya Nishihara	21a6a244b3	local_working_copy: move DirectoryToVisit closer to new snapshotter type	2024-12-03 11:13:46 +09:00
Yuya Nishihara	88c3008724	local_working_copy: move common parameters out of visit_directory() arguments ... The shared lifetime looks a bit wonky, but we don't have a reason to assign per-field lifetime right now.	2024-12-03 11:13:46 +09:00
Yuya Nishihara	1a1d36979a	local_working_copy: extract immutable part of snapshot() to separate struct ... I'll move common parameters to the snapshotter type.	2024-12-03 11:13:46 +09:00
Yuya Nishihara	4e2e9e9b69	local_working_copy: reorder code to place snapshot functions closer	2024-12-03 11:13:46 +09:00
Yuya Nishihara	94c6d6eaff	cli: leverage new settings.get(path) in merge-tools lookup ... We no longer need to clone the entire table to get around the path expression syntax of the config crate.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	13ccd92766	settings: do not store "debug.randomness-seed" in stringified form ... While this is a debug option, it doesn't make sense to store an integer value as a string. We can parse the environment variable instead. The variable is temporarily parsed into i64 because i64 is the integer type of TOML. toml_edit::Value doesn't implement any other integer conversion functions.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	3890e426e5	settings: migrate get() to StackedConfig, rename .stacked_config to .config ... The goal is to remove dependency on config::Config and replace the underlying table type to toml_edit::Table. Other StackedConfig::merge() users will be migrated in the next batch.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	8fadac4114	config: add StackedConfig method that looks up value from all layers ... This patch adds separate .get<T>(), .get_table(), and .get_value() methods because generic value types in toml_edit don't implement Deserialize. There's a bit of naming inconsistency right now. Low-level generic object is called an "item", whereas mid-level generic object is called a "value". These objects will become different types when we migrate to toml_edit.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	8557a0ff0a	config: add basic abstraction over &str, [&str], and &ConfigNamePathBuf ... We usually look up config objects with a static name, but commands like "jj config get" has to parse a user input as a config key. We could consolidate the name type to &ConfigNamePathBuf, but it would be inconvenient if all callers had to do config.get(&"..".parse()?). It's also undesirable to pass a raw user input in to .get() as a string. I originally considered making it support fallible conversion, but doing that would complicate error handling path. Not all functions should return an error. It's better to do fallible parsing at the call sites instead. A string config name is parsed into a temporary ConfigNamePathBuf object. If the allocation cost matters, the output path type can be abstracted.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	5946ef3880	settings: forward .get_table(key) to underlying config object ... This will help migrate away from config::Config. We'll probably need a better abstraction to preserve error source indication, but let's leave that for now. .get_table() isn't forwarded to .get::<T>() because ConfigTable won't implement Deserialize if we migrate to toml_edit.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	ba07c3bc54	config: reexport table and value types ... These types will be replaced with toml_edit::Table and ::Value respectively.	2024-12-03 09:42:47 +09:00
Yuya Nishihara	824cd132cc	local_working_copy: leverage iterator API of channel receiver	2024-12-03 09:39:17 +09:00
Yuya Nishihara	934a2ba478	local_working_copy: remove useless Result wrapping in snapshot()	2024-12-03 09:39:17 +09:00
Yuya Nishihara	d2c0d92fa2	local_working_copy: propagate read_dir error from snapshot()	2024-12-03 09:39:17 +09:00
Yuya Nishihara	8f55680787	local_working_copy: remove unneeded boxing of diff stream	2024-12-03 09:39:17 +09:00
dependabot[bot]	05fc855185	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.1.0 to 4.2.0 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](5f42d5af6c...38f3f10444) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 13:45:17 -06:00
dependabot[bot]	1783c69799	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [indexmap](https://github.com/indexmap-rs/indexmap), [syn](https://github.com/dtolnay/syn) and [tracing-subscriber](https://github.com/tokio-rs/tracing). Updates `indexmap` from 2.6.0 to 2.7.0 - [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/indexmap-rs/indexmap/compare/2.6.0...2.7.0) Updates `syn` from 2.0.89 to 2.0.90 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.89...2.0.90) Updates `tracing-subscriber` from 0.3.18 to 0.3.19 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.18...tracing-subscriber-0.3.19) --- updated-dependencies: - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tracing-subscriber dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 13:44:47 -06:00
Ilya Grigoriev	1f554e801f	cli util gc: document the fact that evolution log limits gc ... This is a followup to the discussion in https://github.com/martinvonz/jj/pull/4953#discussion_r1855328098	2024-12-02 09:09:57 -08:00
Yuya Nishihara	e5de0fc742	cargo: bump gix to 0.68.0	2024-12-02 00:33:35 +09:00
Yuya Nishihara	9b8a42cd4f	cargo: bump thiserror to 2.0.3 ... There are breaking changes in derive syntax, but appears that we don't have any bad parameter forms. https://github.com/dtolnay/thiserror/releases/tag/2.0.0	2024-12-02 00:33:35 +09:00
Essien Ita Essien	694dfb8722	jj-lib: abstract a lower-level api for fetching from git. ... * GitFetch{} separates `fetch()` from `import_refs()`. * This allows more control over the stages of the fetch so multiple fetches can happen before `import_refs` resolves the changes in the local jj repo. * Implement `git::fetch` in terms of the new api. * Add a test case for initial fetch from a repo without `HEAD` set. This tests the default branch retrieving behaviour. Issue: #4923	2024-12-01 12:22:09 +00:00
Remo Senekowitsch	a8c35db43d	completion: suggest file paths incrementally ... If there are multiple files in a subdirectory that are candidates for completion, only complete the common directory prefix to reduce the number of completion candidates shown at once. This matches the normal shell completion of file paths.	2024-12-01 11:06:36 +01:00
Yuya Nishihara	0ca6f00421	merged_tree: slightly adjust doc comment of inner trees() helpers	2024-11-30 10:20:43 +09:00
Yuya Nishihara	4931b2ba04	merged_tree: remove redundant .clone() from TreeDiffStreamImpl::new()	2024-11-30 10:20:43 +09:00
Yuya Nishihara	c741e3db39	merged_tree: use Merge<Tree> to represent pending trees in TreeDiffStreamImpl ... This seems a slightly better in that MergedTree no longer represent a subtree.	2024-11-30 10:20:43 +09:00
Yuya Nishihara	991b0e8b68	merged_tree: keep Arc<Store> globally in TreeDiffStreamImpl ... I'll replace treeN: MergedTree with Merge<Tree>, and it's simpler to just keep the store by TreeDiffStreamImpl.	2024-11-30 10:20:43 +09:00
Yuya Nishihara	a3ca6c6f46	tests: do not pass in commit objects loaded from different store ... For the same reason as 37c41d0eaf.	2024-11-30 10:20:43 +09:00
dependabot[bot]	aef61a6045	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.0.0 to 4.1.0 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](d8db0a86d3...5f42d5af6c) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-30 10:12:06 +09:00
Yuya Nishihara	36e83ed260	cli: move get_new_config_file_path() to commands::config ... There aren't any other callers internally, and it is a thin wrapper around ConfigEnv functions which can be easily implemented.	2024-11-30 10:01:35 +09:00
Yuya Nishihara	e1cd1a00e6	config: update comment about new config file creation ... Spotted while updating get_new_config_file_path() callers. "jj config path" isn't a command to create new config file.	2024-11-30 10:01:35 +09:00
Yuya Nishihara	ecf25a1d9b	tests: extract helper that instantiates StackedConfig with commit timestamp	2024-11-30 10:01:05 +09:00
Yuya Nishihara	da01734639	settings: own StackedConfig by UserSettings, migrate tests to use config layer ... UserSettings::get_*() will be changed to look up a merged value from StackedConfig, not from a merged config::Value. This will help migrate away from the config crate. Not all tests are ported to ConfigLayer::parse() because it seemed a bit odd to format!() a TOML document and parse it to build a table of configuration variables.	2024-11-30 10:01:05 +09:00
Yuya Nishihara	512d85bfad	config: add convenient function that constructs ConfigLayer from TOML string ... This will be used mainly in tests. The default layers might also be migrated to per-file layers constructed by ConfigLayer::parse().	2024-11-30 10:01:05 +09:00
Remo Senekowitsch	d76bcd9305	docs: clarify dynamic completion features	2024-11-29 21:22:38 +01:00
Ilya Grigoriev	1b96d27b66	cli git fetch: clarify the error for invalid branch names/globs ... Create a clearer error when a branch name contains `*`. Slightly clarify the error message for `?` in branch name/glob.	2024-11-29 11:27:05 -08:00
Ilya Grigoriev	d3a51cebb7	docs: add example glob to jj help git fetch ... I tried to clarify the text a bit as well.	2024-11-29 11:27:05 -08:00
dependabot[bot]	e4231f2ce3	cargo: bump libc from 0.2.166 to 0.2.167 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.166 to 0.2.167 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.167/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.166...0.2.167) --- 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-11-30 00:20:14 +09:00
dependabot[bot]	172fbd40f1	cargo: bump tracing in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [tracing](https://github.com/tokio-rs/tracing). Updates `tracing` from 0.1.40 to 0.1.41 - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.40...tracing-0.1.41) --- updated-dependencies: - dependency-name: tracing dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-28 20:56:42 -06:00
dependabot[bot]	18012f170f	github: bump EmbarkStudios/cargo-deny-action ... Bumps the github-dependencies group with 1 update: [EmbarkStudios/cargo-deny-action](https://github.com/embarkstudios/cargo-deny-action). Updates `EmbarkStudios/cargo-deny-action` from 2.0.2 to 2.0.3 - [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases) - [Commits](f87fcad0e6...2d8c9929d8) --- updated-dependencies: - dependency-name: EmbarkStudios/cargo-deny-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-28 20:56:32 -06:00
Remo Senekowitsch	5fcc549eab	completion: teach commands about files ... This is heavily based on Benjamin Tan's fish completions: https://gist.github.com/bnjmnt4n/9f47082b8b6e6ed2b2a805a1516090c8 Some differences include: - The end of a `--from`, `--to` ranges is also considered. - `jj log` is not completed (yet). It has a different `--revisions` argument that requires some special handling.	2024-11-28 15:34:39 +01:00
Martin von Zweigbergk	a5690beab5	test_merged_tree: avoid a temporary lifetime extension ... I think it's just clearer to assign the owned value to the variable than to assign a reference to a temporary value.	2024-11-27 18:53:28 -08:00
Martin von Zweigbergk	409be2e1c4	store: make get_tree() functions take owned repo path ... The function needs an owned value, so we might as well pass it one and avoid a few clone calls.	2024-11-27 18:53:28 -08:00
Martin von Zweigbergk	b9e93923a9	merged_tree: avoid two unnecessary clones	2024-11-27 18:53:28 -08:00
Yuya Nishihara	bf17067861	config: replace LayeredConfigs with StackedConfig ... Parsed --config-toml args are simply appended because the caller knows there should be no preloaded CommandArg layers.	2024-11-28 08:45:48 +09:00
Yuya Nishihara	08b1ebe934	config: extract remainder of LayeredConfigs methods to free functions	2024-11-28 08:45:48 +09:00
Yuya Nishihara	a890e1a7f8	config: move read_user/repo_config() methods to ConfigEnv	2024-11-28 08:45:48 +09:00
Yuya Nishihara	1d485b75b6	config: manage repo config path by ConfigEnv ... This will help migrate LayeredConfigs methods to ConfigEnv.	2024-11-28 08:45:48 +09:00