10315 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Austin Seipp	e50d04170c	github: bump runners to macos-15 across the board ... Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-10-06 18:00:12 +00:00
Austin Seipp	8605e54135	github: bump CI timer, again ... This also includes a note on the last time I did it, so anyone who has to regrettably trudge through the CI configuration can read it and see why. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-10-06 18:00:03 +00:00
dependabot[bot]	4fd01293b5	cargo: bump the cargo-dependencies group with 3 updates ... Bumps the cargo-dependencies group with 3 updates: [datatest-stable](https://github.com/nextest-rs/datatest-stable), [pest](https://github.com/pest-parser/pest) and [pest_derive](https://github.com/pest-parser/pest). Updates `datatest-stable` from 0.3.2 to 0.3.3 - [Release notes](https://github.com/nextest-rs/datatest-stable/releases) - [Changelog](https://github.com/nextest-rs/datatest-stable/blob/main/CHANGELOG.md) - [Commits](https://github.com/nextest-rs/datatest-stable/compare/datatest-stable-0.3.2...datatest-stable-0.3.3) Updates `pest` from 2.8.2 to 2.8.3 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.8.2...v2.8.3) Updates `pest_derive` from 2.8.2 to 2.8.3 - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.8.2...v2.8.3) --- updated-dependencies: - dependency-name: datatest-stable dependency-version: 0.3.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest dependency-version: 2.8.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: pest_derive dependency-version: 2.8.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-06 17:22:17 +00:00
Theo Buehler	809941c822	lib: fix test_resolve_os for the unix family ... On a unix OS which isn't linux, "--when.platform = ['unix']" matches, so adjust the assertion accordingly. Fixes this test on OpenBSD and should fix the tests on other unix systems, in particular other *BSDs.	2025-10-06 15:45:00 +00:00
Joseph Lou	165fd2642e	changelog: Update links for v0.34.0 release ... I was updating the changelog for another PR and noticed that the links were out of sync.	2025-10-06 15:29:36 +00:00
Angel Ezquerra	dc59c66c12	metaedit: do not edit the change if the --author-timestamp matches the current timestamp (fixes #7602)	2025-10-06 07:19:45 +00:00
ase	de6ca46d46	docs: update jj init --git to jj git init	2025-10-04 19:44:56 +00:00
Martin von Zweigbergk	e541d384ac	changelog: mention new warning for bookmarking empty revision	2025-10-02 21:30:03 +00:00
Austin Seipp	22900c9a9b	release: 0.34.0 ... Signed-off-by: Austin Seipp <austin@ersc.io> Signed-off-by: Austin Seipp <aseipp@pobox.com>	2025-10-01 23:09:57 +00:00
Anton Älgmyr	41837fe930	bisect: Make bisect able to search for first good/bad revision in the range	2025-10-01 22:24:32 +00:00
Dinu Blanovschi	ac4704278e	docs: Add untrack command for Jujutsu in git command table	2025-09-30 18:16:15 +00:00
Yuya Nishihara	c7ffb5d42a	view: rename remaining local "tag" functions	2025-09-30 13:51:40 +00:00
Yuya Nishihara	3d4d372b6c	view: rename tags() to local_tags(), make it return iterator ... This matches the "bookmark" API.	2025-09-30 13:51:40 +00:00
Yuya Nishihara	baf5f1355f	op_store: rename tags field to local_tags ... I'm going to rename "tag" in the view API to "local_tag". Since the underlying data structures are split to View and RemoteView, it's not important to add "local_" prefix. However, I think this change is good for consistency.	2025-09-30 13:51:40 +00:00
MochikoNyan	27cafeaefd	doc: fix minor typo in FAQ.md	2025-09-30 13:47:44 +00:00
dependabot[bot]	2cec421e12	cargo: bump the cargo-dependencies group with 7 updates ... Bumps the cargo-dependencies group with 7 updates: | Package | From | To | | --- | --- | --- | | [hashbrown](https://github.com/rust-lang/hashbrown) | `0.15.5` | `0.16.0` | | [libc](https://github.com/rust-lang/libc) | `0.2.175` | `0.2.176` | | [quote](https://github.com/dtolnay/quote) | `1.0.40` | `1.0.41` | | [ref-cast](https://github.com/dtolnay/ref-cast) | `1.0.24` | `1.0.25` | | [regex](https://github.com/rust-lang/regex) | `1.11.2` | `1.11.3` | | [tempfile](https://github.com/Stebalien/tempfile) | `3.22.0` | `3.23.0` | | [thiserror](https://github.com/dtolnay/thiserror) | `2.0.16` | `2.0.17` | Updates `hashbrown` from 0.15.5 to 0.16.0 - [Release notes](https://github.com/rust-lang/hashbrown/releases) - [Changelog](https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/hashbrown/compare/v0.15.5...v0.16.0) Updates `libc` from 0.2.175 to 0.2.176 - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.176/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.175...0.2.176) Updates `quote` from 1.0.40 to 1.0.41 - [Release notes](https://github.com/dtolnay/quote/releases) - [Commits](https://github.com/dtolnay/quote/compare/1.0.40...1.0.41) Updates `ref-cast` from 1.0.24 to 1.0.25 - [Release notes](https://github.com/dtolnay/ref-cast/releases) - [Commits](https://github.com/dtolnay/ref-cast/compare/1.0.24...1.0.25) Updates `regex` from 1.11.2 to 1.11.3 - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.11.2...1.11.3) Updates `tempfile` from 3.22.0 to 3.23.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.22.0...v3.23.0) Updates `thiserror` from 2.0.16 to 2.0.17 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.16...2.0.17) --- updated-dependencies: - dependency-name: hashbrown dependency-version: 0.16.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: libc dependency-version: 0.2.176 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: quote dependency-version: 1.0.41 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: ref-cast dependency-version: 1.0.25 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: regex dependency-version: 1.11.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tempfile dependency-version: 3.23.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: thiserror dependency-version: 2.0.17 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-29 21:06:05 +00:00
Anton Älgmyr	f2430340e9	docs: Update tutorial hint to better reflect current state	2025-09-29 20:59:42 +00:00
Anton Älgmyr	2805642749	docs: Update code font to one that supports the log symbols	2025-09-29 20:59:13 +00:00
dependabot[bot]	c17ec49509	github: bump the github-dependencies group with 3 updates ... Bumps the github-dependencies group with 3 updates: [taiki-e/install-action](https://github.com/taiki-e/install-action), [cachix/install-nix-action](https://github.com/cachix/install-nix-action) and [github/codeql-action](https://github.com/github/codeql-action). Updates `taiki-e/install-action` from 2.62.1 to 2.62.13 - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](d6912b4777...d0f4f69b07) Updates `cachix/install-nix-action` from 31.6.2 to 31.7.0 - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md) - [Commits](a809471b5c...9280e7aca8) Updates `github/codeql-action` from 3.30.3 to 3.30.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](192325c861...3599b3baa1) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.62.13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: cachix/install-nix-action dependency-version: 31.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: github/codeql-action dependency-version: 3.30.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-29 20:04:18 +00:00
Jonas Fierlings	7bee0fcf4f	docs: Fix links in config.md ... Make sure the links render as intended by fixing the order of link definitions, and inserting missing markup.	2025-09-29 14:13:53 +00:00
Antonin Delpeuch	589ed8369c	external_merge: pass the repo_path to the merge tool ... This follows Git's merge driver interface which makes this information available using the `%P` variable. It is useful for merge drivers to adapt their behaviour based on the type of file supplied.	2025-09-29 01:07:22 +00:00
Steven Sherry	71ea0d2372	gitignore: don't parse .gitignore comments	2025-09-28 14:08:34 +00:00
Isaac Corbrey	63d36f7b85	workflows: Fix null reference in commit checker	2025-09-27 14:44:00 +00:00
Yuya Nishihara	744631d2bf	cleanup: use method version of str::from_utf8() ... MSRV is now 1.88. https://doc.rust-lang.org/stable/std/primitive.str.html#method.from_utf8	2025-09-27 09:26:05 +00:00
Yuya Nishihara	e894882633	git: split reset_head() to inner functions ... This might help skip unneeded operations or extract function that just updates the Git HEAD.	2025-09-26 03:12:07 +00:00
Martin von Zweigbergk	29991bb6d0	git: avoid an unnecessary clone of a MergedTree	2025-09-25 09:42:37 +00:00
Ivan Petkov	736f9bb5f7	cli: rewrite get_git_hash_from_jj in a functional style	2025-09-25 05:06:04 +00:00
Ivan Petkov	c6df4e1a48	cli: rewrite get_git_hash_from_git in a functional style	2025-09-25 05:06:04 +00:00
Ivan Petkov	4630c3fda3	cli: lazily emit cargo:rerun-if-changed to avoid spurious rebuilds ... The build script has a hierarchy of where the current git hash is detected from: check $NIX_JJ_GIT_HASH, if that fails, ask jj, if that fails, ask git. If the build script is satisfied from a query higher up the priority chain, there's no reason to instruct cargo to rereun and rebuild (and relink) everything: for example if $NIX_JJ_GIT_HASH is set, there's no need to check heads from either jj or git. Although the build script takes effort to specify `jj log --ignore-working-copy`, it would previously still get invalidated if jj performed a snapshot (even if $NIX_JJ_GIT_HASH was set). This can be fairly annoying when iterating on the test suite where each commit would rebuild the CLI and by extension all of its tests.	2025-09-25 05:06:04 +00:00
Ivan Petkov	502eaca157	cli: split each git hash source into its own build script function	2025-09-25 05:06:04 +00:00
Matt Stark	bf6c022831	cli util: Add the environment variable JJ_WORKSPACE_ROOT	2025-09-25 03:41:12 +00:00
Angel Ezquerra	df2c1ed474	config get: add support for displaying arrays and tables ... Up until now, trying to get a config value that was an array or a table would fail with an error indicating that only values that can be converted to a string can be displayed. This change fixes that issue by converting arrays and tables into TOML format.	2025-09-24 16:51:11 +00:00
Yuya Nishihara	120d492d4e	git, op_store: migrate and import "refs/tags/*" as @git remote tags ... The migration logic is basically the same as 717d0d3d6d "git: on deserialize/import/export, copy refs/heads/* to remote named git." Now git::import_refs() processes bookmarks and tags in the same way. git::export_refs() is unchanged because we don't have any commands that would move local tags internally.	2025-09-24 09:09:52 +00:00
Yuya Nishihara	a89680d34b	op_store: add remote tags storage and basic accessors ... Git-tracking tags will be stored there. I don't have a concrete plan for proper remote tags support, but I think tags fetched/pushed internally can be recorded as remote tags.	2025-09-24 09:09:52 +00:00
Yuya Nishihara	0dc1beba12	op_store: make local/remote refs helper generic over RemoteView fields	2025-09-24 09:09:52 +00:00
Yuya Nishihara	aac63636cb	op_store: reorganize proto reflecting new RemoteView structure ... I'm thinking of adding remote tags table to support tag mutation commands, so I think it's time to update the storage format. RefTarget is serialized to a list of alternate terms because we don't need to support legacy formats here.	2025-09-24 09:09:52 +00:00
Ilya Grigoriev	4e09ad9fc0	nextest: change the "SLOW" timeout in CI to 10s ... Previously, nextest marked tests slow in CI when they run for more than 5 seconds. This makes it so that this happens after 10 seconds. I did *not* change the timeout for when tests are actually *terminated* for being too slow. It remains at 100s. It might make sense to increase it (keeping the `terminate-after` multiplier at 10). This is just adjusting to taste, but I find the number of SLOWs in 5074734234 distracting, and most of the slow tests on Windows last more than 10s anyway. We could also do this only on Windows if people prefer, but I think doing it everywhere is simpler.	2025-09-24 04:58:36 +00:00
Ilya Grigoriev	d8e17d9956	nextest: mark tests that last >10s as "SLOW" ... This makes it so that tests that last longer than 10s are marked as "SLOW" in nextest UI. This does not terminate them. We already have this enabled in CI, but it seems nice to enable for everybody. On my machine, `test_concurrent_read_write_commit` sometimes deadlocks, and this helps see which test is troublesome. I erred on the side of a higher timeout, following the principle that it's more important that warnings are actionable than to miss some warnings. If somebody is debugging slow tests, they'll know to lower the value. See the CI config or the next commit for what a config that also terminates tests if they run too long looks like.	2025-09-24 04:58:36 +00:00
Stephen Jennings	ce7e185d0b	docs: Add guide for configuring multiple remotes ... A common question is how to set up Jujutsu to work with multiple remotes. Sometimes people are not sure which bookmarks they should track.	2025-09-23 23:31:09 +00:00
Ilya Grigoriev	09dea71a15	git-backend: test and make public change id reading from headers ... Having tests illustrates the behavior. Making this public de-duplicates the code with ERSC. This also allows determining whether a change id comes from the header or is synthetic. This is just a nice-to-have for me, we will also duplicate the code until this is merged (if that happens).	2025-09-23 03:47:15 +00:00
Angel Ezquerra	86bbe5a3cb	mise: add build:cli-reference-review task ... This lets you regenerate the cli-reference and review the changes.	2025-09-22 20:53:06 +00:00
Ilya Grigoriev	cefc0db81b	git_subprocess: make sure we do not try to fetch submodules regardless of .gitconfig ... This fixes the bug described below. I have `submodule.recurse=true` set in my .gitconfig. When trying to fetch repos with submodules (e.g. git/git), I got errors like these: ```console $ jj git fetch remote: Enumerating objects: 853, done. remote: Total 853 (delta 448), reused 439 (delta 413), pack-reused 315 (from 2) Error: Git process failed: External git program failed: Could not access submodule 'sha1collisiondetection' ``` This error occured when fetching only, *not* when cloning. It occured even when there wasn't anything to fetch. I only tested repositories that never had submodules initialized or fetched (which would have to be done with Git).	2025-09-22 20:50:50 +00:00
David Barsky	6980253e70	docs: file brian and david as paid contributors for ERSC	2025-09-22 20:28:28 +00:00
dependabot[bot]	6d374dbe71	cargo: bump the cargo-dependencies group with 6 updates ... Bumps the cargo-dependencies group with 6 updates: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.47` | `4.5.48` | | [clap_complete](https://github.com/clap-rs/clap) | `4.5.57` | `4.5.58` | | [indexmap](https://github.com/indexmap-rs/indexmap) | `2.11.1` | `2.11.4` | | [proptest](https://github.com/proptest-rs/proptest) | `1.7.0` | `1.8.0` | | [toml](https://github.com/toml-rs/toml) | `0.9.6` | `0.9.7` | | [toml_edit](https://github.com/toml-rs/toml) | `0.23.5` | `0.23.6` | Updates `clap` from 4.5.47 to 4.5.48 - [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.47...clap_complete-v4.5.48) Updates `clap_complete` from 4.5.57 to 4.5.58 - [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.57...clap_complete-v4.5.58) Updates `indexmap` from 2.11.1 to 2.11.4 - [Changelog](https://github.com/indexmap-rs/indexmap/blob/main/RELEASES.md) - [Commits](https://github.com/indexmap-rs/indexmap/compare/2.11.1...2.11.4) Updates `proptest` from 1.7.0 to 1.8.0 - [Release notes](https://github.com/proptest-rs/proptest/releases) - [Changelog](https://github.com/proptest-rs/proptest/blob/main/CHANGELOG.md) - [Commits](https://github.com/proptest-rs/proptest/compare/v1.7.0...v1.8.0) Updates `toml` from 0.9.6 to 0.9.7 - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.9.6...toml-v0.9.7) Updates `toml_edit` from 0.23.5 to 0.23.6 - [Commits](https://github.com/toml-rs/toml/compare/v0.23.5...v0.23.6) --- updated-dependencies: - dependency-name: clap dependency-version: 4.5.48 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-version: 4.5.58 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: indexmap dependency-version: 2.11.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: proptest dependency-version: 1.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: toml dependency-version: 0.9.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: toml_edit dependency-version: 0.23.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-22 20:28:07 +00:00
Remo Senekowitsch	526005fd2b	docs: add link to "Jujutsu for everyone" tutorial ... Our own tutorial and the one by Steve Klabnik both require experience with Git. Adding a link to "Jujutsu for everyone" will give newcomers without that experience an appropriate starting point for learning Jujutsu.	2025-09-22 16:49:30 +00:00
dependabot[bot]	b7f8d50523	github: bump the github-dependencies group with 2 updates ... Bumps the github-dependencies group with 2 updates: [taiki-e/install-action](https://github.com/taiki-e/install-action) and [cachix/install-nix-action](https://github.com/cachix/install-nix-action). Updates `taiki-e/install-action` from 2.61.5 to 2.62.1 - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](849bd009f7...d6912b4777) Updates `cachix/install-nix-action` from 31.6.1 to 31.6.2 - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md) - [Commits](7be5dee142...a809471b5c) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.62.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: cachix/install-nix-action dependency-version: 31.6.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-22 16:47:21 +00:00
Matt Stark	b1ef4f688a	cli util: Make jj util exec act more transparently. ... If a subprocess exits with a nonzero status, we don't need to print out the fact that it exited with a nonzero status. I think it is fairly obvious that we should try to match the return code of the inner process. In a bit more contention is whether we should print out the error message at all. I would argue that a command that fails almost always prints to stderr anyway, and the whole point of `jj util exec` is that it should go into your aliases and thus the fact that it's an "external" command should be hidden from the user (see my example above). ``` $ jj upload # "upload" is an alias using jj util exec <presubmit failures> Error: presubmits failed external command exited with 5 <exits with exit status 1> ```	2025-09-22 02:17:46 +00:00
Yuya Nishihara	9a5e2ae02e	op_store: remove stale TODO about renamed remote and view state ... We aren't going to fix this problem by inserting another indirection, at least to the view layer.	2025-09-22 00:08:45 +00:00
Martin von Zweigbergk	4f456ec824	merge: add a generic Diff<T> type, use in TreeDiffEntry ... I think this helps readability a bit. I updated `TreeDiffEntry` and a few related places. I think there are many other places where we could use the new type.	2025-09-21 16:16:33 +00:00
Martin von Zweigbergk	452a1a454c	cli_util: rename Diff to ContentDiff ... I'm about to add a generic `Diff<T>` that's more similar to `Merge<T>`, so I want to free up the name. It seems better to have `Diff<T>` and `ContentDiff` than e.g. `GenericDiff<T>` and `Diff` or having to use qualified imports.	2025-09-21 16:16:33 +00:00