diff --git a/_service b/_service index 26ade63..dc12bd9 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.19.0 + v0.20.0 disable v(.*) diff --git a/jj-0.19.0.obscpio b/jj-0.19.0.obscpio deleted file mode 100644 index cd72d4f..0000000 --- a/jj-0.19.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fbf9d7ef7d76de794f76a300573003e7819ad68ecac83d7c6822e8c6a08fba9 -size 5952525 diff --git a/jj-0.20.0.obscpio b/jj-0.20.0.obscpio new file mode 100644 index 0000000..45e8453 --- /dev/null +++ b/jj-0.20.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c095c934750c53479446a3dce6f529a79c3d0b7c7e87e8a2f742e195c994e03 +size 6293005 diff --git a/jj.obsinfo b/jj.obsinfo index 3dbb537..6c4a05e 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.19.0 -mtime: 1720042660 -commit: 74c275ed10a7b45e1638fb00e53e29bc6286e8ba +version: 0.20.0 +mtime: 1723051221 +commit: 27d8198fa1a020cd84da490df54a0d8eebd27b9e diff --git a/jujutsu.changes b/jujutsu.changes index 61ab7fc..d0e7f48 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,97 @@ +------------------------------------------------------------------- +Thu Aug 8 05:04:18 UTC 2024 - Johannes Kastl + +- update to 0.20.0: + * Breaking changes + - jj rebase --skip-empty has been renamed to jj rebase + --skip-emptied + - jj backout --revision has been renamed to jj backout + --revisions. The short alias -r is still supported. + - The default immutable_heads() set now includes + untracked_remote_branches() with the assumption that + untracked branches aren't managed by you. Therefore, + untracked branches are no longer displayed in jj log by + default. + - Updated defaults for graph node symbol templates + templates.log_node and templates.op_log_node. + - The "fileset" language is now enabled by default. It can + still be disable by setting ui.allow-filesets=false. + - On jj git fetch/import, commits referred to by HEAD@git are + no longer preserved. If a checked-out named branch gets + deleted locally or remotely, the corresponding commits will + be abandoned. + - jj --at-op=@ no longer merges concurrent operations if + explicitly specified. + - jj obslog -p no longer shows diffs at non-partial squash + operations. Previously, it showed the same diffs as the + second predecessor. + * Deprecations + - The original configuration syntax for jj fix is now + deprecated in favor of one that allows defining multiple + tools that can affect different filesets. + These can be used in combination for now. See jj help fix for + details. + * New features + - External diff tools can now be configured to invoke the tool + on each file individually instead of being passed a directory + by setting + merge-tools.$TOOL.diff-invocation-mode="file-by-file" in + config.toml. + - In git diffs, word-level hunks are now highlighted with + underline. See diff colors and styles for customization. + - New .diff().() commit template methods are added. + They can be used in order to show diffs conditionally. For + example, if(current_working_copy, diff.summary()). + - jj git clone and jj git init with an existing git repository + adds the default branch of the remote as repository settings + for revset-aliases."trunk()".` + - jj workspace forget now abandons the workspace's working-copy + commit if it was empty. + - jj backout now includes the backed out commit's subject in + the new commit message. + - jj backout can now back out multiple commits at once. + - jj git clone some/nested/path now creates the full directory + tree for nested destination paths if they don't exist. + - String patterns now support caseā€insensitive matching by + suffixing any pattern kind with -i. mine() uses + caseā€insensitive matching on your email address + unconditionally. Only ASCII case folding is currently + implemented, but this will likely change in the future. + - String patterns now support regex:"pattern". + - New tracked_remote_branches() and untracked_remote_branches() + revset functions can be used to select tracked/untracked + remote branches. + - The file() revset function now accepts fileset as argument. + - New diff_contains() revset function can be used to search + diffs. + - New command jj operation diff that can compare changes made + between two operations. + - New command jj operation show that can show the changes made + in a single operation. + - New config setting git.private-commits to prevent commits + from being pushed. + - The default commit description template can now be configured + by templates.draft_commit_description. + - jj fix can now be configured to run different tools on + different filesets. This simplifies the use case of + configuring code formatters for specific file types. See jj + help fix for details. + - Added revset functions author_date and committer_date. + - jj describe can now update the description of multiple + commits. + * Fixed bugs + - jj status will show different messages in a conflicted tree, + depending on the state of the working commit. In particular, + if a child commit fixes a conflict in the parent, this will + be reflected in the hint provided by jj status + - jj diff --git no longer shows the contents of binary files. + - Windows binaries no longer require vcruntime140.dll to be + installed (normally through Visual Studio.) + - On quit, the builtin pager no longer waits for all outputs to + be discarded. + - jj branch rename no longer shows a warning in colocated + repos. + ------------------------------------------------------------------- Thu Jul 11 05:39:28 UTC 2024 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index 0f76e8d..1fcbfdd 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.19.0 +Version: 0.20.0 Release: 0 Summary: Git-compatible DVCS that is both simple and powerful License: MIT @@ -33,6 +33,10 @@ BuildRequires: openssh-common BuildRequires: openssl-devel BuildRequires: zstd +# serde_bser fails to compile on s390x +# error[E0599]: no method named `put_f64_be` found for struct `Vec` in the current scope +ExcludeArch: s390x + %description Jujutsu is a Git-compatible DVCS. It combines features from Git (data model, speed), Mercurial (anonymous branching, simple CLI free from "the index", revsets, powerful history-rewriting), and Pijul/Darcs (first-class conflicts), with features not found in most of them (working-copy-as-a-commit, undo functionality, automatic rebase, safe replication via rsync, Dropbox, or distributed file system). diff --git a/vendor.tar.zst b/vendor.tar.zst index 7d8762f..2f1815c 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cd9da0cd42796f9cdeb50f9c87b23532755d6fd8f3135391ab7a9b6b110ef74 -size 37187796 +oid sha256:7700ff1e413fccc975e16910c06d0c1b6e7b529fc44ec7c03f8e5500fb4f930a +size 39898627