2012 commits

Author	SHA1	Message	Date
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
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
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
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	373b155bf0	style: remove useless type conversion	2025-01-02 23:23:19 +01:00
Yuya Nishihara	2304db6abf	cli: squash: use indoc::formatdoc! to indent formatted instructions nicely	2025-01-02 15:07:09 +09:00
Yuya Nishihara	5adeb6337d	cli: squash: inline move_diff() to address "too many arguments" linter warning	2025-01-02 15:07:09 +09:00
Yuya Nishihara	3cdd5717ef	cli: squash: extract first half of move_diff() to separate function ... I'll inline move_diff() instead. I think the current implementation is organized this way just because we had "jj move" command.	2025-01-02 15:07:09 +09:00
Yuya Nishihara	d38d6f69aa	cli: split sparse sub commands into modules	2025-01-02 15:07:00 +09:00
Waleed Khan	c7b677b86d	build: switch back to gix/max-performance-safe feature by default ... Using `gix/max-performance` requires `cmake` as a build-time dependency, which could be a significant barrier for contributors (including existing ones, like me, who already work on jj but didn't have `cmake` installed thus far). This commit switches back to using `gix/max-performance-safe`, which doesn't have the `cmake` dependency, and adds `gix/max-performance` behind the `gix-max-performance` feature for `jj-lib`. It also adds `gix-max-performance` to the `packaging` feature group, since I'm assuming that packagers will want maximum performance, and are more likely to have `cmake` at hand. Tested with ``` $ cargo build --workspace $ cargo build --workspace --features packaging ``` (and the `--features packaging` build failed until I installed `cmake`)	2024-12-31 17:07:52 -06:00
Yuya Nishihara	cff73841ed	repo: remove &UserSettings argument from new/rewrite_commit(), use self.settings	2024-12-31 10:51:57 +09:00
Yuya Nishihara	14b52205fb	repo: remove &UserSettings argument from start_transaction(), use self.settings	2024-12-31 10:51:57 +09:00
Yuya Nishihara	4ed3ce0d2b	cli: inline CommandHelper::load_template_aliases() ... There are no external callers, and WorkspaceCommandEnvironment might have to keep a separate copy of UserSettings in order to address #5144.	2024-12-30 23:39:18 +09:00
Yuya Nishihara	5515d2fb3c	cli: remove unneeded command.clone() from snapshot functions ... There aren't mutable borrow issues anymore.	2024-12-30 23:39:18 +09:00
Yuya Nishihara	43ac4faac4	config: preserve key formatting on set_value() ... I just noticed toml_edit::Table has a format-preserving insert() API. I think it's better to retain the user-specified quoting style.	2024-12-29 09:57:04 +09:00
Yuya Nishihara	4af39e2038	cli: config list: mark values overridden by table or parent value ... This fixes the output of "jj config list --include-overridden --include-defaults ui.pager" and ".. ui.pager.command". The default ui.pager.* should be marked as overridden by ui.pager if set in user configuration.	2024-12-28 10:28:43 +09:00
Yuya Nishihara	a001fe287a	cli: config list: pre-filter variables to be printed ... This is simpler, and it's nice that "No matching config" warning is printed without spawning pager.	2024-12-28 10:28:43 +09:00
Benjamin Tan	8d560748c7	cli: help: fix typos	2024-12-28 04:08:52 +08:00
Yuya Nishihara	e4a350fcaa	config: extract jj-lib's default values to embedded TOML file ... It's nice that "jj config list --include-defaults" can show these default values. I just copied the jj-cli directory structure, but it's unlikely we'll add more config/*.toml files.	2024-12-25 10:44:37 +09:00
Bryce Berger	1d3c3b8ab2	describe: ignore everything below ignore-rest line ... This implements "scissor" lines. For example: this text is included in the commit message JJ: ignore-rest this text is not, and is encouraged to be rendered as a diff JJ: ignore-rest this text is *still not* included in the commit message When editing multiple commit messages, the `JJ: describe {}` lines are parsed before the description is cleaned up. That means that the following will correctly add descriptions to multiple commits: JJ: describe aaaaaaaaaaaa this text is included in the first commit message JJ: ignore-rest scissored... JJ: describe bbbbbbbbbbbb this text is included in the first commit message JJ: ignore-rest scissored...	2024-12-23 16:31:55 -07:00
Scott Taylor	542d09c6a9	merge_tools: add "$marker_length" variable ... Git supports passing the conflict marker length to merge drivers using "%L". It would be useful if we also had a way to pass the marker length to merge tools, since it would allow Git merge drivers to be used with `jj resolve` in more cases. Without this variable, any merge tool that parses or generates conflict markers could fail on files which require conflict markers longer than 7 characters. https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver	2024-12-23 08:42:10 -06:00
Yuya Nishihara	6374dd0cfe	cli: abandon, describe: parse -rREV option properly ... I often do "jj log -rREV" to preview the commits to abandon, and it's annoying that I have to remove -r or insert space to "jj abandon ..". The implementation is basically the same as b0c7d0a7e2.	2024-12-23 22:58:06 +09:00
Yuya Nishihara	d91e355674	cli: git clone: convert local Git remote path to slash-separated path ... Since source.contains(':') can't be used for non-local path detection on Windows, we now use gix::url for parsing. It might be stricter, but I assume it would be more reliable. Closes #4188	2024-12-23 09:40:52 +09:00
Yuya Nishihara	6f00c565b2	graph: inline ReverseGraphIterator to callers	2024-12-23 09:28:03 +09:00
Scott Taylor	7bf31c1557	merge_tools: preserve executable bit on resolve	2024-12-22 10:12:22 -06:00
Scott Taylor	afa2f2deca	resolve: demo executable bit being lost ... Currently, `jj resolve` always sets the file to be non-executable whenever a conflict is fully resolved. This is confusing, because it can cause the executable bit to be lost even if every side agrees that the file is executable.	2024-12-22 10:12:22 -06:00
Yuya Nishihara	2aaf6cc3c9	cli: remove now redundant dunce::simplified() from run_ui_editor() ... The tests still use dunce::simplified() so we won't reintroduce the problem.	2024-12-22 09:45:37 +09:00
Yuya Nishihara	78b5766993	repo, workspace: use dunce::canonicalize() to normalize paths ... These paths may be printed, compared with user inputs, or passed to external programs. It's probably better to avoid unusual "\\?\C:\" paths on Windows. Fixes #5143	2024-12-22 09:45:37 +09:00
Scott Taylor	6baa43624c	local_working_copy: store materialized conflict marker length ... Storing the conflict marker length in the working copy makes conflict parsing more consistent, and it allows us to parse valid conflict hunks even if the user left some invalid conflict markers in the file while resolving the conflicts.	2024-12-21 11:36:30 -06:00
Yuya Nishihara	75ce7f6b7f	absorb: abandon source commit if it becomes discardable ... I don't think we need --keep-emptied flag. IIRC, "jj squash" has that flag in order not to squash commit description to the destination commits. Since "jj absorb" never moves commit description, the source commit is preserved in that situation. Closes #5141	2024-12-21 09:19:54 +09:00
Yuya Nishihara	f7fd523dd8	rewrite: remove unneeded Result from CommitRewriter::reparent() ... reparent() just configures new CommitBuilder instance, which should never fail.	2024-12-21 09:19:54 +09:00
Yuya Nishihara	d0f0e8dcff	settings: propagate error from git_settings() and signing_backend()	2024-12-21 09:19:44 +09:00
Yuya Nishihara	52511f491e	settings: inline CLI options to callers, propagate type error ... This patch moves max_new_file_size() and conflict_marker_style() to CLI, but there isn't a clear boundary whether the configuration should be managed by UserSettings or not. I decided to move them to CLI just because we can eliminate .optional() handling. The default parameters are defined in config/misc.toml.	2024-12-21 09:19:44 +09:00
Yuya Nishihara	3381dd2a2c	cli: extract helper function that constructs SnapshotOptions ... It's a bit weird that we have to construct a start-tracking matcher by caller, but it has to be parameterized anyway.	2024-12-21 09:19:44 +09:00
Yuya Nishihara	1b4e210524	help: move "git push --remote" explanation to main paragraph, some clarification ... We might add --all-remotes at some point, but "jj git push" doesn't support bulk push right now. https://github.com/jj-vcs/jj/discussions/4901#discussioncomment-11607150	2024-12-21 09:19:33 +09: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