Skip to content

Commit 04e3949

Browse files
ECG Bottmeijn
authored andcommitted
build(deps): update martinvonz/jj to v0.35.0
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [martinvonz/jj](https://github.com/martinvonz/jj) | minor | `v0.34.0` -> `v0.35.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>martinvonz/jj (martinvonz/jj)</summary> ### [`v0.35.0`](https://github.com/jj-vcs/jj/releases/tag/v0.35.0) [Compare Source](jj-vcs/jj@v0.34.0...v0.35.0) ##### About jj is a Git-compatible version control system that is both simple and powerful. See the [installation instructions](https://jj-vcs.github.io/jj/v0.34.0/install-and-setup/) to get started. ##### 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. - The following deprecated config options have been removed: - `signing.sign-all` - `core.watchman.register_snapshot_trigger` - `diff.format` ##### Deprecations - `jj bisect run --command <cmd>` is deprecated in favor of `jj bisect run -- <cmd>`. - `jj metaedit --update-committer-timestamp` was renamed to `jj metaedit --force-rewrite` since the old name (and help text) incorrectly suggested that the committer name and email would *not* be updated. ##### 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`. [#&#8203;7072](jj-vcs/jj#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 [#&#8203;7908](jj-vcs/jj#7908). - Templates now support a `.split(separator, [limit])` method on strings to split a string into a list of substrings. - `-G` is now available as a short form of `--no-graph` in `jj log`, `jj evolog`, `jj op log`, `jj op show` and `jj op diff`. - `jj metaedit` now accepts `-m`/`--message` option to non-interactively update the change description. - The `CryptographicSignature.key()` template method now also works for SSH signatures and returns the corresponding public key fingerprint. - Added `template-aliases.empty_commit_marker`. Users can override this value in their config to change the "(empty)" label on empty commits. - Add support for `--when.workspaces` config scopes. - Add support for `--when.hostnames` config scopes. This allows configuration to be conditionally applied based on the hostname set in `operation.hostname`. - `jj bisect run` accepts the command and arguments to pass to the command directly as positional arguments, such as `jj bisect --range=..main -- cargo check --all-targets`. - Divergent changes are no longer marked red in immutable revisions. Since the revision is immutable, the user shouldn't take any action, so the red color was unnecessarily alarming. - 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. - `jj git clone` now supports the `--branch` option to specify the branch(es) to fetch during clone. If present, the first matching branch is used as the working-copy parent. - Revsets now support logical operators in string patterns. ##### Fixed bugs - `jj metaedit --author-timestamp` twice with the same value no longer edits the change twice in some cases. - `jj squash`: fixed improper revision rebase when both `--insert-after` and `--insert-before` were used. - `jj undo` can now revert "fetch"/"import" operation that involves tag updates. [#&#8203;6325](jj-vcs/jj#6325) - Fixed parsing of `files(expr)` revset expression including parentheses. [#&#8203;7747](jj-vcs/jj#7747) - Fixed `jj describe --stdin` to append a final newline character. ##### Contributors Thanks to the people who made this release happen! - Alpha Chen ([@&#8203;kejadlen](https://github.com/kejadlen)) - Angel Ezquerra ([@&#8203;AngelEzquerra](https://github.com/AngelEzquerra)) - ase ([@&#8203;adamse](https://github.com/adamse)) - Austin Seipp ([@&#8203;thoughtpolice](https://github.com/thoughtpolice)) - Benjamin Brittain ([@&#8203;benbrittain](https://github.com/benbrittain)) - bipul ([@&#8203;bipulmgr](https://github.com/bipulmgr)) - Brian Schroeder ([@&#8203;bts](https://github.com/bts)) - Bryce Berger ([@&#8203;bryceberger](https://github.com/bryceberger)) - Cole Helbling ([@&#8203;cole-h](https://github.com/cole-h)) - Daniel Luz ([@&#8203;mernen](https://github.com/mernen)) - David Higgs ([@&#8203;higgsd](https://github.com/higgsd)) - Defelo ([@&#8203;Defelo](https://github.com/Defelo)) - Fedor ([@&#8203;sheremetyev](https://github.com/sheremetyev)) - Gabriel Goller ([@&#8203;kaffarell](https://github.com/kaffarell)) - Gaëtan Lehmann ([@&#8203;glehmann](https://github.com/glehmann)) - George Christou ([@&#8203;gechr](https://github.com/gechr)) - Ilya Grigoriev ([@&#8203;ilyagr](https://github.com/ilyagr)) - Isaac Corbrey ([@&#8203;icorbrey](https://github.com/icorbrey)) - James Coman ([@&#8203;jamescoman](https://github.com/jamescoman)) - Joseph Lou ([@&#8203;josephlou5](https://github.com/josephlou5)) - Lander Brandt ([@&#8203;landaire](https://github.com/landaire)) - Martin von Zweigbergk ([@&#8203;martinvonz](https://github.com/martinvonz)) - Michael Chirico ([@&#8203;MichaelChirico](https://github.com/MichaelChirico)) - Owen Brooks ([@&#8203;owenbrooks](https://github.com/owenbrooks)) - Peter Schilling ([@&#8203;schpet](https://github.com/schpet)) - Philip Metzger ([@&#8203;PhilipMetzger](https://github.com/PhilipMetzger)) - Remo Senekowitsch ([@&#8203;senekor](https://github.com/senekor)) - Ross Smyth ([@&#8203;RossSmyth](https://github.com/RossSmyth)) - Scott Taylor ([@&#8203;scott2000](https://github.com/scott2000)) - Steve Fink ([@&#8203;hotsphink](https://github.com/hotsphink)) - Steve Klabnik ([@&#8203;steveklabnik](https://github.com/steveklabnik)) - Theo Buehler ([@&#8203;botovq](https://github.com/botovq)) - Theodore Dubois ([@&#8203;tbodt](https://github.com/tbodt)) - Theodore Keloglou ([@&#8203;sirodoht](https://github.com/sirodoht)) - Yuya Nishihara ([@&#8203;yuja](https://github.com/yuja)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNzEuNCIsInVwZGF0ZWRJblZlciI6IjQxLjE3MS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
1 parent 33c0680 commit 04e3949

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

chezmoi/dot_config/aquaproj-aqua/aqua.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ packages:
8989
- name: astral-sh/[email protected]
9090
description: An extremely fast Python package installer and resolver, written in Rust
9191
link: https://github.com/astral-sh/uv
92-
- name: martinvonz/jj@v0.34.0
92+
- name: martinvonz/jj@v0.35.0
9393
description: A Git-compatible VCS that is both simple and powerful
9494
link: https://github.com/martinvonz/jj
9595
- name: aandrew-me/[email protected]

0 commit comments

Comments
 (0)