7848 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yuya Nishihara	e6c0692655	cli: warn if command matches with aliases inserted by --config* arguments ... Closes #5282	2025-01-08 09:40:31 +09:00
Yuya Nishihara	49999a7507	local_working_copy: on snapshot, ignore submodule in ignored directories ... Fixes #5246	2025-01-08 09:39:59 +09:00
dependabot[bot]	4a863789c1	cargo: bump the cargo-dependencies group across 1 directory with 4 updates ... Bumps the cargo-dependencies group with 4 updates in the / directory: [async-trait](https://github.com/dtolnay/async-trait), [clap](https://github.com/clap-rs/clap), [clap_complete](https://github.com/clap-rs/clap) and [serde_json](https://github.com/serde-rs/json). Updates `async-trait` from 0.1.84 to 0.1.85 - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.84...0.1.85) Updates `clap` from 4.5.23 to 4.5.24 - [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.23...clap_complete-v4.5.24) Updates `clap_complete` from 4.5.40 to 4.5.41 - [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.40...clap_complete-v4.5.41) Updates `serde_json` from 1.0.134 to 1.0.135 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.134...v1.0.135) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-07 18:58:52 +00:00
Martin von Zweigbergk	4a7d9891e6	rewrite: back out 9d4a973 ... I think the test case added in the previous commit shows a clear case for why commit 9d4a973 was a bad idea.	2025-01-07 09:08:46 -08:00
Martin von Zweigbergk	ada946db62	rewrite: add another test of rebasing with same change on both sides	2025-01-07 09:08:46 -08:00
Austin Seipp	252f6d8543	github: migrate all actions to ubuntu-24.04 ... This gets rid of an annoying warning in the Actions tab, but we already rely on this for the build-binaries workflow, and it's probably better to be explicit about this anyway. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-07 10:30:29 -06:00
Scott Taylor	e6a51d6637	git: add dummy conflict to index if necessary ... If the parent tree contains conflicts, we want the index to also contain a conflict to ensure that the use can't accidentally commit conflict markers using `git commit`. Since we can't represent conflicts with more than 2 sides in the Git index, we need to add a dummy conflict in this case. We use ".jj-do-not-resolve-this-conflict" as the dummy conflict to indicate to the user that they should not attempt to resolve this conflict using Git.	2025-01-06 19:17:51 -06:00
Scott Taylor	42b390bbc4	git: use merged parent tree for git index ... Instead of setting the index to match the tree of HEAD, we now set the index to the merged parent tree of the working copy commit. This means that if you edit a merge commit, it will make the Git index look like it would in the middle of a `git merge` operation (with all of the successfully-merged files staged in the index). If there are any 2-sided conflicts in the merged parent tree, then they will be added to the index as conflicts. Since Git doesn't support conflicts with more than 2 sides, many-sided conflicts are staged as the first side of the conflict. The following commit will improve this.	2025-01-06 19:17:51 -06:00
Scott Taylor	9cc8b35251	git: use gix instead of git2 to update index ... This will give us more fine-grained control over what files we put in the index, allowing us to create conflicted index states. We also still need to use git2 to clean up the merge/rebase state, since gix doesn't have any function for this currently.	2025-01-06 19:17:51 -06:00
Scott Taylor	8e3ec9c58c	git: add tests for index in colocated repo ... These tests should still pass after we switch to gix for resetting the index, so we need to make sure they don't rely on the cached index from the `git2::Repository` instance.	2025-01-06 19:17:51 -06:00
Scott Taylor	3f72604832	git: make update_git_head accept an expected ref ... This change will allow `update_git_head` to be used in `reset_head`.	2025-01-06 19:17:51 -06:00
dependabot[bot]	d859a910e1	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [insta](https://github.com/mitsuhiko/insta) and [syn](https://github.com/dtolnay/syn). Updates `insta` from 1.41.1 to 1.42.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.41.1...1.42.0) Updates `syn` from 2.0.94 to 2.0.95 - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.94...2.0.95) --- updated-dependencies: - dependency-name: insta 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 ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-06 13:24:54 -06:00
Yuya Nishihara	b8653989c1	tests: add convenient method to initialize TestWorkspace with test settings ... Functions are renamed, and their arguments are reordered to be consistent with the TestRepo API.	2025-01-06 22:37:33 +09:00
Yuya Nishihara	127f7e23ac	examples: use settings_for_new_workspace() when initializing workspace ... Spotted while replacing callers of CommandHelper::settings().	2025-01-06 21:15:28 +09:00
Yuya Nishihara	1f6e207e25	cli: get settings from workspace where makes sense ... There should be no difference, but it's more consistent that all workspace/repo commands use workspace_command.settings(), etc. than command.settings().	2025-01-06 21:15:28 +09:00
Yuya Nishihara	6c14ccd89d	cli: resolve settings for newly initialized/cloned workspace ... Fixes #5144	2025-01-06 10:39:48 +09:00
Yuya Nishihara	56bd4765f5	cli: get settings from repo or workspace ... This ensures that WorkspaceCommandHelper created for initialized/cloned repo refers to the settings object for that repo, not the settings loaded for the cwd repo. I also removed WorkspaceCommandEnvironment::settings() because it doesn't own a workspace object. It's implementation detail that the env object holds a copy of workspace.settings(), and the caller should be accessible to the workspace object.	2025-01-06 10:39:48 +09:00
Yuya Nishihara	393f3acb03	workspace: add settings() getter	2025-01-06 10:39:48 +09:00
Yuya Nishihara	556ef26608	cli: make commands sub modules private ... We've removed most of the deprecated commands.	2025-01-06 10:16:15 +09:00
Christian Stoitner	bcfa2b174b	added changelog entry for showing untracked files in jj status	2025-01-05 18:53:55 +01:00
Christian Stoitner	ae91f2265f	status: show untracked files	2025-01-05 17:43:59 +01:00
Christian Stoitner	3aa97099d6	cli: plumbing to make SnapshotStats available to cmd_status	2025-01-05 17:43:59 +01:00
Christian Stoitner	cb28685901	working_copy: added UntrackedReason::FileNotAutoTracked for files not tracked because of snapshot.auto-track	2025-01-05 17:43:59 +01:00
Yuya Nishihara	2cb3ee5260	cli: restore: add --interactive flag ... As Martin suggested, this is the reverse operation of "jj diffedit", and supports fileset arguments. https://github.com/jj-vcs/jj/issues/3012#issuecomment-1937353458 Closes #3012	2025-01-05 10:14:29 +09:00
Yuya Nishihara	0d022f1202	cli: fix interactive diff selection to not retain unmatched files ... This patch doesn't fix DiffEditor::edit() API, which is fundamentally broken if matcher argument is specified. I'm not sure if the builtin behavior is correct or not. Suppose we add "jj diffedit FILESETS..", it would probably make sense to leave unmatched paths unmodified because it is the command to edit the destination (or right) tree. This is the edit_diff_external() behavior. Fixes #5252	2025-01-04 22:21:37 +09:00
Anton Bulakh	c99c97c646	sign: Add templater methods to show signature info ... Disclaimer: this is the work of @necauqua and @julienvincent (see #3141). I simply materialized the changes by rebasing them on latest `main` and making the necessary adjustments to pass CI. --- I had to fix an issue in `TestSignatureBackend::sign()`. The following test was failing: ``` ---- test_signature_templates::test_signature_templates stdout ---- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot Summary ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot: signature_templates Source: cli/tests/test_signature_templates.rs:28 ──────────────────────────────────────────────────────────────────────────────── Expression: stdout ──────────────────────────────────────────────────────────────────────────────── -old snapshot +new results ────────────┬─────────────────────────────────────────────────────────────────── 0 0 │ @ Commit ID: 05ac066d05701071af20e77506a0f2195194cbc9 1 1 │ │ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu 2 2 │ │ Author: Test User <test.user@example.com> (2001-02-03 08:05:07) 3 3 │ │ Committer: Test User <test.user@example.com> (2001-02-03 08:05:07) 4 │-│ Signature: Good test signature 4 │+│ Signature: Bad test signature 5 5 │ │ 6 6 │ │ (no description set) 7 7 │ │ 8 8 │ ◆ Commit ID: 0000000000000000000000000000000000000000 ────────────┴─────────────────────────────────────────────────────────────────── ``` Print debugging revealed that the signature was bad, because of a missing trailing `\n` in `TestSignatureBackend::sign()`. ```diff diff --git a/lib/src/test_signing_backend.rs b/lib/src/test_signing_backend.rs index d47fef1086..0ba249e358 100644 --- a/lib/src/test_signing_backend.rs +++ b/lib/src/test_signing_backend.rs @@ -59,6 +59,8 @@ let key = (!key.is_empty()).then_some(std::str::from_utf8(key).unwrap().to_owned()); let sig = self.sign(data, key.as_deref())?; + dbg!(&std::str::from_utf8(&signature).unwrap()); + dbg!(&std::str::from_utf8(&sig).unwrap()); if sig == signature { Ok(Verification::new( SigStatus::Good, ``` ``` [lib/src/test_signing_backend.rs:62:9] &std::str::from_utf8(&signature).unwrap() = \"--- JJ-TEST-SIGNATURE ---\\nKEY: \\n5300977ff3ecda4555bd86d383b070afac7b7459c07f762af918943975394a8261d244629e430c8554258904f16dd9c18d737f8969f2e7d849246db0d93cc004\\n\" [lib/src/test_signing_backend.rs:63:9] &std::str::from_utf8(&sig).unwrap() = \"--- JJ-TEST-SIGNATURE ---\\nKEY: \\n5300977ff3ecda4555bd86d383b070afac7b7459c07f762af918943975394a8261d244629e430c8554258904f16dd9c18d737f8969f2e7d849246db0d93cc004\" ``` Thankfully, @yuja pointed out that libgit2 appends a trailing newline (see bfb7613d5d). Co-authored-by: necauqua <him@necauq.ua> Co-authored-by: julienvincent <m@julienvincent.io>	2025-01-04 13:24:08 +01:00
pylbrecht	87b38b3073	sign: provide display in TestSigningBackend ... We need to provide a value for the `display` attribute to assert against in upcoming tests, which verify signature templates.	2025-01-04 13:24:08 +01:00
pylbrecht	638f123459	sign: move TestSigningBackend to lib ... We need to make `TestSigningBackend` available for cli tests, as we will add cli tests for signing related functionality (templates for displaying commit signatures, `jj sign`) in upcoming commits. Co-authored-by: julienvincent <m@julienvincent.io>	2025-01-04 13:24:08 +01:00
Yuya Nishihara	9aff586655	config: fall back to $USER if username couldn't be obtained by libc ... If jj is compiled against musl libc, not all name services are available, and getpwuid() can return null even if the system is configured properly. That's the problem reported as #5231. Suppose operation.username exists mainly for logging/tracing purposes, it should be better to include something less reliable than leaving the field empty. This patch also removes TODO comment about empty hostname/username. It's unlikely that the hostname is invalid (as that would cause panic on older jj versions), and $USER would probably be set on Unix.	2025-01-04 17:54:28 +09:00
Yuya Nishihara	fcac7ed39c	config: load system host/user name by CLI and insert as env-base layer ... Since the default now falls back to "", we can simply override the default by CLI. We don't have to touch the environment in jj-lib.	2025-01-04 17:54:28 +09:00
Yuya Nishihara	5842e58db6	cli: add test that runs basic jj commands with minimal configuration	2025-01-04 17:54:28 +09:00
Benjamin Tan	6ddc5a7b30	cli: split: remove deprecated --siblings options ... This has been replaced by the `--parallelize` option in a9953b3.	2025-01-04 15:43:18 +08:00
Benjamin Tan	62c1c48c7a	cli: log, op log, evolog: remove deprecated -l short alias for --limit ... This removes the `-l` short alias for `--limit` for `jj log`, `jj op log` and `jj evolog` initially deprecated in 72438fc.	2025-01-04 15:43:18 +08:00
Benjamin Tan	947281687f	cli: remove deprecated jj file commands ... The following deprecated commands have been removed for their `jj files` alternatives: - `jj cat` was deprecated for `jj file show` in 47bd6f4 and e6c2108. - `jj chmod` was deprecated for `jj file chmod` in 47bd6f4. - `jj files` was deprecated for `jj file list` in 5d307e6.	2025-01-04 15:43:18 +08:00
blinry	1ddfc59ee9	docs: Use "branch" consistently when talking about Git's branches ... Some places used "bookmark" instead, which makes it harder to differentiate between jj's and Git's differing concepts.	2025-01-03 10:54:00 -06:00
dependabot[bot]	337663c312	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [async-trait](https://github.com/dtolnay/async-trait), [bstr](https://github.com/BurntSushi/bstr) and [tempfile](https://github.com/Stebalien/tempfile). Updates `async-trait` from 0.1.83 to 0.1.84 - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.83...0.1.84) Updates `bstr` from 1.11.2 to 1.11.3 - [Commits](https://github.com/BurntSushi/bstr/compare/1.11.2...1.11.3) Updates `tempfile` from 3.14.0 to 3.15.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: bstr dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-03 10:15:42 -06:00
Austin Seipp	66151f0888	cli: drop support for jj init --{git, git_repo} ... These were deprecated early last year in favor of `jj git init`. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-03 10:15:01 -06:00
Yuya Nishihara	42d7beaf2c	cli: config: allow comma in bare TOML string ... Fixes #5233	2025-01-03 21:48:41 +09:00
Yuya Nishihara	641ec52540	cli: replace run_ui_editor() and edit_temp_file() with editor type	2025-01-03 10:23:58 +09:00
Yuya Nishihara	e306f84765	cli: add "ui.editor" type that captures configuration ... The idea is the same as diff_editor()/selector() API. This object will be passed in to edit_*description() functions in place of (repo_path, settings) pair. "ui.editor" isn't specific to editing commit descriptions, but it's mainly used for that purpose. So I put the wrapper type in description_util.rs.	2025-01-03 10:23:58 +09:00
Yuya Nishihara	e344c21a28	cli: use insta snapshot to test editor error messages	2025-01-03 10:23:58 +09:00
JDSeiler	d5b0aa20cb	evolog: Implement --reversed flag ... Adds some additional helper functions for converting between jj_lib's GraphEdge and the graphlog's Edge type.	2025-01-02 20:21:59 -05:00
Yuya Nishihara	c7dd28a292	settings: fall back to empty op hostname/username if default can't be obtained ... It's not super important that operation log has a valid user/host name. Let's allow invalid system configuration. In jj 0.24.0, invalid hostname was panic, and invalid username was mapped to "Unknown". Fixes #5231	2025-01-03 10:20:33 +09:00
Samuel Tardieu	39bdd5eb3f	perf: use .next_back() to get the last component ... Using `.last()` needs to go through all components first instead of splitting only the last one.	2025-01-02 23:24:04 +01:00
Samuel Tardieu	9048e80fed	clippy: enable useless_conversion lint	2025-01-02 23:23:19 +01:00
Samuel Tardieu	373b155bf0	style: remove useless type conversion	2025-01-02 23:23:19 +01:00
Austin Seipp	c9b6ba7b57	nix: run nix flake update ... Keeping the wheels greased. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-02 16:14:38 -06:00
Bryce Berger	cc015310ea	nix: add name to devshell ... This changes the `$name` environment variable from `nix-shell-env` to `jujutsu-env` when inside the nix-provided devshell.	2025-01-02 13:41:54 -06:00
Bryce Berger	2281450359	nix: use dynamic completions in installPhase ... Have been used in nixpkgs since the update to 0.24	2025-01-02 14:37:53 -05:00
Ollivier Robert	602b79f7fd	Add a paragraph on how to install jj completions into Powershell. ... Change USER into $HOME.	2025-01-02 10:52:55 -06:00