From aa1be6a9040167e04c6eec372073e2870ddbfcc1c2071bf6b2591080169705e4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Thu, 2 May 2024 19:50:04 +0000 Subject: [PATCH] Accepting request 1171432 from home:ojkastl_buildservice:Branch_devel_tools_scm update to 0.17.0 OBS-URL: https://build.opensuse.org/request/show/1171432 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/jujutsu?expand=0&rev=15 --- _service | 5 +--- jj-0.16.0.obscpio | 3 -- jj-0.17.0.obscpio | 3 ++ jj.obsinfo | 6 ++-- jujutsu.changes | 72 +++++++++++++++++++++++++++++++++++++++++++++++ jujutsu.spec | 3 +- vendor.tar.zst | 4 +-- 7 files changed, 82 insertions(+), 14 deletions(-) delete mode 100644 jj-0.16.0.obscpio create mode 100644 jj-0.17.0.obscpio diff --git a/_service b/_service index 683f02f..397f965 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.16.0 + v0.17.0 disable v(.*) @@ -19,7 +19,4 @@ true jj - - jj - diff --git a/jj-0.16.0.obscpio b/jj-0.16.0.obscpio deleted file mode 100644 index 62ca368..0000000 --- a/jj-0.16.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7b02786e1a11bf049174a8fa54849943171620dfddcbde8fd485b3d744e1daa -size 5244429 diff --git a/jj-0.17.0.obscpio b/jj-0.17.0.obscpio new file mode 100644 index 0000000..01498e3 --- /dev/null +++ b/jj-0.17.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2057f6e8c1db30c8193652575848c5158c85b9fbffa010b162848504e05a7c71 +size 5557261 diff --git a/jj.obsinfo b/jj.obsinfo index 375d7aa..995e34f 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.16.0 -mtime: 1712173583 -commit: 2dcdc7fb3f20f262a73f52019f5a7b7e48fe069d +version: 0.17.0 +mtime: 1714583401 +commit: 19563fee7483ecd6b5f56200520ac81c84ea16c5 diff --git a/jujutsu.changes b/jujutsu.changes index 960905f..1513373 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Thu May 2 17:49:33 UTC 2024 - Johannes Kastl + +- update to 0.17.0: + * Breaking changes + - The default template aliases were replaced as follows: + builtin_op_log_root(op_id: OperationId) -> + format_root_operation(root: Operation) + builtin_log_root(change_id: ChangeId, commit_id: CommitId) -> + format_root_commit(root: Commit) + builtin_change_id_with_hidden_and_divergent_info -> + format_short_change_id_with_hidden_and_divergent_info(commit: Commit) + - The --revision option of jj rebase is renamed to --revisions. + The short alias -r is still supported. + * New features + - The list of conflicted paths is printed whenever the working + copy changes. + This can be disabled with the --quiet option. + - Commit objects in templates now have a mine() -> Boolean + method analog to the same function in revsets. It evaluates + to true if the email of the commit author matches the current + user.email. + - Commit objects in templates now have a contained_in(revset: + String) -> Boolean method. + - Operation objects in templates now have a snapshot() -> + Boolean method that evaluates to true if the operation was a + snapshot created by a non-mutating command (e.g. jj log). + - Revsets and templates now support single-quoted raw string + literals. + - A new config option ui.always-allow-large-revsets has been + added to allow large revsets expressions in some commands, + without the all: prefix. + - A new config option ui.allow-filesets has been added to + enable "fileset" expressions. Note that filesets are + currently experimental, but will be enabled by default in a + future release. + - A new global flag --ignore-immutable lets you rewrite + immutable commits. + - New command jj parallelize that rebases a set of revisions + into siblings. + - jj status now supports filtering by paths. For example, jj + status . will only list changed files that are descendants of + the current directory. + - jj prev and jj next now work when the working copy revision + is a merge. + - jj squash now accepts a --use-destination-message/-u option + that uses the description of the destination for the new + squashed revision and discards the descriptions of the source + revisions. + - You can check whether Watchman fsmonitor is enabled or + installed with the new jj debug watchman status command. + - jj rebase now accepts revsets resolving to multiple revisions + with the --revisions/-r option. + - jj rebase -r now accepts --insert-after and --insert-before + options to customize the location of the rebased revisions. + * Fixed bugs + - Revsets now support \-escapes in string literal. + - The builtin diff editor now allows empty files to be selected + during jj split. + - Fixed a bug with jj split introduced in 0.16.0 that caused it + to incorrectly rebase the children of the revision being + split if they had other parents (i.e. if the child was a + merge). + - The snapshot.max-new-file-size option can now handle raw + integer literals, interpreted as a number of bytes, where + previously it could only handle string literals. This means + that snapshot.max-new-file-size="1" and + snapshot.max-new-file-size=1 are now equivalent. + - jj squash is now a no-op if the path argument didn't + match any paths (it used to create new commits with bumped + timestamp). #3334 + ------------------------------------------------------------------- Thu Apr 4 05:15:23 UTC 2024 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index 239d05e..c8a43ab 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.16.0 +Version: 0.17.0 Release: 0 Summary: Git-compatible DVCS that is both simple and powerful License: MIT @@ -53,7 +53,6 @@ rm -vf .cargo/config.toml %install install -D -d -m 0755 %{buildroot}%{_bindir} -ls -lh %{_builddir}/ install -m 0755 %{_builddir}/%{binary_name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name} %check diff --git a/vendor.tar.zst b/vendor.tar.zst index 6585c17..f43f94a 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d9216d4d92f27476d6f4e3813cdfc0fb17132aa6bfb304be066e16fde3164e6 -size 37672869 +oid sha256:4b916bdb7c4bb096dc933af4d85940565217c299fc08059c8cf9258f20adfc20 +size 37888867