release: 0.35.0
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-24.04) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run

This commit is contained in:
Scott Taylor 2025-11-05 16:31:40 -06:00
parent d0ea4139a9
commit aa2b76978c
3 changed files with 94 additions and 28 deletions

View file

@ -10,6 +10,33 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Breaking changes
### Deprecations
### New features
### Fixed bugs
## [0.35.0] - 2025-11-05
### Release highlights
* Workspaces can now have their own separate configuration. For instance, you
can use `jj config set --workspace` to update a configuration option only in
the current workspace.
* After creating a local bookmark, it is now possible to use `jj bookmark track`
to associate the bookmark with a specific remote before pushing it. When
pushing a tracked bookmark, it is not necessary to use `--allow-new`.
* The new `jj git colocation enable` and `jj git colocation disable` commands
allow converting between colocated and non-colocated workspaces.
### Breaking changes
* The `remote_bookmarks(remote=pattern)` revset now includes Git-tracking
bookmarks if the specified `pattern` matches `git`. The default is
`remote=~exact:"git"` as before.
* The deprecated flag `--summary` of `jj abandon` has been removed.
* The deprecated command `jj backout` has been removed, use `jj revert` instead.
@ -19,10 +46,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- `core.watchman.register_snapshot_trigger`
- `diff.format`
* The `remote_bookmarks(remote=pattern)` revset now includes Git-tracking
bookmarks if the specified `pattern` matches `git`. The default is
`remote=~exact:"git"` as before.
### Deprecations
* `jj bisect run --command <cmd>` is deprecated in favor of
@ -35,6 +58,23 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### New features
* Workspaces may have an additional layered configuration, located at
`.jj/workspace-config.toml`. `jj config` subcommands which took layer options
like `--repo` now also support `--workspace`.
* `jj bookmark track` can now associate new local bookmarks with remote.
Tracked bookmarks can be pushed without `--allow-new`.
[#7072](https://github.com/jj-vcs/jj/issues/7072)
* The new `jj git colocation` command provides sub-commands to show the
colocation state (`status`), to convert a non-colocated workspace into
a colocated workspace (`enable`), and vice-versa (`disable`).
* New `jj tag set`/`delete` commands to create/update/delete tags locally.
Created/updated tags are currently always exported to Git as lightweight
tags. If you would prefer them to be exported as annotated tags, please give
us feedback on [#7908](https://github.com/jj-vcs/jj/issues/7908).
* Templates now support a `.split(separator, [limit])` method on strings to
split a string into a list of substrings.
@ -50,10 +90,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* Added `template-aliases.empty_commit_marker`. Users can override this value in
their config to change the "(empty)" label on empty commits.
* Workspaces may have an additional layered configuration, located at
`.jj/workspace-config.toml`. `jj config` subcommands which took layer options like
`--repo` now also support `--workspace`.
* Add support for `--when.workspaces` config scopes.
* Add support for `--when.hostnames` config scopes. This allows configuration to
@ -67,13 +103,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
revision is immutable, the user shouldn't take any action, so the red color
was unnecessarily alarming.
* `jj bookmark track` can now associate new local bookmarks with remote.
Tracked bookmarks can be pushed without `--allow-new`.
[#7072](https://github.com/jj-vcs/jj/issues/7072)
* New `jj tag set`/`delete` commands to create/update/delete tags locally.
Updated tags will be exported to Git as lightweight tags.
* New commit template keywords `local`/`remote_tags` to show only local/remote
tags. These keywords may be useful in non-colocated Git repositories where
local and exported `@git` tags can point to different revisions.
@ -82,10 +111,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
to fetch during clone. If present, the first matching branch is used as the
working-copy parent.
* The new `jj git colocation` command provides sub-commands to show the
colocation state (`status`) and to convert a non-colocated git repo into
a colocated repo (`enable`) and vice-versa `disable`.
* Revsets now support logical operators in string patterns.
### Fixed bugs
@ -104,6 +129,46 @@ edits the change twice in some cases.
* Fixed `jj describe --stdin` to append a final newline character.
### Contributors
Thanks to the people who made this release happen!
* Alpha Chen (@kejadlen)
* Angel Ezquerra (@AngelEzquerra)
* ase (@adamse)
* Austin Seipp (@thoughtpolice)
* Benjamin Brittain (@benbrittain)
* bipul (@bipulmgr)
* Brian Schroeder (@bts)
* Bryce Berger (@bryceberger)
* Cole Helbling (@cole-h)
* Daniel Luz (@mernen)
* David Higgs (@higgsd)
* Defelo (@Defelo)
* Fedor (@sheremetyev)
* Gabriel Goller (@kaffarell)
* Gaëtan Lehmann (@glehmann)
* George Christou (@gechr)
* Ilya Grigoriev (@ilyagr)
* Isaac Corbrey (@icorbrey)
* James Coman (@jamescoman)
* Joseph Lou (@josephlou5)
* Lander Brandt (@landaire)
* Martin von Zweigbergk (@martinvonz)
* Michael Chirico (@MichaelChirico)
* Owen Brooks (@owenbrooks)
* Peter Schilling (@schpet)
* Philip Metzger (@PhilipMetzger)
* Remo Senekowitsch (@senekor)
* Ross Smyth (@RossSmyth)
* Scott Taylor (@scott2000)
* Steve Fink (@hotsphink)
* Steve Klabnik (@steveklabnik)
* Theo Buehler (@botovq)
* Theodore Dubois (@tbodt)
* Theodore Keloglou (@sirodoht)
* Yuya Nishihara (@yuja)
## [0.34.0] - 2025-10-01
### Release highlights
@ -4120,7 +4185,8 @@ No changes, only trying to get the automated build to work.
Last release before this changelog started.
[unreleased]: https://github.com/jj-vcs/jj/compare/v0.34.0...HEAD
[unreleased]: https://github.com/jj-vcs/jj/compare/v0.35.0...HEAD
[0.35.0]: https://github.com/jj-vcs/jj/compare/v0.34.0...v0.35.0
[0.34.0]: https://github.com/jj-vcs/jj/compare/v0.33.0...v0.34.0
[0.33.0]: https://github.com/jj-vcs/jj/compare/v0.32.0...v0.33.0
[0.32.0]: https://github.com/jj-vcs/jj/compare/v0.31.0...v0.32.0

10
Cargo.lock generated
View file

@ -1115,7 +1115,7 @@ dependencies = [
[[package]]
name = "gen-protos"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"prost-build",
]
@ -2331,7 +2331,7 @@ dependencies = [
[[package]]
name = "jj-cli"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"assert_cmd",
"assert_matches",
@ -2395,7 +2395,7 @@ dependencies = [
[[package]]
name = "jj-lib"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"assert_matches",
"async-trait",
@ -2454,7 +2454,7 @@ dependencies = [
[[package]]
name = "jj-lib-proc-macros"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"proc-macro2",
"quote",
@ -4070,7 +4070,7 @@ dependencies = [
[[package]]
name = "testutils"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"async-trait",
"bstr",

View file

@ -5,7 +5,7 @@ resolver = "3"
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
version = "0.34.0"
version = "0.35.0"
license = "Apache-2.0"
rust-version = "1.88" # NOTE: remember to update CI, mise.toml, contributing.md, changelog.md, and install-and-setup.md
edition = "2024"
@ -129,8 +129,8 @@ winreg = "0.55"
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
jj-lib = { path = "lib", version = "0.34.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.34.0" }
jj-lib = { path = "lib", version = "0.35.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.35.0" }
testutils = { path = "lib/testutils" }
[workspace.lints.clippy]