Accepting request 1234556 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/1234556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jujutsu?expand=0&rev=17

_service

@@ -1,17 +1,13 @@
 <services>
   <service name="obs_scm" mode="manual">
-    <param name="url">https://github.com/martinvonz/jj</param>
+    <param name="url">https://github.com/jj-vcs/jj</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
+    <param name="revision">v0.25.0</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v0.21.0</param>
-    <param name="changesgenerate">disable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-  </service>
+    <param name="changesgenerate">disable</param>
-  <service name="tar" mode="buildtime"/>
+    <param name="filename">jujutsu</param>
-  <service name="recompress" mode="buildtime">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
   </service>
   <service name="set_version" mode="manual">
   </service>
@@ -19,4 +15,9 @@
     <param name="update">true</param>
     <param name="srcdir">jj</param>
   </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
 </services>

jj-0.21.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a8a78e26e9d4eeef85188dbe0c633346b8b6ffe52557c4338373d54b2806b73
-size 6437389

jj.obsinfo

@@ -1,4 +0,0 @@
-name: jj
-version: 0.21.0
-mtime: 1725469873
-commit: d002a5ad35e624a731e96e85f490f28febc7797e

jujutsu-0.25.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81301644c9b124f40d679a250682461a8e8441e18a6144f67071e85345b8ce9f
+size 7429645

jujutsu.changes

