From 909ca7bc0bd5743cea7ee31c17f554953c5e351f9873703c3a4d9a0cadc9b85b Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 7 Jun 2024 20:27:58 +0000 Subject: [PATCH] Accepting request 1179393 from home:ojkastl_buildservice:Branch_devel_tools_scm update to 0.18.0 OBS-URL: https://build.opensuse.org/request/show/1179393 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/jujutsu?expand=0&rev=19 --- _service | 2 +- jj-0.17.1.obscpio | 3 -- jj-0.18.0.obscpio | 3 ++ jj.obsinfo | 6 ++-- jujutsu.changes | 81 +++++++++++++++++++++++++++++++++++++++++++++++ jujutsu.spec | 3 +- vendor.tar.zst | 4 +-- 7 files changed, 92 insertions(+), 10 deletions(-) delete mode 100644 jj-0.17.1.obscpio create mode 100644 jj-0.18.0.obscpio diff --git a/_service b/_service index 6ce59cb..bcb1002 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.17.1 + v0.18.0 disable v(.*) diff --git a/jj-0.17.1.obscpio b/jj-0.17.1.obscpio deleted file mode 100644 index 6858851..0000000 --- a/jj-0.17.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d027169b24e260a5e8fdac72b3974ddb4c5035a77a4a3044453b88e768b887c7 -size 5557773 diff --git a/jj-0.18.0.obscpio b/jj-0.18.0.obscpio new file mode 100644 index 0000000..09f85d1 --- /dev/null +++ b/jj-0.18.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c20b2b26a9d97ccde20c500470af0767e78d59dc049bc3d22b1bd05a787b689 +size 5770765 diff --git a/jj.obsinfo b/jj.obsinfo index a269bc2..00003dd 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.17.1 -mtime: 1715096394 -commit: e1d8705546d3971fef23bc6a4a7589283e5e0717 +version: 0.18.0 +mtime: 1717670815 +commit: 9fb5307b7886e390c02817af7c31b403f0279144 diff --git a/jujutsu.changes b/jujutsu.changes index 37438c3..53e87b1 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Fri Jun 7 20:02:25 UTC 2024 - Johannes Kastl + +- update to 0.18.0: + * Breaking changes + - Dropped support for ui.default-revset config (replaced by + revsets.log in 0.8.0). + - The commit_summary_no_branches template is superseded by + templates.branch_list. + - jj split will now refuse to split an empty commit. + - jj config list now uses multi-line strings and single-quoted + strings in the output when appropriate. + - jj config get/list/set now parse name argument as TOML key. + Quote meta characters as needed. Example: jj config get + "revset-aliases.'trunk()'" + - When updating the working copy away from an empty and + undescribed commit, it is now abandoned even if it is a merge + commit. + - If a new working-copy commit is created because the old one + was abandoned, and the old commit was merge, then the new + commit will now also be. #2859 + - jj new's --insert-before/--insert-after options must now be + set for each commit the new commit will be inserted + before/after. Previously, those options were global flags and + specifying them once would insert the new commit before/ + after all the specified commits. + * Deprecations + - Attempting to alias a built-in command now gives a warning, rather than being + silently ignored. + * New features + - jj branch list/tag list now accept -T/--template option. The + tag list prints commit summary along with the tag name by + default. + - Conflict markers now include an explanation of what each part + of the conflict represents. + - ui.color = "debug" prints active labels alongside the regular + colored output. + - jj branch track now show conflicts if there are some. + - A new revset reachable(srcs, domain) will return all commits + that are reachable from srcs within domain. + - There are now prebuilt binaries for + aarch64-linux-unknown-musl. Note, these are cross compiled + and currently untested. We plan on providing fully tested + builds later once our CI system allows it. + - Added new revsets mutable() and immutable(). + - Upgraded scm-record from v0.2.0 to v0.3.0. See release notes + at https://github.com/arxanas/scm-record/releases/tag/v0.3.0 + - New command jj fix that can be configured to update commits + by running code formatters (or similar tools) on changed + files. The configuration schema and flags are minimal for + now, with a number of improvements planned (for example, + #3800 and #3801). + - jj new's --insert-before and --insert-after options can now + be used simultaneously. + - jj git push now can push commits with empty descriptions with + the --allow-empty-description flag + * Fixed bugs + - Previously, jj git push only made sure that the branch is in + the expected location on the remote server when pushing a + branch forward (as opposed to sideways or backwards). Now, jj + git push makes a safety check in all cases and fails whenever + jj git fetch would have introduced a conflict. + In other words, previously branches that moved sideways or + backward were pushed similarly to Git's git push --force; now + they have protections similar to git push --force-with-lease + (though not identical to it, to match the behavior of jj git + fetch). Note also that because of the way jj git fetch works, + jj does not suffer from the same problems as Git's git push + --force-with-lease in situations when git fetch is run in the + background. + - When the working copy commit becomes immutable, a new one is + automatically created on top of it to avoid letting the user + edit the immutable one. + - jj config list now properly escapes TOML keys (#1322). + - Files with conflicts are now checked out as executable if all + sides of the conflict are executable. + - The progress bar (visible when using e.g. jj git clone) + clears the remainder of the cursor row after drawing rather + than clearing the entire row before drawing, eliminating the + "flicker" effect seen on some terminals. + ------------------------------------------------------------------- Wed May 8 06:55:40 UTC 2024 - Gordon Leung diff --git a/jujutsu.spec b/jujutsu.spec index a5a29e3..5708541 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.17.1 +Version: 0.18.0 Release: 0 Summary: Git-compatible DVCS that is both simple and powerful License: MIT @@ -56,6 +56,7 @@ install -D -d -m 0755 %{buildroot}%{_bindir} install -m 0755 %{_builddir}/%{binary_name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name} %check +rm -rf tests/contest/ %{cargo_test} %files diff --git a/vendor.tar.zst b/vendor.tar.zst index 9103e25..a38c31e 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:359b7f02d70762f7569d9ee7ca8589cc56241a7bad4c4f34ef9bb2fdce88fc8d -size 38405808 +oid sha256:d2cd96a3d49e34d26dc784e7269a3a91c07e80430b0018d4df3593c36b44bc96 +size 37120413