7463 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ilya Grigoriev	4ecf75efc1	docs config diff-editor: clean up, change KDiff3 example to Meld ... I don't think recommending KDIff3 for diff editing is good advice in most cases (as opposed to merge conflict resolution, for which KDiff3 is very good). OTOH, trying Meld for diff editing is a good idea for many people. Historically, this part of the docs uses KDiff3 because it was written when `meld` was the default and `:builtin` did not exist.	2024-11-04 19:14:18 -08:00
dependabot[bot]	6a74199b4f	github: bump DeterminateSystems/nix-installer-action ... Bumps the github-dependencies group with 1 update: [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action). Updates `DeterminateSystems/nix-installer-action` from 14 to 15 - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](da36cb69b1...b92f66560d) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-04 18:59:38 -06:00
dependabot[bot]	068336f3a3	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [clap_complete](https://github.com/clap-rs/clap), [syn](https://github.com/dtolnay/syn) and [thiserror](https://github.com/dtolnay/thiserror). Updates `clap_complete` from 4.5.36 to 4.5.37 - [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.36...clap_complete-v4.5.37) Updates `syn` from 2.0.86 to 2.0.87 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.86...2.0.87) Updates `thiserror` from 1.0.66 to 1.0.67 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.66...1.0.67) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn 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-11-04 18:04:33 +01:00
Yuya Nishihara	987bb5e0bd	cli: util: don't use formatter to print raw data ... I don't think escape sequences in those contents should be escaped depending on the output device.	2024-11-04 13:33:37 +09:00
Yuya Nishihara	8f9d1a955f	cli: util: sort sub commands lexicographically	2024-11-04 13:33:37 +09:00
Yuya Nishihara	7d327d482a	cli: util: insert underscore to markdown-help command function name	2024-11-04 13:33:37 +09:00
Yuya Nishihara	09f9443417	cli: util: move command function closer to enum definition	2024-11-04 13:33:37 +09:00
Yuya Nishihara	0f7a4bf564	cli: util: split sub commands into modules	2024-11-04 13:33:37 +09:00
Yuya Nishihara	ce601efa3e	cli: bench: hyphenate command and bench names ... I don't think the names (without dashes) matter here.	2024-11-04 13:33:28 +09:00
Yuya Nishihara	541376b944	cli: bench: place command dispatcher function closer to enum definition	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0ae282180a	cli: bench: split sub commands into modules	2024-11-04 13:33:28 +09:00
Yuya Nishihara	1c3a988371	cli: bench: extract sub commands to functions	2024-11-04 13:33:28 +09:00
Yuya Nishihara	0a73245b82	revset: move RevsetCommitRef::Root to RevsetExpression ... For the same reason as the previous patch. It's nice if root() is considered a "resolved" expression. With this change, most of the evaluate_programmatic() callers won't have to do symbol resolution at all.	2024-11-04 09:20:46 +09:00
Yuya Nishihara	0e8f1ce579	revset: move RevsetCommitRef::VisibleHeads to RevsetExpression ... I'm going to add RevsetExpression<State = Resolved|User> type parameter to detect API misuse at compile time. VisibleHeads is similar to All, and appears in generic expression substitution function where a concrete State type shouldn't be known.	2024-11-04 09:20:46 +09:00
Yuya Nishihara	e38f7b0594	revset: add RevsetExpression::present() as there's an external caller	2024-11-04 09:20:46 +09:00
Yuya Nishihara	a740eaeb86	revset: add convenient method that extracts symbol name from expression	2024-11-04 09:20:46 +09:00
Yuya Nishihara	12eb5c5515	revset: split "resolved" variant from RevsetExpression::AtOperation ... This ensures that a symbol-resolved at_operation() expression won't be resolved again when it's intersected with another expression, for example. # in CLI let expr1 = parse("at_operation(..)").resolve_user_symbol(); # in library let expr2 = RevsetExpression::ancestors().intersection(&expr1); expr2.evaluate_programmatic()	2024-11-04 09:20:46 +09:00
Joaquín Triñanes	49a0c0c802	nix: Use packages instead of buildInputs ... In practice, `packages` sets the value for `nativeBuildInputs`. This has the following advantages: - `buildInputs` is for runtime dependencies. `nativeBuildInputs` is for build dependencies (this usually not an issue unless cross compiling) - `shellHook`s will actually run, allowing packages to safely append to variables like `XDG_DATA_DIRS` - It's more idiomatic and how it's recommended to be used in the docs	2024-11-03 12:50:44 -06:00
Joaquín Triñanes	a20f3867b6	nix: Add rust-analyzer to devshell	2024-11-03 12:50:44 -06:00
Yuya Nishihara	15da697616	cli: insert dummy -h/--help flag when parsing early args ... Fixes #4746	2024-11-03 13:32:12 +09:00
Yuya Nishihara	8e1eb23246	cli: remove special case for clap's default "help" subcommand ... Since 536c629d "cli: Explicitly add a Help command to accept the early args after it", "jj help" is a normal subcommand.	2024-11-03 13:32:12 +09:00
Yuya Nishihara	f251f08ce7	diff: impl Clone, Debug for DiffHunkIterator ... For consistency with the ranges iterator.	2024-11-02 10:09:10 +09:00
Yuya Nishihara	de2a8a579a	diff: extract hunk_ranges() iterator ... This will help construct file content based on diff hunks. For example, "jj absorb" will first calculate annotation of the source parent (within mutable ancestors), calculate diff, then "squash" hunks into ancestor commits of the surrounding ranges.	2024-11-02 10:09:10 +09:00
dependabot[bot]	8bf6cbe6ab	cargo: bump the cargo-dependencies group with 4 updates ... Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [insta](https://github.com/mitsuhiko/insta), [syn](https://github.com/dtolnay/syn) and [thiserror](https://github.com/dtolnay/thiserror). Updates `anyhow` from 1.0.91 to 1.0.92 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.91...1.0.92) Updates `insta` from 1.41.0 to 1.41.1 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.41.0...1.41.1) Updates `syn` from 2.0.85 to 2.0.86 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.85...2.0.86) Updates `thiserror` from 1.0.65 to 1.0.66 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.65...1.0.66) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: syn 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-11-02 08:39:34 +09:00
Yuya Nishihara	9f1d2abd76	testutils: move global TestBackendData mapping to TestEnvironment ... This unblocks the use of TestBackend in long-running processes such as fuzzer. It should also be safer because TempDir doesn't guarantee that the path is never reused.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	7b5df93fe4	testutils: move default_store_factories() to TestEnvironment ... It will capture the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	d4786a3256	testutils: move load_repo_at_head() to TestEnvironment ... It will depend on the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Yuya Nishihara	22f2393322	testutils: add stub TestEnvironment that will manage in-memory backend data ... TestBackendData instances persist in memory right now, but they should be discarded when the corresponding temp_dir gets dropped. The added struct will manage the TestBackendData mapping.	2024-11-02 08:39:02 +09:00
Remo Senekowitsch	91f869c32a	ci: don't run website deployment on forks	2024-11-01 07:42:37 -07:00
Arthur Grillo	f2acb98ef2	help: Add a keyword feature ... It would be nice to not need to go the documentation website. This aims to solve that by introducing the concept of keyword to the help command. Basically, keywords are things that we want to add help messages to, but they don't necessarily have an associated subcommand. For now we only have two keywords: - `revsets`: Shows the docs for revsets - `tutorial`: Shows the tutorial that is on the documentation You get the keyword content by tipping `jj help --keyword revsets` or `jj help -k revsets`. You can also list the available keywords with `jj help --help`. It would be nice to have all the documentation on the keywords, maybe a next commit could do it.	2024-10-31 16:55:18 -03:00
Martin von Zweigbergk	c7cd014fe6	docs: add more detail to section about stale working copies ... We only explained that working copies can become stale when updating a commit from another workspace, but there are other cases too. I also tried to better explain what the state actually means.	2024-10-30 18:13:48 -07:00
dependabot[bot]	786860e802	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.35 to 4.5.36 - [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.35...clap_complete-v4.5.36) --- 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-10-31 08:48:05 +09:00
dploch	0fa7df935c	rebase: fix typo	2024-10-30 14:40:54 -04:00
Martin von Zweigbergk	30ab71d340	bookmarks: add support for git.auto-local-bookmark (to match docs) ... We had documented that we support `git.auto-local-bookmark` but we don't. The documentation has been incorrect since d9c68e08b1. This patch fixes it by adding support for `git.auto-local-bookmark` with fallback to the old/current `git.auto-local-branch`. .	2024-10-30 08:01:02 -07:00
dependabot[bot]	cba3261f04	cargo: bump serde in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [serde](https://github.com/serde-rs/serde). Updates `serde` from 1.0.213 to 1.0.214 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.213...v1.0.214) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-30 17:31:43 +09:00
pylbrecht	8b5b4c19ea	cli: add jj config unset ... Allow unsetting config values similar to `git config unset`. ```bash $ jj config set --user some-key some-val $ jj config get some-key some-val $ jj config unset --user some-key $ jj config get some-key Config error: configuration property "some-key" not found For help, see https://martinvonz.github.io/jj/latest/config/. ``` Unsetting a key, which is part of a table, might leave that table empty. For now we do not delete such empty tables, as there may be cases where an empty table is semantically meaningful (https://github.com/martinvonz/jj/issues/4458#issuecomment-2407109269). For example: ```toml [table] key = "value" [another-table] key = "value" ``` Running `jj config unset --user table.key` will leave us with `table` being empty: ```toml [table] [another-table] key = "value" ```	2024-10-30 06:50:15 +01:00
pylbrecht	4575ea8794	cli: extract read/write config helpers ... This is a preparatory refactoring. We will introduce another function to remove config values, in which we will reuse these two helper functions.	2024-10-30 06:50:15 +01:00
SoraTenshi	fa5372f453	docs: include remote add command	2024-10-29 09:15:45 -07:00
Yuya Nishihara	e464c0e607	annotate: rename AnnotateResults to FileAnnotation ... The name "Results" was a bit misleading because Result<T, E> aliases are often called FooResult.	2024-10-29 23:33:46 +09:00
Yuya Nishihara	ab10b7c0a0	annotate: do not collect result lines into Vec, return Iterator instead ... We might want to calculate (commit_id, range) pairs of consecutive lines in order to "absorb" changes, for example. This should also be cheaper since Vec<u8> doesn't have to be allocated per line.	2024-10-29 23:33:46 +09:00
Yuya Nishihara	bd1024547d	annotate: use sorted Vec<(usize, usize)> to propagate lines to ancestors ... This isn't so complicated compared to the HashMap version, and we can handle multiple (cur, orig1), (cur, orig2) pairs. It's also cheaper to access.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	1fd628a0cf	annotate: omit building intermediate same_line_map ... Perhaps, get_same_line_map() could return an iterator, but implementing an iterator to be "pull"-ed is much harder than writing a function to "push", especially when lifetime is involved.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	0eedc0cbae	annotate: simply use Vec<_> for list of originating commit IDs ... Since we're going to fill the list at all, it doesn't make sense to keep it as a sparse HashMap.	2024-10-29 14:57:57 +09:00
Yuya Nishihara	53af8a1fbc	annotate: simplify condition when to exit early from process_commits() loop	2024-10-29 14:57:57 +09:00
dependabot[bot]	750326a984	github: bump abatilo/actions-poetry in the github-dependencies group ... Bumps the github-dependencies group with 1 update: [abatilo/actions-poetry](https://github.com/abatilo/actions-poetry). Updates `abatilo/actions-poetry` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/abatilo/actions-poetry/releases) - [Changelog](https://github.com/abatilo/actions-poetry/blob/master/.releaserc) - [Commits](7b6d33e44b...e78f54a89c) --- updated-dependencies: - dependency-name: abatilo/actions-poetry dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-29 08:16:32 +09:00
dependabot[bot]	5d5d2c0964	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [insta](https://github.com/mitsuhiko/insta) and [rustix](https://github.com/bytecodealliance/rustix). Updates `insta` from 1.40.0 to 1.41.0 - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.40.0...1.41.0) Updates `rustix` from 0.38.37 to 0.38.38 - [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.37...v0.38.38) --- updated-dependencies: - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-29 08:16:22 +09:00
Yuya Nishihara	89a0f46986	annotate: remove redundant .is_absent() test from get_file_contents() ... Here we shouldn't care whether the file value is absent or a tree, for example.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	d6026e46e9	annotate: inline process_files_in_commits() ... The doc comment describes what the caller should do, not the function would do.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	db239536da	annotate: inline mark_lines_from_original() ... This function was short, and this change makes it clear that !.is_empty() was redundant. Duplicated doc comment is also removed. I feel the inline comment is easier to follow here.	2024-10-28 12:40:01 +09:00
Yuya Nishihara	52d842b8df	annotate: use "let else" and "continue" where makes sense	2024-10-28 12:40:01 +09:00