@@ -1,7 +1,324 @@
+-------------------------------------------------------------------
+Thu Jan  2 10:51:18 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- update to 0.25.0:
+  * Release highlights
+    - Improvements to configuration management, including support
+      for conditional variables in config files.
+    - Large files in the working copy will no longer cause commands
+      to fail; instead the large files will remain intact but
+      untracked in the working copy.
+  * Breaking changes
+    - Configuration variables are no longer "stringly" typed. For
+      example, true is not converted to a string "true", and vice
+      versa.
+    - The following configuration variables are now parsed
+      strictly: colors.<labels>, git.abandon-unreachable-commits,
+      git.auto-local-bookmark, git.push-bookmark-prefix,
+      revsets.log, revsets.short-prefixes signing.backend,
+      operation.hostname, operation.username, ui.allow-init-native,
+      ui.color, ui.default-description, ui.progress-indicator,
+      ui.quiet, user.email, user.name
+    - jj config list now prints inline tables { key = value, .. }
+      literally.  Inner items of inline tables are no longer merged
+      across configuration files.  See the table syntax
+      documentation for details.
+    - jj config edit --user now opens a file even if $JJ_CONFIG
+      points to a directory. If there are multiple config files,
+      the command will fail.
+    - jj config set no longer accepts a bare string value that
+      looks like a TOML expression. For example, jj config set NAME
+      '[foo]' must be quoted as jj config set NAME '"[foo]"'.
+    - The deprecated [alias] config section is no longer respected.
+      Move command aliases to the [aliases] section.
+    - jj absorb now abandons the source commit if it becomes empty
+      and has no description.
+  * Deprecations
+    - --config-toml=TOML is deprecated in favor of
+      --config=NAME=VALUE and --config-file=PATH.
+    - The Signature.username() template method is deprecated for
+      Signature().email().local().
+  * New features
+    - jj command no longer fails due to new working-copy files
+      larger than the snapshot.max-new-file-size config option. It
+      will print a warning and large files will be left untracked.
+    - Configuration files now support conditional variables.
+    - New command options --config=NAME=VALUE and
+      --config-file=PATH to set string value without quoting and to
+      load additional configuration from files.
+    - Templates now support the >=, >, <=, and < relational
+      operators for Integer types.
+    - A new Email template type is added. Signature.email() now
+      returns an Email template type instead of a String.
+    - Adds a new template alias commit_timestamp(commit) which
+      defaults to the committer date.
+    - Conflict markers are now allowed to be longer than 7
+      characters, allowing conflicts to be materialized and parsed
+      correctly in files which already contain lines that look like
+      conflict markers.
+    - New $marker_length variable to allow merge tools to support
+      longer conflict markers (equivalent to "%L" for Git merge
+      drivers).
+    - jj describe now accepts a JJ: ignore-rest line that ignores
+      everything below it, similar to a "scissor line" in git. When
+      editing multiple commits, only ignore until the next JJ:
+      describe line.
+  * Fixed bugs
+    - The $NO_COLOR environment variable must now be non-empty to
+      be respected.
+    - Fixed incompatible rendering of empty hunks in git/unified
+      diffs. #5049
+    - Fixed performance of progress bar rendering when fetching
+      from Git remote. #5057
+    - jj config path --user no longer creates new file at the
+      default config path.
+    - On Windows, workspace paths (printed by jj root) no longer
+      use UNC-style \\?\ paths unless necessary.
+    - On Windows, jj git clone now converts local Git remote path
+      to slash-separated path.
+    - jj resolve no longer removes the executable bit on resolved
+      files when using an external merge tool.
+
+-------------------------------------------------------------------
+Wed Dec 18 14:52:06 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- add completion subpackages for bash, fish and zsh
+
+-------------------------------------------------------------------
+Thu Dec  5 05:54:17 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- update to 0.24.0:
+  * Breaking changes
+    - jj move has been removed. It was deprecated in 0.16.0.
+    - jj checkout and the built-in alias jj co have been removed.
+      It was deprecated in 0.14.0.
+    - jj merge has been removed. It was deprecated in 0.14.0.
+    - jj git push no longer pushes new bookmarks by default. Use
+      --allow-new to bypass this restriction.
+    - Lines prefixed with "JJ:" in commit descriptions and in
+      sparse patterns (from jj sparse edit) are now stripped even
+      if they are not immediately followed by a space. #5004
+  * Deprecations
+    - None
+  * New features
+    - Templates now support the == and != logical operators for
+      Boolean, Integer, and String types.
+    - New command jj absorb that moves changes to stack of mutable
+      revisions.
+    - New command jj util exec that can be used for arbitrary
+      aliases.
+    - jj rebase -b can now be used with the --insert-after and
+      --insert-before options, like jj rebase -r and jj rebase -s.
+    - A preview of improved shell completions was added. Please
+      refer to the documentation to activate them. They
+      additionally complete context-dependent, dynamic values like
+      bookmarks, aliases, revisions, operations and files.
+    - Added the config setting snapshot.auto-update-stale for
+      automatically running jj workspace update-stale when
+      applicable.
+    - jj duplicate now accepts --destination, --insert-after and
+      --insert-before options to customize the location of the
+      duplicated revisions.
+    - jj log now displays the working-copy branch first.
+    - New fork_point() revset function can be used to obtain the
+      fork point of multiple commits.
+    - The tags() revset function now takes an optional pattern
+      argument, mirroring that of bookmarks().
+    - Several commands now support -f/-t shorthands for
+      --from/--to:
+      - diff
+      - diffedit
+      - interdiff
+      - op diff
+      - restore
+    - New ui.conflict-marker-style config option to change how
+      conflicts are materialized in the working copy. The default
+      option ("diff") renders conflicts as a snapshot with a list
+      of diffs to apply to the snapshot.  The new "snapshot" option
+      renders conflicts as a series of snapshots, showing each side
+      and base of the conflict. The new "git" option replicates
+      Git's "diff3" conflict style, meaning it is more likely to
+      work with external tools, but it doesn't support conflicts
+      with more than 2 sides.
+    - New merge-tools.<TOOL>.conflict-marker-style config option to
+      override the conflict marker style used for a specific merge
+      tool.
+    - New merge-tools.<TOOL>.merge-conflict-exit-codes config
+      option to allow a merge tool to exit with a non-zero code to
+      indicate that not all conflicts were resolved.
+    - jj simplify-parents now supports configuring the default
+      revset when no --source or --revisions arguments are provided
+      with the revsets.simplify-parents config.
+  * Fixed bugs
+    - jj config unset <TABLE-NAME> no longer removes a table (such
+      as [ui].)
+
+-------------------------------------------------------------------
+Tue Nov 12 09:21:09 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- update to 0.23.0 (boo#1233013):
+  * Security fixes
+    - Fixed path traversal by cloning/checking out crafted Git
+      repository containing .., .jj, .git paths.
+      (GHSA-88h5-6w7m-5w56; CVE-2024-51990)
+  * Breaking changes
+    - Revset function names can no longer start with a number.
+    - Evaluation error of revsets.short-prefixes configuration is
+      now reported.
+    - The HEAD@git symbol no longer resolves to the Git HEAD
+      revision. Use git_head() or @- revset expression instead. The
+      git_head template keyword now returns a boolean.
+    - Help command doesn't work recursively anymore, i.e. jj
+      workspace help root doesn't work anymore.
+    - The color label op_log from the [colors] config section now
+      only applies to the op log and not to the other places
+      operations are displayed. In almost all cases, if you
+      configured op_log before, you should use the new operation
+      label instead.
+    - Default operation log template now shows end times of
+      operations instead of start times.
+  * Deprecations
+    - git.auto-local-bookmark replaces git.auto-local-branch. The
+      latter remains supported for now (at lower precedence than
+      the former).
+  * New features
+    - Added diff options to ignore whitespace when comparing lines.
+      Whitespace changes are still highlighted.
+    - New command jj simplify-parents will remove redundant parent
+      edges.
+    - jj squash now supports -f/-t shorthands for --from/--[in]to.
+    - Initial support for shallow Git repositories has been
+      implemented. However, deepening the history of a shallow
+      repository is not yet supported.
+    - jj git clone now accepts a --depth <DEPTH> option, which
+      allows to clone the repository with a given depth.
+    - New command jj file annotate that annotates files line by
+      line. This is similar in functionality to git blame. Invoke
+      the command with jj file annotate <file_path>.  The output
+      can be customized via the templates.annotate_commit_summary
+      config variable.
+    - jj bookmark list gained a --remote REMOTE option to display
+      bookmarks belonging to a remote. This option can be combined
+      with --tracked or --conflicted.
+    - New command jj config unset that unsets config values. For
+      example, jj config unset --user user.name.
+    - jj help now has the flag --keyword (shorthand -k), which can
+      give help for some keywords (e.g. jj help -k revsets). To see
+      a list of the available keywords you can do jj help --help.
+    - New at_operation(op, expr) revset can be used in order to
+      query revisions based on historical state.
+    - String literals in filesets, revsets and templates now
+      support hex bytes (with \e as escape / shorthand for \x1b).
+    - New coalesce(revsets...) revset which returns commits in the
+      first revset in the revsets list that does not evaluate to
+      none().
+    - New template function raw_escape_sequence(...) preserves
+      escape sequences.
+    - Timestamp objects in templates now have after(date) ->
+      Boolean and before(date) -> Boolean methods for comparing
+      timestamps to other dates.
+    - New template functions pad_start(), pad_end(),
+      truncate_start(), and truncate_end() are added.
+    - Add a new template alias
+      bultin_log_compact_full_description().
+    - Added the config settings diff.color-words.context and
+      diff.git.context to control the default number of lines of
+      context shown.
+  * Fixed bugs
+    - Error on trunk() revset resolution is now handled gracefully.
+      #4616
+    - Updated the built-in diff editor scm-record to version 0.4.0,
+      which includes multiple fixes.
+
+-------------------------------------------------------------------
+Thu Oct  3 12:13:57 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- update to 0.22.0:
+  * Breaking changes
+    - Fixing #4239 means the ordering of some messages have
+      changed.
+    - Invalid ui.graph.style configuration is now an error.
+    - The builtin template branch_list has been renamed to
+      bookmark_list as part of the jj branch deprecation.
+  * Deprecations
+    - jj branch has been deprecated in favor of jj bookmark.
+    - Rationale: Jujutsu's branches don't behave like Git branches,
+      which a confused many newcomers, as they expected a similar
+      behavior given the name.  We've renamed them to "bookmarks"
+      to match the actual behavior, as we think that describes them
+      better, and they also behave similar to Mercurial's
+      bookmarks.
+    - jj obslog is now called jj evolution-log/jj evolog. jj obslog
+      remains as an alias.
+    - jj unsquash has been deprecated in favor of jj squash and jj
+      diffedit --restore-descendants.
+    - Rationale: jj squash can be used in interactive mode to pull
+      changes from one commit to another, including from a parent
+      commit to a child commit. For fine-grained dependent diffs,
+      such as when the parent and the child commits must
+      successively modify the same location in a file, jj diffedit
+      --restore-descendants can be used to set the parent commit to
+      the desired content without altering the content of the child
+      commit.
+    - The git.push-branch-prefix config has been deprecated in
+      favor of git.push-bookmark-prefix.
+    - conflict() and file() revsets have been renamed to
+      conflicts() and files() respectively. The old names are still
+      around and will be removed in a future release.
+  * New features
+    - The new config option snapshot.auto-track lets you
+      automatically track only the specified paths (all paths by
+      default). Use the new jj file track command to manually
+      tracks path that were not automatically tracked. There is no
+      way to list untracked files yet. Use git status in a
+      colocated workspace as a workaround.  #323
+    - jj fix now allows fixing unchanged files with the
+      --include-unchanged-files flag. This can be used to more
+      easily introduce automatic formatting changes in a new commit
+      separate from other changes.
+    - jj workspace add now accepts a --sparse-patterns=<MODE>
+      option, which allows control of the sparse patterns for a
+      newly created workspace: copy (inherit from parent; default),
+      full (full working copy), or empty (the empty working copy).
+    - New command jj workspace rename that can rename the current
+      workspace.
+    - jj op log gained an option to include operation diffs.
+    - jj git clone now accepts a --remote <REMOTE NAME> option,
+      which allows to set a name for the remote instead of using
+      the default origin.
+    - jj op undo now reports information on the operation that has
+      been undone.
+    - jj squash: the -k flag can be used as a shorthand for
+      --keep-emptied.
+    - CommitId / ChangeId template types now support .normal_hex().
+    - jj commit and jj describe now accept --author option allowing
+      to quickly change author of given commit.
+    - jj diffedit, jj abandon, and jj restore now accept a
+      --restore-descendants flag. When used, descendants of the
+      edited or deleted commits will keep their original content.
+    - jj git fetch -b <remote-git-branch-name> will now warn if the
+      branch(es) can not be found in any of the
+      specified/configured remotes.
+    - jj split now lets the user select all changes in interactive
+      mode. This may be used to keeping all changes into the first
+      commit while keeping the current commit description for the
+      second commit (the newly created empty one).
+    - Author and committer names are now yellow by default.
+  * Fixed bugs
+    - Update working copy before reporting changes. This prevents
+      errors during reporting from leaving the working copy in a
+      stale state.
+    - Fixed panic when parsing invalid conflict markers of a
+      particular form.  (#2611)
+    - Editing a hidden commit now makes it visible.
+    - The present() revset now suppresses missing working copy
+      error. For example, present(@) evaluates to none() if the
+      current workspace has no working-copy commit.
+
 -------------------------------------------------------------------
 Tue Sep 10 04:57:58 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
 
-- update to 0.21.0:
+- update to 0.21.0 (boo#1230082):
   * Breaking changes
     - next/prev will no longer infer when to go into edit mode when
       moving from commit to commit. It now either follows the flags

jujutsu.obsinfo

@@ -0,0 +1,4 @@
+name: jujutsu
+version: 0.25.0
+mtime: 1735790175
+commit: 041c4fecb77434dd6720e7d7f1ce48d9575ac5f7

jujutsu.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jujutsu
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
 %define binary_name jj
 
 Name:           jujutsu
-Version:        0.21.0
+Version:        0.25.0
 Release:        0
 Summary:        Git-compatible DVCS that is both simple and powerful
 License:        MIT
-URL:            https://github.com/martinvonz/jj
+URL:            https://github.com/jj-vcs/jj
-Source0:        jj-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
 BuildRequires:  cargo >= 1.76
 BuildRequires:  cargo-packaging
@@ -32,6 +32,10 @@ BuildRequires:  gnupg
 BuildRequires:  openssh-common
 BuildRequires:  openssl-devel
 BuildRequires:  zstd
+# dependencies for completion subpackages
+BuildRequires:  bash-completion
+BuildRequires:  fish
+BuildRequires:  zsh
 
 # serde_bser fails to compile on s390x
 # error[E0599]: no method named `put_f64_be` found for struct `Vec<u8>` in the current scope
@@ -59,15 +63,58 @@ stable, and most developers use it daily for all their needs, there may still
 be work-in-progress features, suboptimal UX, and workflow gaps that make it
 unusable for your particular use.
 
+%package -n %{name}-bash-completion
+Summary:        Bash Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+BuildArch:      noarch
+
+%description -n %{name}-bash-completion
+Bash command line completion support for %{name}.
+
+%package -n %{name}-fish-completion
+Summary:        Fish Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Supplements:    (%{name} and fish)
+BuildArch:      noarch
+
+%description -n %{name}-fish-completion
+Fish command line completion support for %{name}.
+
+%package -n %{name}-zsh-completion
+Summary:        Zsh Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Supplements:    (%{name} and zsh)
+BuildArch:      noarch
+
+%description -n %{name}-zsh-completion
+zsh command line completion support for %{name}.
+
 %prep
-%autosetup -p 1 -a 1 -n jj-%{version}
+%autosetup -p 1 -a 1
 
 %build
 %{cargo_build}
 
 %install
 install -D -d -m 0755 %{buildroot}%{_bindir}
-install -m 0755 %{_builddir}/%{binary_name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name}
+install -m 0755 %{_builddir}/%{name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name}
+
+# create the bash completion file
+mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions/
+%{buildroot}/%{_bindir}/%{binary_name} util completion bash > %{buildroot}%{_datarootdir}/bash-completion/completions/%{binary_name}
+
+# create the fish completion file
+mkdir -p %{buildroot}%{_datarootdir}/fish/vendor_completions.d/
+%{buildroot}/%{_bindir}/%{binary_name} util completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{binary_name}.fish
+
+# create the zsh completion file
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{binary_name} util completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{binary_name}
 
 %check
 rm -rf tests/contest/
@@ -78,4 +125,13 @@ rm -rf tests/contest/
 %license LICENSE
 %{_bindir}/%{binary_name}
 
+%files -n %{name}-bash-completion
+%{_datarootdir}/bash-completion/completions/%{binary_name}
+
+%files -n %{name}-fish-completion
+%{_datarootdir}/fish/vendor_completions.d/%{binary_name}.fish
+
+%files -n %{name}-zsh-completion
+%{_datarootdir}/zsh/site-functions/_%{binary_name}
+
 %changelog

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b685c569b979d0bb94afdce8d1edd5e2c7d2c67bf4f551ddf9141b2ab88c435
+oid sha256:1cbbcd5b64b340f5a98eea9e9692ee91c30ff98cb677c908067bf5d2c99fcf18
-size 39938745
+size 40551367