7666 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Martin von Zweigbergk	5aee10aa6d	faq: add an entry about why merge commits are often empty	2024-11-25 10:46:52 -08:00
Yuya Nishihara	f819dc9345	config: extract layer management from cli LayeredConfigs to jj-lib ... Layers are now constructed per file, not per source type. This will allow us to report precise position where bad configuration variable is set. Because layers are now created per file, it makes sense to require existence of the file, instead of ignoring missing files which would leave an empty layer in the stack. The path existence is tested by ConfigEnv::existing_config_path(), so I simply made the new load_file/dir() methods stricter. However, we still need config::File::required(false) flag in order to accept /dev/null as an empty TOML file. The lib type is renamed to StackedConfig to avoid name conflicts. The cli LayeredConfigs will probably be reorganized as an environment object that builds a StackedConfig.	2024-11-25 12:09:21 +09:00
Yuya Nishihara	d75aaf3f8d	config: move ConfigSource to jj-lib, make it Copy + Ord ... I decided to add `path: Option<PathBuf>` as a separate field, not a parameter of ConfigSource::Repo|User variants.	2024-11-25 12:09:21 +09:00
Yuya Nishihara	75b8e9b857	config: split ConfigSource::Env reflecting layer precedence ... I'll make LayeredConfigs store a list of layers sorted by source (or precedence), where multiple layers can exist for the same source.	2024-11-25 12:09:21 +09:00
Ilya Grigoriev	8c5b39e286	cli util gc: document the fact that it does not abandon operations ... This UI will probably change eventually, but let's document it for now.	2024-11-24 15:48:12 -08:00
Martin von Zweigbergk	10c90a5099	merged_tree: propagate errors from conflict iterator	2024-11-23 13:53:04 -08:00
Martin von Zweigbergk	9ec216a2bb	cli_util: take conflicts by value to print_conflicted_paths() ... I'm about to make the vector contain `BackendResult<MergedTreeValue>`, which is harder to work with behind a mutable reference.	2024-11-23 13:53:04 -08:00
Austin Seipp	81251c9382	nix: flake update ... Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-23 15:04:57 -06:00
Ilya Grigoriev	118072a9ac	cli git push: short alias -N for --allow-new ... I commonly end up typing it. It's long and hard to complete	2024-11-23 11:08:26 -08:00
Scott Taylor	472fd35ff1	docs: rewrite conflict marker docs to include new styles ... The current docs for conflict markers start out by introducing Git "diff3" conflict markers, and then discussing how Jujutsu's conflict markers are different from Git's. I don't think this is the best way to explain it, because it requires the reader to first understand Git's conflict markers before they go on to learn Jujutsu's conflict markers. Instead, I think it's better to explain the conflict markers from scratch with a more detailed example so that we don't assume any particular knowledge of Git. This structure also works better with the new config option, since we can talk about the default option first, and then go on to explain alternatives later.	2024-11-23 08:28:47 -06:00
Scott Taylor	26f5d6150c	conflicts: add "git" conflict marker style ... Adds a new "git" conflict marker style option. This option matches Git's "diff3" conflict style, allowing these conflicts to be parsed by some external tools that don't support JJ-style conflicts. If a conflict has more than 2 sides, then it falls back to the similar "snapshot" conflict marker style. The conflict parsing code now supports parsing Git-style conflict markers in addition to the normal JJ-style conflict markers, regardless of the conflict marker style setting. This has the benefit of allowing the user to switch the conflict marker style while they already have conflicts checked out, and their old conflicts will still be parsed correctly. Example of "git" conflict markers: ``` <<<<<<< Side #1 (Conflict 1 of 1) fn example(word: String) { println!("word is {word}"); ||||||| Base fn example(w: String) { println!("word is {w}"); ======= fn example(w: &str) { println!("word is {w}"); >>>>>>> Side #2 (Conflict 1 of 1 ends) } ```	2024-11-23 08:28:47 -06:00
Scott Taylor	ec6220d51f	merge: add as_slice() method ... This was already possible using `merge.iter().as_slice()`, but I think this is cleaner.	2024-11-23 08:28:47 -06:00
Scott Taylor	54c453ba8d	conflicts: extract function for materializing hunk ... This will make it easier to add a second code path for Git-style conflicts in a later commit.	2024-11-23 08:28:47 -06:00
Scott Taylor	d2b06b9cf9	conflicts: add "snapshot" conflict marker style ... Adds a new "snapshot" conflict marker style which returns a series of snapshots, similar to Git's "diff3" conflict style. The "snapshot" option uses a subset of the conflict hunk headers as the "diff" option (it just doesn't use "%%%%%%%"), meaning that the two options are trivially compatible with each other (i.e. a file materialized with "snapshot" can be parsed with "diff" and vice versa). Example of "snapshot" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); ------- Contents of base fn example(w: String) { println!("word is {w}"); +++++++ Contents of side #2 fn example(w: &str) { println!("word is {w}"); >>>>>>> Conflict 1 of 1 ends } ```	2024-11-23 08:28:47 -06:00
Scott Taylor	863cba309f	conflicts: extract header output into separate functions ... This will make it easier to add separate logic for "snapshot" style conflict markers in the next commit.	2024-11-23 08:28:47 -06:00
Scott Taylor	3c182687e8	conflicts: replace "if let" with "let else" ... This makes the code a bit easier to follow in my opinion.	2024-11-23 08:28:47 -06:00
Scott Taylor	e5cb9f94f6	conflicts: add "ui.conflict-marker-style" config ... Adds a new "ui.conflict-marker-style" config option. The "diff" option is the default jj-style conflict markers with a snapshot and a series of diffs to apply to the snapshot. New conflict marker style options will be added in later commits. The majority of the changes in this commit are from passing the config option down to the code that materializes the conflicts. Example of "diff" conflict markers: ``` <<<<<<< Conflict 1 of 1 +++++++ Contents of side #1 fn example(word: String) { println!("word is {word}"); %%%%%%% Changes from base to side #2 -fn example(w: String) { +fn example(w: &str) { println!("word is {w}"); >>>>>>> Conflict 1 of 1 ends } ```	2024-11-23 08:28:47 -06:00
Martin von Zweigbergk	d409a318f4	local_working_copy: fix documentation of TreeState::snapshot() ... Since commit e716fe7, the function no longer returns a tree id. That commit updated the function documentation to match the new behavior, but then the old documentation was restored in commit ef83f2b, perhaps by a bad merge conflict resolution.	2024-11-22 23:06:06 -08:00
Martin von Zweigbergk	4d19a0a539	cli: hyphenate "working-copy commit" in --ignore-working-copy help ... The help text of `--ignore-working-copy` had one instance with hyphen and one without.	2024-11-22 23:05:46 -08:00
Yuya Nishihara	a5c96bcf70	settings: simply forward .get_<type>(key) to .get::<type>(key) ... There's a subtle difference in error message, but the conversion function to be called is the same. The error message now includes "for key <key>", which is nice.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	fc57139340	settings: add forwarding getters, replace most of .config() uses ... .get_table() isn't implemented because it isn't cheap to build a HashMap, and a table of an abstract Value type wouldn't be useful. Maybe we'll instead provide an iterator of table keys. .config() is renamed to .raw_config() to break existing callers.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	f239b1e8f0	settings: pass around &UserSettings instead of &config::Config consistently ... Ui::with_config() is unchanged because I'm not sure if UserSettings should be constructed earlier. I assume UserSettings will hold an immutable copy of LayerdConfigs object, whereas Ui has to be initialized before all config layers get loaded.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	6d26d53eab	config: add type alias for config::ConfigError ... We'll probably add our own ConfigError type later.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	c0250f1904	config: rename jj_cli::config::ConfigError to ConfigEnvError ... It was confusing because we often refer to config::ConfigError as ConfigError.	2024-11-23 10:20:27 +09:00
Yuya Nishihara	5ad0f3dcf6	config: extract ConfigNamePathBuf to jj-lib ... I'm planning to rewrite config store layer by leveraging toml_edit instead of the config crate. It will allow us to merge config overlays in a way that deprecated keys are resolved within a layer prior to merging, for example. This patch moves ConfigNamePathBuf to jj-lib where new config API will be hosted. We'll probably extract LayeredConfigs to this module, but we'll first need to split environment dependencies from it.	2024-11-23 10:20:27 +09:00
Scott Taylor	6e959fa12c	conflicts: allow stripped trailing whitespace in diffs ... Some editors strip trailing whitespace on save, which breaks any diffs which have context lines, since the parsing function expects them to start with a space. There's no visual difference between " \n" and "\n", so it seems reasonable to accept both.	2024-11-22 18:00:05 -06:00
Scott Taylor	efacbcbd45	conflicts: demo failed parse of diff with empty line	2024-11-22 18:00:05 -06:00
Scott Taylor	9674852dc7	conflicts: allow CRLF line endings on conflict markers ... Currently, conflict markers ending in CRLF line endings aren't allowed. I don't see any reason why we should reject them, since some editors/tools might produce CRLF automatically on Windows when saving files, which would break the conflicts otherwise.	2024-11-22 18:00:05 -06:00
Scott Taylor	ee7f829d4c	conflicts: demo failed parse of markers with CRLF	2024-11-22 18:00:05 -06:00
Lars Francke	ffe5519fd0	Update tutorial for 0.23 and clarify diffedit	2024-11-22 21:23:12 +01:00
Tim Janik	86a2a2b1e9	docs/git-compatibility.md: preserve working copy files when co-locating ... Use `jj new && jj undo` instead of `jj new @-` at the end of converting to a co-located repository, because the latter "stashes" newly added working copy changes into a sibling commit. See also: https://github.com/martinvonz/jj/discussions/4945 Signed-off-by: Tim Janik <timj@gnu.org>	2024-11-22 19:20:36 +01:00
dependabot[bot]	d5bf1489e4	cargo: bump proc-macro2 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [proc-macro2](https://github.com/dtolnay/proc-macro2). Updates `proc-macro2` from 1.0.91 to 1.0.92 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.91...1.0.92) --- updated-dependencies: - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-22 10:54:14 -06:00
Benjamin Tan	4f2e72a140	cli: simplify-parents: avoid multiple rebases of the same commits ... The previous iteration of `jj simplify-parents` would only reparent the commits in the target set in the `MutableRepo::transform_descendants` callback. The subsequent `MutableRepo::rebase_descendants` call invoked when the transaction is committed would then rebase all descendants of the target set, which includes the commits in the target set again. This commit updates the `MutableRepo::transform_descendants` callback to perform rebasing of all descendants within the callback. All descendants of the target set will only be rebased at most once.	2024-11-22 20:23:03 +08:00
Benjamin Tan	1ae8f0c77a	tests: add additional test case for jj simplify-parents ... This test shows that the current implementation of `jj simplify-parents` perform unnecessary rebases of descendant commits.	2024-11-22 20:23:03 +08:00
Yuya Nishihara	c6bb019d41	diff: optimize allocation of histogram entries for unique words ... ``` group new old ----- --- --- bench_diff_git_git_read_tree_c 1.00 34.5±0.26µs 1.32 45.7±0.11µs bench_diff_lines/modified/10k 1.00 28.2±0.10ms 1.19 33.5±0.69ms bench_diff_lines/modified/1k 1.00 2.6±0.01ms 1.15 3.0±0.01ms bench_diff_lines/reversed/10k 1.00 21.5±0.22ms 1.08 23.3±0.18ms bench_diff_lines/reversed/1k 1.00 364.8±11.96µs 1.22 445.1±8.99µs bench_diff_lines/unchanged/10k 1.00 1761.3±13.85µs 1.66 2.9±0.07ms bench_diff_lines/unchanged/1k 1.00 163.6±1.25µs 1.47 240.7±2.72µs ``` ``` % hyperfine --sort command --warmup 3 --runs 5 -L bin jj-0,jj-1 \ 'target/release-with-debug/{bin} --ignore-working-copy \ file annotate lib/src/revset.rs' Benchmark 1: target/release-with-debug/jj-0 .. Time (mean ± σ): 1.144 s ± 0.011 s [User: 1.088 s, System: 0.053 s] Range (min … max): 1.131 s … 1.159 s 5 runs Benchmark 2: target/release-with-debug/jj-1 .. Time (mean ± σ): 1.026 s ± 0.008 s [User: 0.975 s, System: 0.048 s] Range (min … max): 1.015 s … 1.035 s 5 runs ```	2024-11-22 08:20:55 +09:00
Yuya Nishihara	656a614f29	signing: pass &UserSettings in to backends ... If we add our own config storage implementation, .get_<type>() functions will be moved to UserSettings object.	2024-11-22 08:20:45 +09:00
Yuya Nishihara	7a7962bb9f	signing: propagate config errors	2024-11-22 08:20:45 +09:00
Yuya Nishihara	5e13a4a719	signing: remove unused SignInitError::Backend variant, simplify error handling ... Since signing backends shouldn't do non-trivial work at the initialization stage, the error type would never be categorized as an internal error.	2024-11-22 08:20:45 +09:00
Yuya Nishihara	99c269816c	cargo: bump toml_edit to 0.22.22 ... toml_edit now has separate immutable and mutable Document types. Other than that, the API should be compatible.	2024-11-22 08:20:35 +09:00
Austin Seipp	e060ef20c1	cli: delete deprecated jj merge command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Austin Seipp	037134147d	cli: delete deprecated jj checkout command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
dependabot[bot]	ec30979e0e	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.1 to 2.0.2 - [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases) - [Commits](8371184bd1...f87fcad0e6) --- 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-21 10:20:03 -06:00
dependabot[bot]	6d3d5319dd	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [proc-macro2](https://github.com/dtolnay/proc-macro2) and [syn](https://github.com/dtolnay/syn). Updates `proc-macro2` from 1.0.89 to 1.0.91 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.89...1.0.91) Updates `syn` from 2.0.87 to 2.0.89 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.87...2.0.89) --- updated-dependencies: - dependency-name: proc-macro2 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 ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-21 10:19:47 -06:00
Yuya Nishihara	7906b3f4a5	annotate: remove unneeded BString<->Vec round-trip	2024-11-21 10:50:37 +09:00
Yuya Nishihara	59a79fdcc0	conflicts: extract materialize_merge_result_to_bytes() helper ... We have many callers of materialize_merge_result() who just want in-memory buffer.	2024-11-21 10:50:37 +09:00
Yuya Nishihara	4cdead34b4	conflicts: make materialize_merge_result() accept reference type ... Because the output of diff.hunks() is a list of [&BStr]s, a Merge object reconstructed from a diff hunk will be Merge<&BStr>. I'm not pretty sure if we'll implement conflict diffs in that way, but this change should be harmless anyway.	2024-11-21 10:50:37 +09:00
Yuya Nishihara	2aa913b035	conflicts: extract inner block of materialize_merge_result() ... I'm going to make materialize_merge_result() accept reference type. This patch extracts large non-generic part to a separate function.	2024-11-21 10:50:37 +09:00
Yuya Nishihara	5cc0bd0950	rewrite: fix duplicated commits to be rebased onto destination ... I believe this was an oversight. "jj duplicate" should duplicate commits (= patches), not trees. This patch adds a separate test file because test_rewrite.rs is pretty big, and we'll probably want to migrate CLI tests to jj-lib.	2024-11-21 10:49:51 +09:00
dependabot[bot]	a6c18e8353	github: bump the github-dependencies group with 2 updates ... Bumps the github-dependencies group with 2 updates: [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) and [github/codeql-action](https://github.com/github/codeql-action). Updates `astral-sh/setup-uv` from 3.2.2 to 3.2.3 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](2e657c127d...e779db7426) Updates `github/codeql-action` from 3.27.4 to 3.27.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](ea9e4e3799...f09c1c0a94) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-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-11-20 11:42:59 -06:00
Remo Senekowitsch	ac0e531de5	cli: provide short flags for rev ranges	2024-11-20 18:20:24 +01:00