Skip to content

Commit

Permalink
jj: update to 0.22.0.
Browse files Browse the repository at this point in the history 
## [0.22.0] - 2024-10-02

### Breaking changes

* Fixing [#4239](martinvonz/jj#4239) means the
  ordering of some messages have changed.

* Invalid `ui.graph.style` configuration is now an error.

* The builtin template `branch_list` has been renamed to `bookmark_list` as part
  of the `jj branch` deprecation.

### Deprecations

* `jj branch` has been deprecated in favor of `jj bookmark`.

  **Rationale:** Jujutsu's branches don't behave like Git branches, which a
  confused many newcomers, as they expected a similar behavior given the name.
  We've renamed them to "bookmarks" to match the actual behavior, as we think
  that describes them better, and they also behave similar to Mercurial's
  bookmarks.

* `jj obslog` is now called `jj evolution-log`/`jj evolog`. `jj obslog` remains
  as an alias.

* `jj unsquash` has been deprecated in favor of `jj squash` and
  `jj diffedit --restore-descendants`.

  **Rationale:** `jj squash` can be used in interactive mode to pull
  changes from one commit to another, including from a parent commit
  to a child commit. For fine-grained dependent diffs, such as when
  the parent and the child commits must successively modify the same
  location in a file, `jj diffedit --restore-descendants` can be used
  to set the parent commit to the desired content without altering the
  content of the child commit.

* The `git.push-branch-prefix` config has been deprecated in favor of
  `git.push-bookmark-prefix`.

* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
  respectively. The old names are still around and will be removed in a future
  release.

### New features

* The new config option `snapshot.auto-track` lets you automatically track only
  the specified paths (all paths by default). Use the new `jj file track`
  command to manually tracks path that were not automatically tracked. There is
  no way to list untracked files yet. Use `git status` in a colocated workspace
  as a workaround.
  [#323](martinvonz/jj#323)

* `jj fix` now allows fixing unchanged files with the `--include-unchanged-files` flag. This
  can be used to more easily introduce automatic formatting changes in a new
  commit separate from other changes.

* `jj workspace add` now accepts a `--sparse-patterns=<MODE>` option, which
  allows control of the sparse patterns for a newly created workspace: `copy`
  (inherit from parent; default), `full` (full working copy), or `empty` (the
  empty working copy).

* New command `jj workspace rename` that can rename the current workspace.

* `jj op log` gained an option to include operation diffs.

* `jj git clone` now accepts a `--remote <REMOTE NAME>` option, which
  allows to set a name for the remote instead of using the default
  `origin`.

* `jj op undo` now reports information on the operation that has been undone.

* `jj squash`: the `-k` flag can be used as a shorthand for `--keep-emptied`.

* CommitId / ChangeId template types now support `.normal_hex()`.

* `jj commit` and `jj describe` now accept `--author` option allowing to quickly change
  author of given commit.

* `jj diffedit`, `jj abandon`, and `jj restore` now accept a `--restore-descendants`
  flag. When used, descendants of the edited or deleted commits will keep their original
  content.

* `jj git fetch -b <remote-git-branch-name>` will now warn if the branch(es)
   can not be found in any of the specified/configured remotes.

* `jj split` now lets the user select all changes in interactive mode. This may be used
  to keeping all changes into the first commit while keeping the current commit
  description for the second commit (the newly created empty one).

* Author and committer names are now yellow by default.

### Fixed bugs

* Update working copy before reporting changes. This prevents errors during reporting
  from leaving the working copy in a stale state.

* Fixed panic when parsing invalid conflict markers of a particular form.
  ([#2611](martinvonz/jj#2611))

* Editing a hidden commit now makes it visible.

* The `present()` revset now suppresses missing working copy error. For example,
  `present(@)` evaluates to `none()` if the current workspace has no
  working-copy commit.
  • Loading branch information
@0-wiz-0
0-wiz-0 committed Oct 8, 2024
1 parent f5f0d5c commit 68554f2
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 183 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.16 2024/09/13 08:13:43 wiz Exp $
# $NetBSD: Makefile,v 1.17 2024/10/08 15:29:58 wiz Exp $

DISTNAME= jj-0.21.0
DISTNAME= jj-0.22.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=martinvonz/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Expand Down
92 changes: 47 additions & 45 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.12 2024/09/13 08:13:43 wiz Exp $
# $NetBSD: cargo-depends.mk,v 1.13 2024/10/08 15:29:58 wiz Exp $

CARGO_CRATE_DEPENDS+= addr2line-0.22.0
CARGO_CRATE_DEPENDS+= adler-1.0.2
Expand All @@ -14,12 +14,12 @@ 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.86
CARGO_CRATE_DEPENDS+= anyhow-1.0.89
CARGO_CRATE_DEPENDS+= arc-swap-1.7.1
CARGO_CRATE_DEPENDS+= arrayvec-0.7.6
CARGO_CRATE_DEPENDS+= assert_cmd-2.0.16
CARGO_CRATE_DEPENDS+= assert_matches-1.5.0
CARGO_CRATE_DEPENDS+= async-trait-0.1.82
CARGO_CRATE_DEPENDS+= async-trait-0.1.83
CARGO_CRATE_DEPENDS+= autocfg-1.3.0
CARGO_CRATE_DEPENDS+= backoff-0.4.0
CARGO_CRATE_DEPENDS+= backtrace-0.3.73
Expand All @@ -34,19 +34,19 @@ CARGO_CRATE_DEPENDS+= bytes-1.7.1
CARGO_CRATE_DEPENDS+= cassowary-0.3.0
CARGO_CRATE_DEPENDS+= cast-0.3.0
CARGO_CRATE_DEPENDS+= castaway-0.2.3
CARGO_CRATE_DEPENDS+= cc-1.1.13
CARGO_CRATE_DEPENDS+= cc-1.1.16
CARGO_CRATE_DEPENDS+= cfg-if-1.0.0
CARGO_CRATE_DEPENDS+= chrono-0.4.38
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.16
CARGO_CRATE_DEPENDS+= clap-4.5.19
CARGO_CRATE_DEPENDS+= clap-markdown-0.1.4
CARGO_CRATE_DEPENDS+= clap_builder-4.5.15
CARGO_CRATE_DEPENDS+= clap_complete-4.5.24
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_derive-4.5.13
CARGO_CRATE_DEPENDS+= clap_derive-4.5.18
CARGO_CRATE_DEPENDS+= clap_lex-0.7.2
CARGO_CRATE_DEPENDS+= clap_mangen-0.2.23
CARGO_CRATE_DEPENDS+= clru-0.6.2
Expand All @@ -55,7 +55,7 @@ CARGO_CRATE_DEPENDS+= compact_str-0.7.1
CARGO_CRATE_DEPENDS+= config-0.13.4
CARGO_CRATE_DEPENDS+= console-0.15.8
CARGO_CRATE_DEPENDS+= core-foundation-sys-0.8.7
CARGO_CRATE_DEPENDS+= cpufeatures-0.2.13
CARGO_CRATE_DEPENDS+= cpufeatures-0.2.14
CARGO_CRATE_DEPENDS+= crc32fast-1.4.2
CARGO_CRATE_DEPENDS+= criterion-0.5.1
CARGO_CRATE_DEPENDS+= criterion-plot-0.5.0
Expand All @@ -67,7 +67,7 @@ CARGO_CRATE_DEPENDS+= crossterm-0.27.0
CARGO_CRATE_DEPENDS+= crossterm_winapi-0.9.1
CARGO_CRATE_DEPENDS+= crunchy-0.2.2
CARGO_CRATE_DEPENDS+= crypto-common-0.1.6
CARGO_CRATE_DEPENDS+= dashmap-6.0.1
CARGO_CRATE_DEPENDS+= dashmap-6.1.0
CARGO_CRATE_DEPENDS+= diff-0.1.13
CARGO_CRATE_DEPENDS+= difflib-0.4.0
CARGO_CRATE_DEPENDS+= digest-0.10.7
Expand All @@ -82,10 +82,10 @@ CARGO_CRATE_DEPENDS+= equivalent-1.0.1
CARGO_CRATE_DEPENDS+= errno-0.3.9
CARGO_CRATE_DEPENDS+= esl01-renderdag-0.3.0
CARGO_CRATE_DEPENDS+= faster-hex-0.9.0
CARGO_CRATE_DEPENDS+= fastrand-2.1.0
CARGO_CRATE_DEPENDS+= filetime-0.2.24
CARGO_CRATE_DEPENDS+= fastrand-2.1.1
CARGO_CRATE_DEPENDS+= filetime-0.2.25
CARGO_CRATE_DEPENDS+= fixedbitset-0.4.2
CARGO_CRATE_DEPENDS+= flate2-1.0.32
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
Expand Down Expand Up @@ -127,7 +127,7 @@ CARGO_CRATE_DEPENDS+= gix-object-0.44.0
CARGO_CRATE_DEPENDS+= gix-odb-0.63.0
CARGO_CRATE_DEPENDS+= gix-pack-0.53.0
CARGO_CRATE_DEPENDS+= gix-packetline-blocking-0.17.5
CARGO_CRATE_DEPENDS+= gix-path-0.10.10
CARGO_CRATE_DEPENDS+= gix-path-0.10.11
CARGO_CRATE_DEPENDS+= gix-pathspec-0.7.7
CARGO_CRATE_DEPENDS+= gix-quote-0.4.12
CARGO_CRATE_DEPENDS+= gix-ref-0.47.0
Expand All @@ -137,16 +137,17 @@ CARGO_CRATE_DEPENDS+= gix-revwalk-0.15.0
CARGO_CRATE_DEPENDS+= gix-sec-0.10.8
CARGO_CRATE_DEPENDS+= gix-submodule-0.14.0
CARGO_CRATE_DEPENDS+= gix-tempfile-14.0.2
CARGO_CRATE_DEPENDS+= gix-trace-0.1.9
CARGO_CRATE_DEPENDS+= gix-trace-0.1.10
CARGO_CRATE_DEPENDS+= gix-traverse-0.41.0
CARGO_CRATE_DEPENDS+= gix-url-0.27.5
CARGO_CRATE_DEPENDS+= gix-utils-0.1.12
CARGO_CRATE_DEPENDS+= gix-validate-0.9.0
CARGO_CRATE_DEPENDS+= gix-worktree-0.36.0
CARGO_CRATE_DEPENDS+= glob-0.3.1
CARGO_CRATE_DEPENDS+= globset-0.4.14
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+= heck-0.5.0
CARGO_CRATE_DEPENDS+= hermit-abi-0.3.9
CARGO_CRATE_DEPENDS+= hermit-abi-0.4.0
Expand All @@ -155,30 +156,30 @@ CARGO_CRATE_DEPENDS+= home-0.5.9
CARGO_CRATE_DEPENDS+= iana-time-zone-0.1.60
CARGO_CRATE_DEPENDS+= iana-time-zone-haiku-0.1.2
CARGO_CRATE_DEPENDS+= idna-0.5.0
CARGO_CRATE_DEPENDS+= ignore-0.4.22
CARGO_CRATE_DEPENDS+= ignore-0.4.23
CARGO_CRATE_DEPENDS+= imara-diff-0.1.7
CARGO_CRATE_DEPENDS+= indexmap-2.5.0
CARGO_CRATE_DEPENDS+= indexmap-2.6.0
CARGO_CRATE_DEPENDS+= indoc-2.0.5
CARGO_CRATE_DEPENDS+= insta-1.39.0
CARGO_CRATE_DEPENDS+= insta-1.40.0
CARGO_CRATE_DEPENDS+= instant-0.1.13
CARGO_CRATE_DEPENDS+= is-terminal-0.4.13
CARGO_CRATE_DEPENDS+= is_terminal_polyfill-1.70.1
CARGO_CRATE_DEPENDS+= itertools-0.10.5
CARGO_CRATE_DEPENDS+= itertools-0.12.1
CARGO_CRATE_DEPENDS+= itertools-0.13.0
CARGO_CRATE_DEPENDS+= itoa-1.0.11
CARGO_CRATE_DEPENDS+= jiff-0.1.8
CARGO_CRATE_DEPENDS+= jiff-0.1.12
CARGO_CRATE_DEPENDS+= jiff-tzdb-0.1.0
CARGO_CRATE_DEPENDS+= jiff-tzdb-platform-0.1.0
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.158
CARGO_CRATE_DEPENDS+= libc-0.2.159
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
CARGO_CRATE_DEPENDS+= libz-sys-1.1.19
CARGO_CRATE_DEPENDS+= libz-sys-1.1.20
CARGO_CRATE_DEPENDS+= linked-hash-map-0.5.6
CARGO_CRATE_DEPENDS+= linux-raw-sys-0.4.14
CARGO_CRATE_DEPENDS+= lock_api-0.4.12
Expand All @@ -199,11 +200,11 @@ CARGO_CRATE_DEPENDS+= nom-7.1.3
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.3
CARGO_CRATE_DEPENDS+= once_cell-1.19.0
CARGO_CRATE_DEPENDS+= object-0.36.4
CARGO_CRATE_DEPENDS+= once_cell-1.20.1
CARGO_CRATE_DEPENDS+= oorandom-11.1.4
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.5
CARGO_CRATE_DEPENDS+= openssl-src-300.3.1+3.3.1
CARGO_CRATE_DEPENDS+= openssl-src-300.3.2+3.3.2
CARGO_CRATE_DEPENDS+= openssl-sys-0.9.103
CARGO_CRATE_DEPENDS+= option-ext-0.2.0
CARGO_CRATE_DEPENDS+= overload-0.1.1
Expand All @@ -212,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.11
CARGO_CRATE_DEPENDS+= pest_derive-2.7.11
CARGO_CRATE_DEPENDS+= pest_generator-2.7.11
CARGO_CRATE_DEPENDS+= pest_meta-2.7.11
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+= petgraph-0.6.5
CARGO_CRATE_DEPENDS+= pin-project-lite-0.2.14
CARGO_CRATE_DEPENDS+= pin-utils-0.1.0
Expand All @@ -224,12 +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.0
CARGO_CRATE_DEPENDS+= prettyplease-0.2.20
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+= prodash-28.0.0
CARGO_CRATE_DEPENDS+= prost-0.12.6
Expand All @@ -247,27 +249,27 @@ 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.10.6
CARGO_CRATE_DEPENDS+= regex-1.11.0
CARGO_CRATE_DEPENDS+= regex-automata-0.1.10
CARGO_CRATE_DEPENDS+= regex-automata-0.4.7
CARGO_CRATE_DEPENDS+= regex-automata-0.4.8
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.29
CARGO_CRATE_DEPENDS+= regex-syntax-0.8.4
CARGO_CRATE_DEPENDS+= regex-syntax-0.8.5
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.35
CARGO_CRATE_DEPENDS+= rustix-0.38.37
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+= scopeguard-1.2.0
CARGO_CRATE_DEPENDS+= serde-1.0.209
CARGO_CRATE_DEPENDS+= serde-1.0.210
CARGO_CRATE_DEPENDS+= serde_bser-0.4.0
CARGO_CRATE_DEPENDS+= serde_bytes-0.11.15
CARGO_CRATE_DEPENDS+= serde_derive-1.0.209
CARGO_CRATE_DEPENDS+= serde_json-1.0.127
CARGO_CRATE_DEPENDS+= serde_derive-1.0.210
CARGO_CRATE_DEPENDS+= serde_json-1.0.128
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 @@ -288,16 +290,16 @@ 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.77
CARGO_CRATE_DEPENDS+= tempfile-3.12.0
CARGO_CRATE_DEPENDS+= terminal_size-0.3.0
CARGO_CRATE_DEPENDS+= syn-2.0.79
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.63
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.63
CARGO_CRATE_DEPENDS+= thiserror-1.0.64
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.64
CARGO_CRATE_DEPENDS+= thread_local-1.1.8
CARGO_CRATE_DEPENDS+= timeago-0.4.2
CARGO_CRATE_DEPENDS+= tinytemplate-1.2.1
Expand Down Expand Up @@ -325,7 +327,7 @@ CARGO_CRATE_DEPENDS+= unicode-linebreak-0.1.5
CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.23
CARGO_CRATE_DEPENDS+= unicode-segmentation-1.11.0
CARGO_CRATE_DEPENDS+= unicode-truncate-1.1.0
CARGO_CRATE_DEPENDS+= unicode-width-0.1.13
CARGO_CRATE_DEPENDS+= unicode-width-0.1.14
CARGO_CRATE_DEPENDS+= url-2.5.2
CARGO_CRATE_DEPENDS+= utf8parse-0.2.2
CARGO_CRATE_DEPENDS+= valuable-0.1.0
Expand Down Expand Up @@ -371,7 +373,7 @@ CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.52.6
CARGO_CRATE_DEPENDS+= winnow-0.5.40
CARGO_CRATE_DEPENDS+= winnow-0.6.18
CARGO_CRATE_DEPENDS+= winreg-0.52.0
CARGO_CRATE_DEPENDS+= yansi-0.5.1
CARGO_CRATE_DEPENDS+= yansi-1.0.1
CARGO_CRATE_DEPENDS+= zerocopy-0.7.35
CARGO_CRATE_DEPENDS+= zerocopy-derive-0.7.35
CARGO_CRATE_DEPENDS+= zstd-0.12.4
Expand Down
Loading

0 comments on commit 68554f2

Please sign in to comment.