Skip to content

Commit

Permalink
jj: update to 0.13.0.
Browse files Browse the repository at this point in the history 
## [0.13.0] - 2024-01-03

### Breaking changes

* `jj git fetch` no longer imports new remote branches as local branches. Set
  `git.auto-local-branch = true` to restore the old behavior.

### New features

* Information about new and resolved conflicts is now printed by every command.

* `jj branch` has gained a new `rename` subcommand that allows changing a branch
  name atomically. `jj branch help rename` for details.

### Fixed bugs

* Command aliases can now be loaded from repository config relative to the
  current working directory.
  [#2414](jj-vcs/jj#2414)
  • Loading branch information
@0-wiz-0
0-wiz-0 committed Jan 7, 2024
1 parent 7fb70ed commit 0549c81
Show file tree
Hide file tree
Showing 3 changed files with 303 additions and 287 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.7 2023/12/11 09:41:47 wiz Exp $
# $NetBSD: Makefile,v 1.8 2024/01/07 16:01:19 wiz Exp $

DISTNAME= jj-0.12.0
DISTNAME= jj-0.13.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=martinvonz/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Expand Down
146 changes: 75 additions & 71 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.4 2023/12/11 09:41:47 wiz Exp $
# $NetBSD: cargo-depends.mk,v 1.5 2024/01/07 16:01:19 wiz Exp $

CARGO_CRATE_DEPENDS+= addr2line-0.21.0
CARGO_CRATE_DEPENDS+= adler-1.0.2
Expand All @@ -11,12 +11,12 @@ CARGO_CRATE_DEPENDS+= anstyle-1.0.3
CARGO_CRATE_DEPENDS+= anstyle-parse-0.2.1
CARGO_CRATE_DEPENDS+= anstyle-query-1.0.0
CARGO_CRATE_DEPENDS+= anstyle-wincon-3.0.1
CARGO_CRATE_DEPENDS+= anyhow-1.0.75
CARGO_CRATE_DEPENDS+= anyhow-1.0.79
CARGO_CRATE_DEPENDS+= arc-swap-1.6.0
CARGO_CRATE_DEPENDS+= arrayvec-0.7.4
CARGO_CRATE_DEPENDS+= assert_cmd-2.0.12
CARGO_CRATE_DEPENDS+= assert_matches-1.5.0
CARGO_CRATE_DEPENDS+= async-trait-0.1.74
CARGO_CRATE_DEPENDS+= async-trait-0.1.77
CARGO_CRATE_DEPENDS+= autocfg-1.1.0
CARGO_CRATE_DEPENDS+= backoff-0.4.0
CARGO_CRATE_DEPENDS+= backtrace-0.3.69
Expand All @@ -41,9 +41,9 @@ CARGO_CRATE_DEPENDS+= chrono-0.4.31
CARGO_CRATE_DEPENDS+= ciborium-0.2.1
CARGO_CRATE_DEPENDS+= ciborium-io-0.2.1
CARGO_CRATE_DEPENDS+= ciborium-ll-0.2.1
CARGO_CRATE_DEPENDS+= clap-4.4.11
CARGO_CRATE_DEPENDS+= clap_builder-4.4.11
CARGO_CRATE_DEPENDS+= clap_complete-4.4.4
CARGO_CRATE_DEPENDS+= clap-4.4.12
CARGO_CRATE_DEPENDS+= clap_builder-4.4.12
CARGO_CRATE_DEPENDS+= clap_complete-4.4.6
CARGO_CRATE_DEPENDS+= clap_derive-4.4.7
CARGO_CRATE_DEPENDS+= clap_lex-0.6.0
CARGO_CRATE_DEPENDS+= clap_mangen-0.2.14
Expand All @@ -62,8 +62,7 @@ CARGO_CRATE_DEPENDS+= crossbeam-deque-0.8.3
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.9.15
CARGO_CRATE_DEPENDS+= crossbeam-queue-0.3.8
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.8.16
CARGO_CRATE_DEPENDS+= crossterm-0.25.0
CARGO_CRATE_DEPENDS+= crossterm-0.26.1
CARGO_CRATE_DEPENDS+= crossterm-0.27.0
CARGO_CRATE_DEPENDS+= crossterm_winapi-0.9.1
CARGO_CRATE_DEPENDS+= crypto-common-0.1.6
CARGO_CRATE_DEPENDS+= deranged-0.3.9
Expand All @@ -79,60 +78,60 @@ CARGO_CRATE_DEPENDS+= encode_unicode-0.3.6
CARGO_CRATE_DEPENDS+= equivalent-1.0.1
CARGO_CRATE_DEPENDS+= errno-0.3.8
CARGO_CRATE_DEPENDS+= esl01-renderdag-0.3.0
CARGO_CRATE_DEPENDS+= faster-hex-0.8.1
CARGO_CRATE_DEPENDS+= faster-hex-0.9.0
CARGO_CRATE_DEPENDS+= fastrand-2.0.0
CARGO_CRATE_DEPENDS+= filetime-0.2.22
CARGO_CRATE_DEPENDS+= fixedbitset-0.4.2
CARGO_CRATE_DEPENDS+= flate2-1.0.28
CARGO_CRATE_DEPENDS+= form_urlencoded-1.2.0
CARGO_CRATE_DEPENDS+= futures-0.1.31
CARGO_CRATE_DEPENDS+= futures-0.3.29
CARGO_CRATE_DEPENDS+= futures-channel-0.3.29
CARGO_CRATE_DEPENDS+= futures-core-0.3.29
CARGO_CRATE_DEPENDS+= futures-executor-0.3.29
CARGO_CRATE_DEPENDS+= futures-io-0.3.29
CARGO_CRATE_DEPENDS+= futures-macro-0.3.29
CARGO_CRATE_DEPENDS+= futures-sink-0.3.29
CARGO_CRATE_DEPENDS+= futures-task-0.3.29
CARGO_CRATE_DEPENDS+= futures-util-0.3.29
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+= generic-array-0.14.7
CARGO_CRATE_DEPENDS+= getrandom-0.2.10
CARGO_CRATE_DEPENDS+= gimli-0.28.0
CARGO_CRATE_DEPENDS+= git2-0.17.2
CARGO_CRATE_DEPENDS+= gix-0.55.2
CARGO_CRATE_DEPENDS+= gix-actor-0.28.0
CARGO_CRATE_DEPENDS+= gix-bitmap-0.2.7
CARGO_CRATE_DEPENDS+= gix-chunk-0.4.4
CARGO_CRATE_DEPENDS+= gix-commitgraph-0.22.0
CARGO_CRATE_DEPENDS+= gix-config-0.31.0
CARGO_CRATE_DEPENDS+= gix-config-value-0.14.0
CARGO_CRATE_DEPENDS+= gix-date-0.8.0
CARGO_CRATE_DEPENDS+= gix-diff-0.37.0
CARGO_CRATE_DEPENDS+= gix-discover-0.26.0
CARGO_CRATE_DEPENDS+= gix-features-0.36.0
CARGO_CRATE_DEPENDS+= gix-fs-0.8.0
CARGO_CRATE_DEPENDS+= gix-glob-0.14.0
CARGO_CRATE_DEPENDS+= gix-hash-0.13.1
CARGO_CRATE_DEPENDS+= gix-hashtable-0.4.0
CARGO_CRATE_DEPENDS+= gix-index-0.26.0
CARGO_CRATE_DEPENDS+= git2-0.18.1
CARGO_CRATE_DEPENDS+= gix-0.56.0
CARGO_CRATE_DEPENDS+= gix-actor-0.28.1
CARGO_CRATE_DEPENDS+= gix-bitmap-0.2.8
CARGO_CRATE_DEPENDS+= gix-chunk-0.4.5
CARGO_CRATE_DEPENDS+= gix-commitgraph-0.22.1
CARGO_CRATE_DEPENDS+= gix-config-0.32.1
CARGO_CRATE_DEPENDS+= gix-config-value-0.14.1
CARGO_CRATE_DEPENDS+= gix-date-0.8.1
CARGO_CRATE_DEPENDS+= gix-diff-0.38.0
CARGO_CRATE_DEPENDS+= gix-discover-0.27.0
CARGO_CRATE_DEPENDS+= gix-features-0.36.1
CARGO_CRATE_DEPENDS+= gix-fs-0.8.1
CARGO_CRATE_DEPENDS+= gix-glob-0.14.1
CARGO_CRATE_DEPENDS+= gix-hash-0.13.3
CARGO_CRATE_DEPENDS+= gix-hashtable-0.4.1
CARGO_CRATE_DEPENDS+= gix-index-0.27.1
CARGO_CRATE_DEPENDS+= gix-lock-11.0.0
CARGO_CRATE_DEPENDS+= gix-macros-0.1.0
CARGO_CRATE_DEPENDS+= gix-object-0.38.0
CARGO_CRATE_DEPENDS+= gix-odb-0.54.0
CARGO_CRATE_DEPENDS+= gix-pack-0.44.0
CARGO_CRATE_DEPENDS+= gix-path-0.10.0
CARGO_CRATE_DEPENDS+= gix-quote-0.4.7
CARGO_CRATE_DEPENDS+= gix-ref-0.38.0
CARGO_CRATE_DEPENDS+= gix-refspec-0.19.0
CARGO_CRATE_DEPENDS+= gix-revision-0.23.0
CARGO_CRATE_DEPENDS+= gix-revwalk-0.9.0
CARGO_CRATE_DEPENDS+= gix-sec-0.10.0
CARGO_CRATE_DEPENDS+= gix-macros-0.1.1
CARGO_CRATE_DEPENDS+= gix-object-0.39.0
CARGO_CRATE_DEPENDS+= gix-odb-0.55.0
CARGO_CRATE_DEPENDS+= gix-pack-0.45.0
CARGO_CRATE_DEPENDS+= gix-path-0.10.1
CARGO_CRATE_DEPENDS+= gix-quote-0.4.8
CARGO_CRATE_DEPENDS+= gix-ref-0.39.1
CARGO_CRATE_DEPENDS+= gix-refspec-0.20.0
CARGO_CRATE_DEPENDS+= gix-revision-0.24.0
CARGO_CRATE_DEPENDS+= gix-revwalk-0.10.0
CARGO_CRATE_DEPENDS+= gix-sec-0.10.1
CARGO_CRATE_DEPENDS+= gix-tempfile-11.0.0
CARGO_CRATE_DEPENDS+= gix-trace-0.1.3
CARGO_CRATE_DEPENDS+= gix-traverse-0.34.0
CARGO_CRATE_DEPENDS+= gix-url-0.25.1
CARGO_CRATE_DEPENDS+= gix-utils-0.1.5
CARGO_CRATE_DEPENDS+= gix-validate-0.8.0
CARGO_CRATE_DEPENDS+= gix-trace-0.1.4
CARGO_CRATE_DEPENDS+= gix-traverse-0.35.0
CARGO_CRATE_DEPENDS+= gix-url-0.25.2
CARGO_CRATE_DEPENDS+= gix-utils-0.1.6
CARGO_CRATE_DEPENDS+= gix-validate-0.8.1
CARGO_CRATE_DEPENDS+= glob-0.3.1
CARGO_CRATE_DEPENDS+= half-1.8.2
CARGO_CRATE_DEPENDS+= hashbrown-0.14.1
Expand All @@ -144,6 +143,7 @@ CARGO_CRATE_DEPENDS+= iana-time-zone-0.1.57
CARGO_CRATE_DEPENDS+= iana-time-zone-haiku-0.1.2
CARGO_CRATE_DEPENDS+= idna-0.4.0
CARGO_CRATE_DEPENDS+= indexmap-2.1.0
CARGO_CRATE_DEPENDS+= indoc-2.0.4
CARGO_CRATE_DEPENDS+= insta-1.34.0
CARGO_CRATE_DEPENDS+= instant-0.1.12
CARGO_CRATE_DEPENDS+= iovec-0.1.4
Expand All @@ -155,8 +155,8 @@ CARGO_CRATE_DEPENDS+= jobserver-0.1.26
CARGO_CRATE_DEPENDS+= js-sys-0.3.64
CARGO_CRATE_DEPENDS+= jwalk-0.8.1
CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
CARGO_CRATE_DEPENDS+= libc-0.2.150
CARGO_CRATE_DEPENDS+= libgit2-sys-0.15.2+1.6.4
CARGO_CRATE_DEPENDS+= libc-0.2.151
CARGO_CRATE_DEPENDS+= libgit2-sys-0.16.1+1.7.1
CARGO_CRATE_DEPENDS+= libssh2-sys-0.3.0
CARGO_CRATE_DEPENDS+= libz-sys-1.1.12
CARGO_CRATE_DEPENDS+= linked-hash-map-0.5.6
Expand All @@ -166,7 +166,7 @@ CARGO_CRATE_DEPENDS+= log-0.4.20
CARGO_CRATE_DEPENDS+= maplit-1.0.2
CARGO_CRATE_DEPENDS+= matchers-0.1.0
CARGO_CRATE_DEPENDS+= memchr-2.6.3
CARGO_CRATE_DEPENDS+= memmap2-0.7.1
CARGO_CRATE_DEPENDS+= memmap2-0.9.0
CARGO_CRATE_DEPENDS+= memoffset-0.9.0
CARGO_CRATE_DEPENDS+= minimal-lexical-0.2.1
CARGO_CRATE_DEPENDS+= miniz_oxide-0.7.1
Expand All @@ -178,7 +178,7 @@ CARGO_CRATE_DEPENDS+= num-traits-0.2.16
CARGO_CRATE_DEPENDS+= num_cpus-1.16.0
CARGO_CRATE_DEPENDS+= num_threads-0.1.6
CARGO_CRATE_DEPENDS+= object-0.32.1
CARGO_CRATE_DEPENDS+= once_cell-1.18.0
CARGO_CRATE_DEPENDS+= once_cell-1.19.0
CARGO_CRATE_DEPENDS+= oorandom-11.1.3
CARGO_CRATE_DEPENDS+= openssl-probe-0.1.5
CARGO_CRATE_DEPENDS+= openssl-src-300.1.5+3.1.3
Expand All @@ -187,6 +187,7 @@ CARGO_CRATE_DEPENDS+= option-ext-0.2.0
CARGO_CRATE_DEPENDS+= overload-0.1.1
CARGO_CRATE_DEPENDS+= parking_lot-0.12.1
CARGO_CRATE_DEPENDS+= parking_lot_core-0.9.8
CARGO_CRATE_DEPENDS+= paste-1.0.14
CARGO_CRATE_DEPENDS+= pathdiff-0.2.1
CARGO_CRATE_DEPENDS+= percent-encoding-2.3.0
CARGO_CRATE_DEPENDS+= pest-2.7.5
Expand All @@ -210,24 +211,25 @@ CARGO_CRATE_DEPENDS+= pretty_assertions-1.4.0
CARGO_CRATE_DEPENDS+= prettyplease-0.1.25
CARGO_CRATE_DEPENDS+= proc-macro-error-1.0.4
CARGO_CRATE_DEPENDS+= proc-macro-error-attr-1.0.4
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.67
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.74
CARGO_CRATE_DEPENDS+= prodash-26.2.2
CARGO_CRATE_DEPENDS+= prost-0.11.9
CARGO_CRATE_DEPENDS+= prost-build-0.11.9
CARGO_CRATE_DEPENDS+= prost-derive-0.11.9
CARGO_CRATE_DEPENDS+= prost-types-0.11.9
CARGO_CRATE_DEPENDS+= quote-1.0.33
CARGO_CRATE_DEPENDS+= quote-1.0.35
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.23.0
CARGO_CRATE_DEPENDS+= rayon-1.8.0
CARGO_CRATE_DEPENDS+= rayon-core-1.12.0
CARGO_CRATE_DEPENDS+= redox_syscall-0.2.16
CARGO_CRATE_DEPENDS+= redox_syscall-0.3.5
CARGO_CRATE_DEPENDS+= redox_syscall-0.4.1
CARGO_CRATE_DEPENDS+= redox_users-0.4.3
CARGO_CRATE_DEPENDS+= ref-cast-1.0.20
CARGO_CRATE_DEPENDS+= ref-cast-impl-1.0.20
CARGO_CRATE_DEPENDS+= ref-cast-1.0.22
CARGO_CRATE_DEPENDS+= ref-cast-impl-1.0.22
CARGO_CRATE_DEPENDS+= regex-1.10.2
CARGO_CRATE_DEPENDS+= regex-automata-0.1.10
CARGO_CRATE_DEPENDS+= regex-automata-0.3.9
Expand All @@ -238,16 +240,17 @@ CARGO_CRATE_DEPENDS+= roff-0.2.1
CARGO_CRATE_DEPENDS+= rpassword-7.3.1
CARGO_CRATE_DEPENDS+= rtoolbox-0.0.1
CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.23
CARGO_CRATE_DEPENDS+= rustix-0.38.26
CARGO_CRATE_DEPENDS+= rustix-0.38.28
CARGO_CRATE_DEPENDS+= rustversion-1.0.14
CARGO_CRATE_DEPENDS+= ryu-1.0.15
CARGO_CRATE_DEPENDS+= same-file-1.0.6
CARGO_CRATE_DEPENDS+= scm-record-0.1.0
CARGO_CRATE_DEPENDS+= scm-record-0.2.0
CARGO_CRATE_DEPENDS+= scopeguard-1.2.0
CARGO_CRATE_DEPENDS+= semver-1.0.19
CARGO_CRATE_DEPENDS+= serde-1.0.193
CARGO_CRATE_DEPENDS+= serde-1.0.194
CARGO_CRATE_DEPENDS+= serde_bser-0.3.1
CARGO_CRATE_DEPENDS+= serde_derive-1.0.193
CARGO_CRATE_DEPENDS+= serde_json-1.0.108
CARGO_CRATE_DEPENDS+= serde_derive-1.0.194
CARGO_CRATE_DEPENDS+= serde_json-1.0.110
CARGO_CRATE_DEPENDS+= serde_spanned-0.6.3
CARGO_CRATE_DEPENDS+= sha1_smol-1.0.0
CARGO_CRATE_DEPENDS+= sha2-0.10.7
Expand All @@ -261,18 +264,20 @@ CARGO_CRATE_DEPENDS+= smallvec-1.11.2
CARGO_CRATE_DEPENDS+= smawk-0.3.2
CARGO_CRATE_DEPENDS+= socket2-0.5.5
CARGO_CRATE_DEPENDS+= strsim-0.10.0
CARGO_CRATE_DEPENDS+= strum-0.25.0
CARGO_CRATE_DEPENDS+= strum_macros-0.25.3
CARGO_CRATE_DEPENDS+= subtle-2.5.0
CARGO_CRATE_DEPENDS+= syn-1.0.109
CARGO_CRATE_DEPENDS+= syn-2.0.37
CARGO_CRATE_DEPENDS+= tempfile-3.8.1
CARGO_CRATE_DEPENDS+= syn-2.0.46
CARGO_CRATE_DEPENDS+= tempfile-3.9.0
CARGO_CRATE_DEPENDS+= terminal_size-0.3.0
CARGO_CRATE_DEPENDS+= termtree-0.4.1
CARGO_CRATE_DEPENDS+= test-case-3.3.1
CARGO_CRATE_DEPENDS+= test-case-core-3.2.1
CARGO_CRATE_DEPENDS+= test-case-macros-3.2.1
CARGO_CRATE_DEPENDS+= textwrap-0.16.0
CARGO_CRATE_DEPENDS+= thiserror-1.0.50
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.50
CARGO_CRATE_DEPENDS+= thiserror-1.0.56
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.56
CARGO_CRATE_DEPENDS+= thread_local-1.1.7
CARGO_CRATE_DEPENDS+= time-0.3.30
CARGO_CRATE_DEPENDS+= time-core-0.1.2
Expand All @@ -281,7 +286,7 @@ CARGO_CRATE_DEPENDS+= timeago-0.4.2
CARGO_CRATE_DEPENDS+= tinytemplate-1.2.1
CARGO_CRATE_DEPENDS+= tinyvec-1.6.0
CARGO_CRATE_DEPENDS+= tinyvec_macros-0.1.1
CARGO_CRATE_DEPENDS+= tokio-1.34.0
CARGO_CRATE_DEPENDS+= tokio-1.35.1
CARGO_CRATE_DEPENDS+= tokio-macros-2.2.0
CARGO_CRATE_DEPENDS+= tokio-util-0.6.10
CARGO_CRATE_DEPENDS+= toml-0.5.11
Expand All @@ -293,7 +298,6 @@ CARGO_CRATE_DEPENDS+= tracing-chrome-0.7.1
CARGO_CRATE_DEPENDS+= tracing-core-0.1.32
CARGO_CRATE_DEPENDS+= tracing-log-0.2.0
CARGO_CRATE_DEPENDS+= tracing-subscriber-0.3.18
CARGO_CRATE_DEPENDS+= tui-0.19.0
CARGO_CRATE_DEPENDS+= typenum-1.17.0
CARGO_CRATE_DEPENDS+= ucd-trie-0.1.6
CARGO_CRATE_DEPENDS+= uluru-3.0.0
Expand Down Expand Up @@ -353,7 +357,7 @@ CARGO_CRATE_DEPENDS+= windows_x86_64_gnullvm-0.52.0
CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.42.2
CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.48.5
CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.52.0
CARGO_CRATE_DEPENDS+= winnow-0.5.15
CARGO_CRATE_DEPENDS+= winnow-0.5.28
CARGO_CRATE_DEPENDS+= yaml-rust-0.4.5
CARGO_CRATE_DEPENDS+= yansi-0.5.1
CARGO_CRATE_DEPENDS+= zstd-0.12.4
Expand Down
Loading

0 comments on commit 0549c81

Please sign in to comment.