Skip to content

Commit

Permalink
jj: update to 0.23.0.
Browse files Browse the repository at this point in the history 
## [0.23.0] - 2024-11-06

### Security fixes

* Fixed path traversal by cloning/checking out crafted Git repository containing
  `..`, `.jj`, `.git` paths.
  ([GHSA-88h5-6w7m-5w56](https://github.com/martinvonz/jj/security/advisories/GHSA-88h5-6w7m-5w56);CVE-2024-51990)

### Breaking changes

* Revset function names can no longer start with a number.

* Evaluation error of `revsets.short-prefixes` configuration is now reported.

* The `HEAD@git` symbol no longer resolves to the Git HEAD revision. Use
  `git_head()` or `@-` revset expression instead. The `git_head` template
  keyword now returns a boolean.

* Help command doesn't work recursively anymore, i.e. `jj workspace help root`
  doesn't work anymore.

* The color label `op_log` from the `[colors]` config section now **only**
  applies to the op log and not to the other places operations are displayed. In
  almost all cases, if you configured `op_log` before, you should use the new
  `operation` label instead.

* Default operation log template now shows end times of operations instead of
  start times.

### Deprecations

* `git.auto-local-bookmark` replaces `git.auto-local-branch`. The latter remains
  supported for now (at lower precedence than the former).

### New features

* Added diff options to ignore whitespace when comparing lines. Whitespace
  changes are still highlighted.

* New command `jj simplify-parents` will remove redundant parent edges.

* `jj squash` now supports `-f/-t` shorthands for `--from/--[in]to`.

* Initial support for shallow Git repositories has been implemented. However,
  deepening the history of a shallow repository is not yet supported.

* `jj git clone` now accepts a `--depth <DEPTH>` option, which
  allows to clone the repository with a given depth.

* New command `jj file annotate` that annotates files line by line. This is similar
  in functionality to `git blame`. Invoke the command with `jj file annotate <file_path>`.
  The output can be customized via the `templates.annotate_commit_summary`
  config variable.

* `jj bookmark list` gained a `--remote REMOTE` option to display bookmarks
   belonging to a remote. This option can be combined with `--tracked` or
   `--conflicted`.

* New command `jj config unset` that unsets config values. For example,
  `jj config unset --user user.name`.

* `jj help` now has the flag `--keyword` (shorthand `-k`), which can give help
  for some keywords (e.g. `jj help -k revsets`). To see a list of the available
  keywords you can do `jj help --help`.

* New `at_operation(op, expr)` revset can be used in order to query revisions
  based on historical state.

* String literals in filesets, revsets and templates now support hex bytes
  (with `\e` as escape / shorthand for `\x1b`).

* New `coalesce(revsets...)` revset which returns commits in the first revset
  in the `revsets` list that does not evaluate to `none()`.

* New template function `raw_escape_sequence(...)` preserves escape sequences.

* Timestamp objects in templates now have `after(date) -> Boolean` and
  `before(date) -> Boolean` methods for comparing timestamps to other dates.

* New template functions `pad_start()`, `pad_end()`, `truncate_start()`, and
  `truncate_end()` are added.

* Add a new template alias `bultin_log_compact_full_description()`.

* Added the config settings `diff.color-words.context` and `diff.git.context` to
  control the default number of lines of context shown.

### Fixed bugs

* Error on `trunk()` revset resolution is now handled gracefully.
  [#4616](jj-vcs/jj#4616)

* Updated the built-in diff editor `scm-record` to version
  [0.4.0](https://github.com/arxanas/scm-record/releases/tag/v0.4.0), which
  includes multiple fixes.
  • Loading branch information
@0-wiz-0
0-wiz-0 committed Nov 10, 2024
1 parent 98d5582 commit bc35578
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 147 deletions.
4 changes: 2 additions & 2 deletions devel/jj/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.17 2024/10/08 15:29:58 wiz Exp $
# $NetBSD: Makefile,v 1.18 2024/11/10 09:56:13 wiz Exp $

DISTNAME= jj-0.22.0
DISTNAME= jj-0.23.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=martinvonz/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Expand Down
71 changes: 35 additions & 36 deletions devel/jj/cargo-depends.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: cargo-depends.mk,v 1.13 2024/10/08 15:29:58 wiz Exp $
# $NetBSD: cargo-depends.mk,v 1.14 2024/11/10 09:56:13 wiz Exp $

CARGO_CRATE_DEPENDS+= addr2line-0.22.0
CARGO_CRATE_DEPENDS+= adler-1.0.2
Expand All @@ -14,7 +14,7 @@ CARGO_CRATE_DEPENDS+= anstyle-1.0.8
CARGO_CRATE_DEPENDS+= anstyle-parse-0.2.5
CARGO_CRATE_DEPENDS+= anstyle-query-1.1.1
CARGO_CRATE_DEPENDS+= anstyle-wincon-3.0.4
CARGO_CRATE_DEPENDS+= anyhow-1.0.89
CARGO_CRATE_DEPENDS+= anyhow-1.0.93
CARGO_CRATE_DEPENDS+= arc-swap-1.7.1
CARGO_CRATE_DEPENDS+= arrayvec-0.7.6
CARGO_CRATE_DEPENDS+= assert_cmd-2.0.16
Expand All @@ -41,11 +41,11 @@ CARGO_CRATE_DEPENDS+= chrono-english-0.1.7
CARGO_CRATE_DEPENDS+= ciborium-0.2.2
CARGO_CRATE_DEPENDS+= ciborium-io-0.2.2
CARGO_CRATE_DEPENDS+= ciborium-ll-0.2.2
CARGO_CRATE_DEPENDS+= clap-4.5.19
CARGO_CRATE_DEPENDS+= clap-4.5.20
CARGO_CRATE_DEPENDS+= clap-markdown-0.1.4
CARGO_CRATE_DEPENDS+= clap_builder-4.5.19
CARGO_CRATE_DEPENDS+= clap_complete-4.5.30
CARGO_CRATE_DEPENDS+= clap_complete_nushell-4.5.3
CARGO_CRATE_DEPENDS+= clap_builder-4.5.20
CARGO_CRATE_DEPENDS+= clap_complete-4.5.37
CARGO_CRATE_DEPENDS+= clap_complete_nushell-4.5.4
CARGO_CRATE_DEPENDS+= clap_derive-4.5.18
CARGO_CRATE_DEPENDS+= clap_lex-0.7.2
CARGO_CRATE_DEPENDS+= clap_mangen-0.2.23
Expand Down Expand Up @@ -89,15 +89,15 @@ CARGO_CRATE_DEPENDS+= flate2-1.0.33
CARGO_CRATE_DEPENDS+= fnv-1.0.7
CARGO_CRATE_DEPENDS+= form_urlencoded-1.2.1
CARGO_CRATE_DEPENDS+= futures-0.1.31
CARGO_CRATE_DEPENDS+= futures-0.3.30
CARGO_CRATE_DEPENDS+= futures-channel-0.3.30
CARGO_CRATE_DEPENDS+= futures-core-0.3.30
CARGO_CRATE_DEPENDS+= futures-executor-0.3.30
CARGO_CRATE_DEPENDS+= futures-io-0.3.30
CARGO_CRATE_DEPENDS+= futures-macro-0.3.30
CARGO_CRATE_DEPENDS+= futures-sink-0.3.30
CARGO_CRATE_DEPENDS+= futures-task-0.3.30
CARGO_CRATE_DEPENDS+= futures-util-0.3.30
CARGO_CRATE_DEPENDS+= futures-0.3.31
CARGO_CRATE_DEPENDS+= futures-channel-0.3.31
CARGO_CRATE_DEPENDS+= futures-core-0.3.31
CARGO_CRATE_DEPENDS+= futures-executor-0.3.31
CARGO_CRATE_DEPENDS+= futures-io-0.3.31
CARGO_CRATE_DEPENDS+= futures-macro-0.3.31
CARGO_CRATE_DEPENDS+= futures-sink-0.3.31
CARGO_CRATE_DEPENDS+= futures-task-0.3.31
CARGO_CRATE_DEPENDS+= futures-util-0.3.31
CARGO_CRATE_DEPENDS+= generic-array-0.14.7
CARGO_CRATE_DEPENDS+= getrandom-0.2.15
CARGO_CRATE_DEPENDS+= gimli-0.29.0
Expand Down Expand Up @@ -147,7 +147,7 @@ CARGO_CRATE_DEPENDS+= glob-0.3.1
CARGO_CRATE_DEPENDS+= globset-0.4.15
CARGO_CRATE_DEPENDS+= half-2.4.1
CARGO_CRATE_DEPENDS+= hashbrown-0.14.5
CARGO_CRATE_DEPENDS+= hashbrown-0.15.0
CARGO_CRATE_DEPENDS+= hashbrown-0.15.1
CARGO_CRATE_DEPENDS+= heck-0.5.0
CARGO_CRATE_DEPENDS+= hermit-abi-0.3.9
CARGO_CRATE_DEPENDS+= hermit-abi-0.4.0
Expand All @@ -160,7 +160,7 @@ CARGO_CRATE_DEPENDS+= ignore-0.4.23
CARGO_CRATE_DEPENDS+= imara-diff-0.1.7
CARGO_CRATE_DEPENDS+= indexmap-2.6.0
CARGO_CRATE_DEPENDS+= indoc-2.0.5
CARGO_CRATE_DEPENDS+= insta-1.40.0
CARGO_CRATE_DEPENDS+= insta-1.41.1
CARGO_CRATE_DEPENDS+= instant-0.1.13
CARGO_CRATE_DEPENDS+= is-terminal-0.4.13
CARGO_CRATE_DEPENDS+= is_terminal_polyfill-1.70.1
Expand All @@ -175,7 +175,7 @@ CARGO_CRATE_DEPENDS+= jobserver-0.1.32
CARGO_CRATE_DEPENDS+= js-sys-0.3.70
CARGO_CRATE_DEPENDS+= kstring-2.0.2
CARGO_CRATE_DEPENDS+= lazy_static-1.5.0
CARGO_CRATE_DEPENDS+= libc-0.2.159
CARGO_CRATE_DEPENDS+= libc-0.2.161
CARGO_CRATE_DEPENDS+= libgit2-sys-0.17.0+1.8.1
CARGO_CRATE_DEPENDS+= libredox-0.1.3
CARGO_CRATE_DEPENDS+= libssh2-sys-0.3.0
Expand All @@ -201,7 +201,7 @@ CARGO_CRATE_DEPENDS+= nu-ansi-term-0.46.0
CARGO_CRATE_DEPENDS+= num-traits-0.2.19
CARGO_CRATE_DEPENDS+= num_cpus-1.16.0
CARGO_CRATE_DEPENDS+= object-0.36.4
CARGO_CRATE_DEPENDS+= once_cell-1.20.1
CARGO_CRATE_DEPENDS+= once_cell-1.20.2
CARGO_CRATE_DEPENDS+= oorandom-11.1.4
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.5
CARGO_CRATE_DEPENDS+= openssl-src-300.3.2+3.3.2
Expand All @@ -213,10 +213,10 @@ CARGO_CRATE_DEPENDS+= parking_lot_core-0.9.10
CARGO_CRATE_DEPENDS+= paste-1.0.15
CARGO_CRATE_DEPENDS+= pathdiff-0.2.1
CARGO_CRATE_DEPENDS+= percent-encoding-2.3.1
CARGO_CRATE_DEPENDS+= pest-2.7.13
CARGO_CRATE_DEPENDS+= pest_derive-2.7.13
CARGO_CRATE_DEPENDS+= pest_generator-2.7.13
CARGO_CRATE_DEPENDS+= pest_meta-2.7.13
CARGO_CRATE_DEPENDS+= pest-2.7.14
CARGO_CRATE_DEPENDS+= pest_derive-2.7.14
CARGO_CRATE_DEPENDS+= pest_generator-2.7.14
CARGO_CRATE_DEPENDS+= pest_meta-2.7.14
CARGO_CRATE_DEPENDS+= petgraph-0.6.5
CARGO_CRATE_DEPENDS+= pin-project-lite-0.2.14
CARGO_CRATE_DEPENDS+= pin-utils-0.1.0
Expand All @@ -225,14 +225,13 @@ CARGO_CRATE_DEPENDS+= plotters-0.3.6
CARGO_CRATE_DEPENDS+= plotters-backend-0.3.6
CARGO_CRATE_DEPENDS+= plotters-svg-0.3.6
CARGO_CRATE_DEPENDS+= pollster-0.3.0
CARGO_CRATE_DEPENDS+= portable-atomic-1.9.0
CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.20
CARGO_CRATE_DEPENDS+= predicates-3.1.2
CARGO_CRATE_DEPENDS+= predicates-core-1.0.8
CARGO_CRATE_DEPENDS+= predicates-tree-1.0.11
CARGO_CRATE_DEPENDS+= pretty_assertions-1.4.1
CARGO_CRATE_DEPENDS+= prettyplease-0.2.22
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.86
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.89
CARGO_CRATE_DEPENDS+= prodash-28.0.0
CARGO_CRATE_DEPENDS+= prost-0.12.6
CARGO_CRATE_DEPENDS+= prost-build-0.12.6
Expand All @@ -242,14 +241,14 @@ CARGO_CRATE_DEPENDS+= quote-1.0.37
CARGO_CRATE_DEPENDS+= rand-0.8.5
CARGO_CRATE_DEPENDS+= rand_chacha-0.3.1
CARGO_CRATE_DEPENDS+= rand_core-0.6.4
CARGO_CRATE_DEPENDS+= ratatui-0.26.3
CARGO_CRATE_DEPENDS+= ratatui-0.27.0
CARGO_CRATE_DEPENDS+= rayon-1.10.0
CARGO_CRATE_DEPENDS+= rayon-core-1.12.1
CARGO_CRATE_DEPENDS+= redox_syscall-0.5.3
CARGO_CRATE_DEPENDS+= redox_users-0.4.6
CARGO_CRATE_DEPENDS+= ref-cast-1.0.23
CARGO_CRATE_DEPENDS+= ref-cast-impl-1.0.23
CARGO_CRATE_DEPENDS+= regex-1.11.0
CARGO_CRATE_DEPENDS+= regex-1.11.1
CARGO_CRATE_DEPENDS+= regex-automata-0.1.10
CARGO_CRATE_DEPENDS+= regex-automata-0.4.8
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.29
Expand All @@ -258,18 +257,18 @@ CARGO_CRATE_DEPENDS+= roff-0.2.2
CARGO_CRATE_DEPENDS+= rpassword-7.3.1
CARGO_CRATE_DEPENDS+= rtoolbox-0.0.2
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.24
CARGO_CRATE_DEPENDS+= rustix-0.38.37
CARGO_CRATE_DEPENDS+= rustix-0.38.39
CARGO_CRATE_DEPENDS+= rustversion-1.0.17
CARGO_CRATE_DEPENDS+= ryu-1.0.18
CARGO_CRATE_DEPENDS+= same-file-1.0.6
CARGO_CRATE_DEPENDS+= scanlex-0.1.4
CARGO_CRATE_DEPENDS+= scm-record-0.3.0
CARGO_CRATE_DEPENDS+= scm-record-0.4.0
CARGO_CRATE_DEPENDS+= scopeguard-1.2.0
CARGO_CRATE_DEPENDS+= serde-1.0.210
CARGO_CRATE_DEPENDS+= serde-1.0.214
CARGO_CRATE_DEPENDS+= serde_bser-0.4.0
CARGO_CRATE_DEPENDS+= serde_bytes-0.11.15
CARGO_CRATE_DEPENDS+= serde_derive-1.0.210
CARGO_CRATE_DEPENDS+= serde_json-1.0.128
CARGO_CRATE_DEPENDS+= serde_derive-1.0.214
CARGO_CRATE_DEPENDS+= serde_json-1.0.132
CARGO_CRATE_DEPENDS+= serde_spanned-0.6.7
CARGO_CRATE_DEPENDS+= sha1_smol-1.0.1
CARGO_CRATE_DEPENDS+= sha2-0.10.8
Expand All @@ -290,22 +289,22 @@ CARGO_CRATE_DEPENDS+= strsim-0.11.1
CARGO_CRATE_DEPENDS+= strum-0.26.3
CARGO_CRATE_DEPENDS+= strum_macros-0.26.4
CARGO_CRATE_DEPENDS+= subtle-2.6.1
CARGO_CRATE_DEPENDS+= syn-2.0.79
CARGO_CRATE_DEPENDS+= syn-2.0.87
CARGO_CRATE_DEPENDS+= tempfile-3.13.0
CARGO_CRATE_DEPENDS+= terminal_size-0.4.0
CARGO_CRATE_DEPENDS+= termtree-0.4.1
CARGO_CRATE_DEPENDS+= test-case-3.3.1
CARGO_CRATE_DEPENDS+= test-case-core-3.3.1
CARGO_CRATE_DEPENDS+= test-case-macros-3.3.1
CARGO_CRATE_DEPENDS+= textwrap-0.16.1
CARGO_CRATE_DEPENDS+= thiserror-1.0.64
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.64
CARGO_CRATE_DEPENDS+= thiserror-1.0.68
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.68
CARGO_CRATE_DEPENDS+= thread_local-1.1.8
CARGO_CRATE_DEPENDS+= timeago-0.4.2
CARGO_CRATE_DEPENDS+= tinytemplate-1.2.1
CARGO_CRATE_DEPENDS+= tinyvec-1.8.0
CARGO_CRATE_DEPENDS+= tinyvec_macros-0.1.1
CARGO_CRATE_DEPENDS+= tokio-1.40.0
CARGO_CRATE_DEPENDS+= tokio-1.41.0
CARGO_CRATE_DEPENDS+= tokio-macros-2.4.0
CARGO_CRATE_DEPENDS+= tokio-util-0.6.10
CARGO_CRATE_DEPENDS+= toml-0.5.11
Expand Down
Loading

0 comments on commit bc35578

Please sign in to comment.