diff --git a/_service b/_service index 4cc4639..d0aeb52 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.14.0 + v0.15.1 disable v(.*) diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 575a728..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/martinvonz/jj - f00f7527ddce21886fe93e11324c5227f15eeaca \ No newline at end of file diff --git a/jj-0.14.0.obscpio b/jj-0.14.0.obscpio deleted file mode 100644 index 630b9f8..0000000 --- a/jj-0.14.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb5e5efe384c25c4293b6ea3686592103d0d0759fad19faf97ead7bfdaadc633 -size 4886028 diff --git a/jj-0.15.1.obscpio b/jj-0.15.1.obscpio new file mode 100644 index 0000000..0045145 --- /dev/null +++ b/jj-0.15.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90ba8a63fc08b6e21fbf172138ce09deb60d050c86f970cb30d2bcf903f46ca0 +size 5095436 diff --git a/jj.obsinfo b/jj.obsinfo index 1e4f552..10e8f29 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.14.0 -mtime: 1707349384 -commit: 8e4d1af98eccf1ed8a79a7ddf9500467aa7684f5 +version: 0.15.1 +mtime: 1709786138 +commit: bf76080f42f77cad934d9a5202c7b7d29ab2c890 diff --git a/jujutsu.changes b/jujutsu.changes index 54e89d1..be80217 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,90 @@ +------------------------------------------------------------------- +Sat Mar 16 17:29:53 UTC 2024 - Johannes Kastl + +- update to 0.15.1: + * No code changes (fixing Rust Cargo.toml stuff). +- BuildRequire gnupg to fix failing tests + +------------------------------------------------------------------- +Sat Mar 16 17:09:19 UTC 2024 - Johannes Kastl + +- update to 0.15.0: + * Breaking changes + - The minimum supported Rust version (MSRV) is now 1.76.0. + - The on-disk index format changed. New index files will be + created automatically, but it can fail if the repository is + co-located and predates Git GC issues #815. If reindexing + failed, you'll need to clean up corrupted operation history + by jj op abandon ... + - Dropped support for the "legacy" graph-drawing style. Use + "ascii" for a very similar result. + - The default log output no longer lists all tagged heads. Set + revsets.log = "@ | ancestors(immutable_heads().., 2) | + heads(immutable_heads())" to restore the old behavior. + - Dropped support for the deprecated : revset operator. Use :: + instead. + - jj rebase --skip-empty no longer abandons commits that were + already empty before the rebase. + * New features + - Partial support for commit signing. Currently you can + configure jj to "keep" commit signatures by making new ones + for rewritten commits, and to sign new commits when they are + created. + This comes with out-of-the-box support for the following + backends: + — GnuPG + - SSH + - Signature verification and an explicit sign command will + hopefully come soon. + - Templates now support logical operators: ||, &&, ! + - Templates now support the self keyword, which is the current + commit in jj log/obslog templates. + - jj show now accepts -T/--template option to render its output + using template + - jj config list now accepts -T/--template option. + - jj git fetch now accepts -b as a shorthand for --branch, + making it more consistent with other commands that accept a + branch + - In the templating language, Timestamps now have a .local() + method for converting to the local timezone. + - jj next/prev now infer --edit when you're already editing a + non-head commit (a commit with children). + - A new built-in pager named :builtin is available on all + platforms, implemented with minus + - Set config ui.log-synthetic-elided-nodes = true to make jj + log include synthetic nodes in the graph where some revisions + were elided (#1252, #2971). This may become the default + depending on feedback. + - When creating a new workspace, the sparse patterns are now + copied over from the current workspace. + - jj git init --colocate can now import an existing Git + repository. This is equivalent to jj git init --git-repo=.. + - jj git fetch now automatically prints new remote branches and + tags by default. + - --verbose/-v is now --debug (no short option since it's not + intended to be used often) + - jj move --from/--to can now be abbreviated to jj move -f/-t + - jj commit/diffedit/move/resolve/split/squash/unsquash now + accept --tool= option to override the default. #2575 + - Added completions for Nushell to jj util completion + - jj branch list now supports a --tracked/-t option which can + be used to show tracked branches only. Omits local + Git-tracking branches by default. + - Commands producing diffs now accept a --context flag for the + number of lines of context to show. + - jj commands with the -T/--template option now provide a hint + containing defined template names when no argument is given, + assisting the user in making a selection. + * Fixed bugs + - On Windows, symlinks in the repo are now supported when + Developer Mode is enabled. When symlink support is + unavailable, they will be materialized as regular files in + the working copy (instead of resulting in a crash). #2 + - On Windows, the :builtin pager is now used by default, rather + than being disabled entirely. + - Auto-rebase now preserves the shape of history even for merge + commits where one parent is an ancestor of another. #2600 + ------------------------------------------------------------------- Thu Feb 8 06:50:56 UTC 2024 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index e9633d8..95e35d4 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,15 +19,17 @@ %define binary_name jj Name: jujutsu -Version: 0.14.0 +Version: 0.15.1 Release: 0 Summary: Git-compatible DVCS that is both simple and powerful License: MIT URL: https://github.com/martinvonz/jj Source0: jj-%{version}.tar.gz Source1: vendor.tar.zst -BuildRequires: cargo >= 1.70 +BuildRequires: cargo >= 1.76 BuildRequires: cargo-packaging +BuildRequires: gnupg +BuildRequires: openssh-common BuildRequires: openssl-devel BuildRequires: zstd diff --git a/vendor.tar.zst b/vendor.tar.zst index f00a276..0565b06 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3560afac89a0b55830dc6c827569d2de41d6561c6fbb9c262b2756b9a1d3cd1 -size 37069767 +oid sha256:b99b3384699951b1dbfb05e8124b32e56d1f5fc18d916d0c2627281ec9c680cd +size 37916527