686 commits

Author	SHA1	Message	Date
Yuya Nishihara	a3636d8a83	revset: add subject() predicate that matches first line of descriptions ... It's generally useful, and we can get by without introducing weird special case about newline terminator. Closes #5227	2025-01-21 02:13:04 +00:00
Yuya Nishihara	5577ffd28d	revset: split author()/committer() into _name()/email() predicates ... It seemed weird that we don't have primitive functions to query either name or email field. This also fixes mine() to not match against name.	2025-01-21 01:10:00 +00:00
George Christou	9314df9e38	formatter: add support for italic text	2025-01-20 17:46:27 +00:00
Valentin Gatien-Baron	019bd8f757	restore: add --into flag, make --to an alias to it ... This is a part of #5394.	2025-01-19 20:17:44 +00:00
Vincent Ging Ho Yim	661c443dbc	docs/contributing: fix incorrect bookmark name	2025-01-17 12:23:24 +00:00
Bryce Berger	f7431650be	templates: add cryptographic_signature display to default formats ... Cryptographic signature support in templates was added in c99c97c646 (#4853), but has to be manually configured. This adds some defaults to the built-in config. Instead of having separate `builtin_*_with_sig` aliases, this adds to the aliases that actually format commits. Since signature verification is slow, this is disabled by default. To enable it, override `ui.show-cryptographic-signatures`: [ui] show-cryptographic-signatures = true [template-aliases] 'format_short_cryptographic_signature(signature)' = ... 'format_detailed_cryptographic_signature(signature)' = ... Note that the two formatting functions take `Option<CryptographicSignature>`, not `CryptographicSignature`. This allows you to display a custom message if a signature is not found, but will emit an error if you do not check for signature presence. [template-aliases] 'format_detailed_cryptographic_signature(signature)' = ''' if(signature, "message if present", "message if missing", ) '''	2025-01-15 23:29:35 +00:00
Charlie-83	ae8f6a3837	docs: fix incorrect XDG env variable	2025-01-15 18:06:02 +00:00
Ilya Grigoriev	c3c2e882c9	docs config: an advanced example of --config syntax ... This seems non-trivial to discover and could be useful for people transitioning from `--config-toml`.	2025-01-15 05:25:23 +00:00
Ilya Grigoriev	ac1be9374b	docs templates: document the Email type methods in more detail	2025-01-15 05:07:53 +00:00
Robert Jackson	9ed1fde364	docs: Expose config-schema.json in the docs site ... When landed and published, this will expose the config file as: https://jj-vcs.github.io/jj/latest/config-schema.json Exposing the schema like that will allow users to reference in their `~/.config/jj/config.toml` like: ```toml "$schema" = 'https://jj-vcs.github.io/jj/latest/config-schema.json' ``` At which point any user with a configured LSP for TOML files will get inline documentation, suggestions on valid keys, &c.	2025-01-14 13:45:36 +00:00
Yuya Nishihara	fadbbcb430	ui: switch builtin pager to streampager ... According to the discussion on Discord, streampager is still maintained. It brings more dependencies, but seems more reliable in our use case. For example, the streampager doesn't consume inputs indefinitely whereas minus does. We can also use OS-level pipe to redirect child stderr to the pager.	2025-01-14 01:13:13 +00:00
Stephen Jennings	be5eb27f16	fix: Add enabled config for fix tools ... Adds an optional `fix.tools.TOOL.enabled` config that disables use of a fix tool (if omitted, the tool is enabled). This is useful for defining tools in the user's configuration without enabling them for all repositories: ```toml # ~/.jjconfig.toml [fix.tools.rustfmt] enabled = false command = ["rustfmt", "--emit", "stdout"] patterns = ["glob:'**/*.rs'"] ``` Then to enable it in a repository: ```shell $ jj config set --repo fix.tools.rustfmt.enabled true ```	2025-01-13 17:29:49 +00:00
Benjamin Tan	9aaf98330b	cli: git push: allow signing commits on push ... This adds the `git.sign-on-push` configuration which can be used to automatically sign unsigned commits before pushing to a Git remote.	2025-01-12 02:33:32 +00:00
Yuya Nishihara	98724278c5	templater: add config(name) function ... This could be used in order to switch template outputs conditionally, or to get the default push remote for example.	2025-01-11 01:40:23 +00:00
Yuya Nishihara	83d237a32c	templater: introduce ConfigValue type, port "config list" value to it ... I'm going to add config(name) accessor, which returns ConfigValue.	2025-01-11 01:40:23 +00:00
Stephen Jennings	4ef8ad8445	docs: Explain what elided revisions are ... A common question is asking how to show elided revisions. This FAQ explains why revisions are elided and how to display them.	2025-01-11 01:18:45 +00:00
Philip Metzger	c40e5210c4	docs: fix the mkdocs admonition I recently added ... I didn't check the indentation as it _needs_ to be a codeblock to render correctly.	2025-01-10 23:09:01 +00:00
Evan Martin	1f24d57325	docs: fix typo in in command	2025-01-10 21:21:08 +00:00
Philip Metzger	038c0bab12	docs: Make dynamic completions a bit more visible ... In recent times multiple users showed up and were confused _why_ some completions didn't show up, so make it explicit that they're opt-in until the Clap upstream has made it so. Also remove the link to the dynamic completions improvements issue, as it was closed a while ago.	2025-01-10 20:59:45 +00:00
Bryce Berger	84e619cae6	contributing: recommend bacon over cargo-watch ... As of [1], `cargo-watch` is on minimal development and officially recommends `bacon` as a successor. [1]: 9f27bc1c96,	2025-01-09 19:39:54 +00:00
Bryce Berger	b1b2c62c3e	diff: add merge-tools.*.diff-expected-exit-codes ... Certain tools (`diff`, `delta`) exit with code 1 to indicate there was a difference. This allows selectively suppressing the "Tool exited with ... status" warning from jj when generating a diff. example: ```toml [merge.tools.delta] diff-expected-exit-codes = [0, 1] ```	2025-01-08 08:03:59 +00:00
Yuya Nishihara	d001291a27	Back out "config: merge and print inline tables as values" ... This backs out commit 0de36918e4. Documentation, tests, and comments are updated accordingly. I also add ConfigTableLike type alias as we decided to abstract table-like items away. Closes #5255	2025-01-08 05:24:55 +00:00
Austin Seipp	a621d8cf3f	docs: improve and convert library design diagram to SVG ... It was lovingly hand drawn by yours truly in Excalidraw. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-01-07 20:32:56 -06: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
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
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
umnikos	ecbee49bf4	docs: fix typo in builtin_immutable_heads() description	2024-12-31 19:24:36 -06:00
Waleed Khan	34ec85edbd	docs: revert "docs: update installation docs to say that cmake is needed" ... This reverts commit b7ba3fc0be. As per discussion in https://github.com/martinvonz/jj/pull/5047, I would like to make it so that the default build configuration doesn't need `cmake`.	2024-12-31 17:07:52 -06:00
Scott Taylor	0dbcdf7233	docs: explain long conflict markers	2024-12-25 20:34:40 -06: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
Tim Janik	e3c8dce06a	docs/config.md: the op log needs a builtin_op_log_* template ... Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-20 06:15:34 +01:00
Jochen Kupperschmidt	07e01c1ba6	docs: Git does not use bookmarks	2024-12-19 20:59:45 -08:00
Yuya Nishihara	89d3a8b8b7	config: remove check for relative path patterns, add doc about path equivalence ... I originally added the check so we would never canonicalize path relative to random cwd, but Windows CI failed because "/" is a relative path. Suppose user would want to share the same configuration file between native Windows and WSL, this check would be too nitpicky.	2024-12-20 09:23:46 +09:00
Yuya Nishihara	f5d450d7c3	cli: resolve conditional config scopes ... This is an alternative way to achieve includeIf of Git without adding "include" directive. Conditional include (or include in general) is a bit trickier to implement than loading all files and filtering the contents. Closes #616	2024-12-19 11:09:02 +09:00
Stephen Jennings	3316180dc1	config: Add commit_timestamp(commit) template alias ... Adds an extension point for changing which date is displayed in log formats. The function should return a timestamp, not a formatted string.	2024-12-18 17:55:03 -08:00
Martin von Zweigbergk	b836e0ae95	docs/cli: update URLs to from martinvonz user to jj-vcs org ... We just migrated to the jj-vcs GitHub org, so we should point to the new GitHub URLs.	2024-12-17 12:44:44 -08:00
scored wrench	2a563039a5	docs: fix incorrect gitignore path	2024-12-17 10:02:55 -08:00
Yuya Nishihara	f87c6ed337	cli: deprecate --config-toml ... Typical usage should now be covered by --config=NAME=VALUE. Closes #3867	2024-12-17 20:12:12 +09:00
Yuya Nishihara	60078e9887	cli: add simpler --config=NAME=VALUE argument ... This supersedes #3867. I'll probably replace all uses of --config-toml and mark --config-toml as deprecated.	2024-12-17 10:33:29 +09:00
Milo Moisson	acaf7afc5b	docs: document JJ_LOG and --debug	2024-12-17 01:51:35 +01:00
Tim Janik	25117d7d01	docs/github.md: Useful Revsets: fix revset for @ ancestry without remotes ... This also fixes a mismatch between using ::@ to list ancestors and calling them descendants. Signed-off-by: Tim Janik <timj@gnu.org>	2024-12-16 21:23:09 +01:00
Benjamin Tan	dc16830151	templater: add Email template type, deprecate Signature.username() ... The `Signature.email()` method is also updated to return the new Email type. The `Signature.username()` method is deprecated for `Signature.email().local()`.	2024-12-15 16:03:34 +08:00
Yuya Nishihara	fca92f1e16	cli: add --config-file=PATH argument ... This would be useful for scripting purpose. Maybe we can also replace the current --config-toml=<TOML> use cases by --config-file=<PATH> and simpler --config=<KEY>=<VALUE>. https://github.com/martinvonz/jj/issues/4926#issuecomment-2506672165 If we want to add more source variants (such as fd number), it might be better to add --config-from=<type>:<path|fd|..>. In any case, we'll probably want --config=<KEY>=<VALUE>, and therefore, we'll need to merge more than one --config* arguments.	2024-12-13 10:27:03 +09:00
Yuya Nishihara	e1ab2477cd	docs: mention "jj file untrack" in Git compatibility list ... Closes #5059	2024-12-13 10:20:48 +09:00
Yuya Nishihara	0f845b6930	docs: quote "jj file untrack" consistently	2024-12-13 10:20:48 +09:00
Austin Seipp	e7e66d23b1	Back out 89d57ffb: "build: add rust-toolchain.toml" ... This backs out commit 89d57ffb29. This is causing a CI failure because we can't build musl binaries, presumably because the rust-toolchain file overriding the chosen musl toolchain for some reason. Backout until we can reapply a proper fix. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-12-12 15:54:30 -06:00
Yuya Nishihara	53b8eeb5ab	templater: rename "logical" eq/ne operators ... They are the equality operators. There aren't logical, bitwise, arithmetic thingy.	2024-12-12 22:48:45 +09:00
Benjamin Tan	da5b790f7a	templater: add relational operators (>=, >, <=, <) ... Closes #5062.	2024-12-12 19:56:29 +08:00
Yuya Nishihara	0de36918e4	config: merge and print inline tables as values ... Before, "jj config get"/"list" and .get() functions processed inline tables as tables (or directories in filesystem analogy), whereas "set"/"unset" processed ones as values (or files.) This patch makes all commands and functions process inline tables as values. We rarely use the inline table syntax, and it's very hard to pack many (unrelated) values into an inline table. TOML doesn't allow newlines between { .. }. Our common use case is to define color styles, which wouldn't be meant to inherit attributes from the default settings. The default pager setting is flattened in case user overrides pager.env without changing the command args.	2024-12-12 10:11:51 +09:00