7619 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Vincent Ging Ho Yim	1c28498f59	docs: fix typos in immutable_heads() example	2024-10-21 20:35:10 +11:00
Yuya Nishihara	5dd6185fbc	templater: make "git_head" return boolean, render it as "git_head()" ... For the same reason as the root revision is indicated by "root()".	2024-10-21 09:21:34 +09:00
Yuya Nishihara	3d31928dac	revset: drop support for HEAD@git symbol resolution ... This was added at f5f61f6bfe "revset: resolve 'HEAD@git' just like other pseudo @git branches." As I said in this patch, there was no practical use case of the HEAD@git symbol. Suppose we implement colocated workspaces/worktrees #4436, there may be multiple Git HEAD revisions. This means HEAD can no longer be abstracted as a symbol of the "git" remote.	2024-10-21 09:21:34 +09:00
Yuya Nishihara	009284736d	templater: add pad/truncate functions ... As I said in the preceding patch, I settled on separate pad/truncate functions instead of a function taking multiple optional parameters. It's less efficient to process truncation and padding independently, but I don't think that would matter. The order of arguments follows the current f(..., content) convention. We can also add a method syntax, but I'm not sure if it's useful. In order to call a method of Template type, we'll need to coerce printable object to Template: concat(author.email()).truncate_end(10).pad_end(10) ^^^^^^ String -> Template FWIW, String type could provide more efficient truncate/pad methods. Closes #3183	2024-10-21 08:47:08 +09:00
Yuya Nishihara	6e06a79cfd	templater: add support for keyword arguments	2024-10-21 08:47:08 +09:00
Yuya Nishihara	2413fffcf9	revset: extract helper that parses function call ... I'm going to add keyword arguments support to templater.	2024-10-21 08:47:08 +09:00
Yuya Nishihara	ca5d119c10	text_util: add function to pad labeled text ... This could be inlined in templater implementation, but I decided to add text_util functions for ease of testing.	2024-10-21 08:47:08 +09:00
Martin von Zweigbergk	e00f6f121e	docs: mention that that Rust 1.76 is required to install from source ... We have our MSRV recorded in `Cargo.toml`, but at least with Rust versions < 1.71, the build fails before the MSRV is checked (IIUC), and you get a cryptic message like this: ``` error: Package jj-lib v0.22.0 (<some path>) does not have feature git2. ``` The message is clearer from 1.71, but that doesn't help users who have an older version. Let's mention the MSRV everywhere we tell the user to run `cargo` in the installation instructions.	2024-10-19 15:50:34 -07:00
Samuel Tardieu	d14c00db41	nix: update rust-overlay dependency ... This is needed to build with the latest nixpkgs, as it contains the c48c2d76b6 fix.	2024-10-19 14:45:15 +02:00
dploch	49e9003c4e	revset: allow iterators to return evaluation errors ... Custom backends may rely on networking or other unreliable implementations to support revsets, this change allows them to return errors cleanly instead of panicking. For simplicity, only the public-facing Revset and RevsetGraph types are changed in this commit; the internal revset engine remains mostly unchanged and error-free since it cannot generally produce errors.	2024-10-18 17:09:35 -04:00
dploch	c970181ae2	revset: change the commits() iterator to return RevsetEvaluationError ... This facilatates a change to the Revset trait in the next commit.	2024-10-18 17:09:35 -04:00
dploch	9e3e7cc38b	revset: allow RevsetEvaluationError to store arbitrary sources	2024-10-18 17:09:35 -04:00
dependabot[bot]	0ec426d9e8	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [anyhow](https://github.com/dtolnay/anyhow), [libc](https://github.com/rust-lang/libc) and [serde_json](https://github.com/serde-rs/json). Updates `anyhow` from 1.0.89 to 1.0.90 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.89...1.0.90) Updates `libc` from 0.2.160 to 0.2.161 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.161/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.160...0.2.161) Updates `serde_json` from 1.0.128 to 1.0.129 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/1.0.128...1.0.129) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: libc 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>	2024-10-18 13:13:00 -05:00
Yuya Nishihara	0eb4fe8389	text_util: add functions to truncate labeled text ... This will be used by truncate_start/end() template functions. I considered adding a template function that supports both padding and truncation, but the function interface looked a bit messy. There may be (max_width, ellipsis, left|middle|right) parameters for truncation, and (min_width, fill_char, left|center|right) for padding. I'm not going to add ellipsis and centering support, but it's weird if pad(center) implied truncate(middle).	2024-10-18 18:26:36 +09:00
Yuya Nishihara	8a1cdd9215	text_util: extract generic truncation helpers to support &[u8]	2024-10-18 18:26:36 +09:00
Yuya Nishihara	6a1db0dc21	text_util: add elide_end() function ... This function mirrors elide_start(), literally. We don't have any callers for the moment, but it helps write tests of inner truncation helpers. I'm going to add bytes version of these functions to implement "truncate" template functions.	2024-10-18 18:26:36 +09:00
dependabot[bot]	35e47e7fa0	cargo: bump libc from 0.2.159 to 0.2.160 in the cargo-dependencies group ... Bumps the cargo-dependencies group with 1 update: [libc](https://github.com/rust-lang/libc). Updates `libc` from 0.2.159 to 0.2.160 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.160/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.159...0.2.160) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-17 11:27:51 -05:00
Yuya Nishihara	9294507a1a	cli: leverage clap's default ArgGroup to handle config --user|--repo ... https://docs.rs/clap/latest/clap/_derive/index.html#arggroup-attributes	2024-10-17 22:57:47 +09:00
Samuel Tardieu	2112584973	style: remove unneeded lifetimes from trait implementations ... Clippy 1.83 (currently in beta) detects more cases of unneeded lifetimes, namely in trait implementation declarations. Since this lint is warn by default, we need to fix those instances to get a clean CI.	2024-10-17 13:35:06 +02:00
Samuel Tardieu	33f9b89350	rewrite: build Vec instances directly ... `[].to_vec()` looks like a manual implementation of `vec![]`.	2024-10-17 00:09:05 +02:00
Martin von Zweigbergk	9e80d0c51d	docs: update immutable_heads() examples to use builtin_immutable_heads() ... Users should generally use `builtin_immutable_heads()` when they override `immutable_heads()`, so this patch updates the existing example to use that. I also added another example showing how to make an additional remote-tracking bookmark immutable.	2024-10-16 13:59:30 -07:00
dependabot[bot]	4c25f3475d	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.87 to 1.0.88 - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.87...1.0.88) --- 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-10-16 22:58:28 +02:00
Ilya Grigoriev	166cdd0e5e	docs git-comparison: add shorthands for some bookmark commands ... I don't want people to think they'll have to type out the long version, at least for the most common ones.	2024-10-16 10:54:46 -07:00
Ilya Grigoriev	9291ae4aed	docs git-comparison: bookmark set -> bookmark move	2024-10-16 10:54:46 -07:00
Ilya Grigoriev	61429739b3	cli branch move: document that we don't want to support -f for --from ... Reasoning: we don't want it confused with --force	2024-10-16 10:54:28 -07:00
Ilya Grigoriev	b795bf9562	docs glossary & git-comparison: fixup & update bookmark->branch transition ... This fixes up git-comparison.md. The changes to the glossary could be moved to a separate commit/PR.	2024-10-15 23:29:11 -07:00
Benjamin Tan	0f605b8aae	templates: Timestamp: add after, before methods ... This allows for more fine-grained control of timestamp formatting, for example: ``` [template-aliases] 'format_timestamp(timestamp)' = ''' if(timestamp.before("1 week ago"), timestamp.format("%b %d %Y %H:%M"), timestamp.ago() ) ''' ``` Closes #3782.	2024-10-16 13:46:06 +08:00
Benjamin Tan	11648ee2e3	rebase: extract rebase destination arguments into separate struct	2024-10-16 11:26:59 +08:00
Benjamin Tan	aa46c02835	rebase -s: add support for --insert-after and --insert-before options	2024-10-16 11:26:59 +08:00
Benjamin Tan	e3ebb117b6	rebase: add compute_rebase_destination function	2024-10-16 11:26:59 +08:00
Benjamin Tan	afa2935945	rebase: use move_commits to rebase descendants for --source and --branch	2024-10-16 11:26:59 +08:00
Benjamin Tan	ef5ed39976	rewrite: move_commits: allow specifying the roots of target set manually ... This is required when performing `rebase -s a -s b` where "b" is a descendant of "a". Both "a" and "b" should be regarded as the roots of the target set and be rebased onto the new destination.	2024-10-16 11:26:59 +08:00
Benjamin Tan	6a1262901e	rewrite: move_commits: use rebase_commit_with_options to rebase commits ... This allows for `RebaseOptions` to be respected. This will be used when migrating `rebase --source`/`rebase --branch` to use `move_commits` to respect the `--before`/`--after` options.	2024-10-16 11:26:59 +08:00
Benjamin Tan	8e817bc24b	revset: add coalesce(revsets...) ... The `coalesce` function takes a list of revsets and returns the commits in the first revset in the list which evalutes to a non-empty set of commits. It can be used to display fallbacks if a certain commit cannot be found, e.g. `coalesce(present(user_configured_trunk), builtin_trunk)`.	2024-10-16 10:36:27 +08:00
Ilya Grigoriev	eaab8bbc36	formatter & colors.toml: replace op_log color label with operation ... Cleans up after 7051effa8f It's split into "op_log operation" and just "operation" for the summaries (as suggested by Yuya). The color labels use "operation".	2024-10-15 19:30:19 -07:00
Yuya Nishihara	ad4b940daa	object_id: implement Display on ObjectId types ... It's convenient if id can be inlined in error messages.	2024-10-16 09:12:16 +09:00
Yuya Nishihara	5658f070fc	hex_util: simplify conversion from bytes to reverse hex string	2024-10-16 09:12:16 +09:00
Yuya Nishihara	59c635bfd0	object_id: add ChangeId::reverse_hex() for convenience ... Borrowed from #4470.	2024-10-16 09:12:16 +09:00
Vincent Ging Ho Yim	e415c09ede	docs/FAQ: fix incorrect change ID for commit removed as parent	2024-10-16 09:50:04 +11:00
Martin von Zweigbergk	f4c0baf712	cli: allow (and ignore) -d flag for jj new ... We were discussing whether `jj backout` and `jj duplicate` should support `-d/-A/-B` just like `jj rebase` does. `jj new` already accepts `-A/-B` but it does not accept `-d`. It does support `-r`, however. It seems like `-d` is a better match for `jj new` since it creates a commit on top. So this patch adds support for that flag too. I now think `-r` sounds misleading for `jj new`, but I left it in for now.	2024-10-15 09:33:39 -07:00
Alec Snyder	470275b0d0	cli: Add command jj file annotate ... A new module is added to jj_lib which exposes a function get_annotation_for_file. This annotates the given file line by line with commit information according to the commit that made the most recent change to the line. Similarly, a new command is added to the CLI called `jj file annotate` which accepts a file path. It then prints out line by line the commit information for the line and the line itself. Specific commit information can be configured via the templates.annotate_commit_summary config variable	2024-10-15 16:31:32 +03:00
Jakub Okoński	f741102f83	cargo: bump scm-record to 0.4.0	2024-10-14 21:01:53 -07:00
Ilya Grigoriev	5dab5e1ce6	demos: update, replace branch with bookmark ... The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.	2024-10-14 19:49:14 -07:00
Ilya Grigoriev	d2667c52ec	demos/run_script.sh: fix ImageMagick invocation ... Because of changes to ImageMagick, the previous demos update increased the png file sizes significantly. This is the fix.	2024-10-14 19:49:14 -07:00
Yuya Nishihara	a9df7a1339	fileset: remove Eq + PartialEq from FilesetExpression/Pattern ... For the same reason as the revset change 9613ec4f. If we add more complex pattern or expression, Eq might not be implementable.	2024-10-15 06:58:44 +09:00
Yuya Nishihara	d177bb9f66	fileset: switch expression tests to insta::assert_debug_snapshot()	2024-10-15 06:58:44 +09:00
Yuya Nishihara	2888c1d842	fileset: filter out glob tokens field from snapshot tests ... It will become more verbose in the next patch.	2024-10-15 06:58:44 +09:00
Ilya Grigoriev	f1bcd42883	operation templates: use end time instead of start time ... See also inline comment. For a second, I thought about replacing the word "lasted" with "after" to make it clearer, but I think it's not necessary.	2024-10-14 13:09:21 -07:00
Austin Seipp	346b16224c	changelog: move shallow clone support to unreleased section ... The change was originally made during the last release cycle, so the hunks were based and rebased on top of the previous release section. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-10-14 21:06:36 +02:00
dependabot[bot]	48684eea10	cargo: bump the cargo-dependencies group with 2 updates ... Bumps the cargo-dependencies group with 2 updates: [pest](https://github.com/pest-parser/pest) and [pest_derive](https://github.com/pest-parser/pest). Updates `pest` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.13...v2.7.14) Updates `pest_derive` from 2.7.13 to 2.7.14 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.7.13...v2.7.14) --- updated-dependencies: - dependency-name: pest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest_derive dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-14 18:43:45 +00:00