Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jujutsu for openSUSE:Factory checked
in at 2024-05-09 17:28:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jujutsu (Old)
and /work/SRC/openSUSE:Factory/.jujutsu.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jujutsu"
Thu May 9 17:28:33 2024 rev:8 rq:1172734 version:0.17.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jujutsu/jujutsu.changes 2024-05-03
19:45:33.967068347 +0200
+++ /work/SRC/openSUSE:Factory/.jujutsu.new.1880/jujutsu.changes
2024-05-09 17:28:35.395240027 +0200
@@ -1,0 +2,7 @@
+Wed May 8 06:55:40 UTC 2024 - Gordon Leung <piratec...@protonmail.com>
+
+- update to 0.17.1:
+ * jj status no longer scans through the entire history to look
+ for ancestors with conflicts.
+
+-------------------------------------------------------------------
Old:
----
jj-0.17.0.obscpio
New:
----
jj-0.17.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jujutsu.spec ++++++
--- /var/tmp/diff_new_pack.chZi76/_old 2024-05-09 17:28:36.879294207 +0200
+++ /var/tmp/diff_new_pack.chZi76/_new 2024-05-09 17:28:36.883294354 +0200
@@ -19,7 +19,7 @@
%define binary_name jj
Name: jujutsu
-Version: 0.17.0
+Version: 0.17.1
Release: 0
Summary: Git-compatible DVCS that is both simple and powerful
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.chZi76/_old 2024-05-09 17:28:36.931296106 +0200
+++ /var/tmp/diff_new_pack.chZi76/_new 2024-05-09 17:28:36.935296252 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">v0.17.0</param>
+ <param name="revision">v0.17.1</param>
<param name="changesgenerate">disable</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
++++++ jj-0.17.0.obscpio -> jj-0.17.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jj-0.17.0/CHANGELOG.md new/jj-0.17.1/CHANGELOG.md
--- old/jj-0.17.0/CHANGELOG.md 2024-05-01 19:10:01.000000000 +0200
+++ new/jj-0.17.1/CHANGELOG.md 2024-05-07 17:39:54.000000000 +0200
@@ -15,6 +15,12 @@
### Fixed bugs
+## [0.17.1] - 2024-05-07
+
+### Fixed bugs
+
+* `jj status` no longer scans through the entire history to look for ancestors
with conflicts.
+
## [0.17.0] - 2024-05-01
### Breaking changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jj-0.17.0/Cargo.lock new/jj-0.17.1/Cargo.lock
--- old/jj-0.17.0/Cargo.lock 2024-05-01 19:10:01.000000000 +0200
+++ new/jj-0.17.1/Cargo.lock 2024-05-07 17:39:54.000000000 +0200
@@ -896,7 +896,7 @@
[[package]]
name = "gen-protos"
-version = "0.17.0"
+version = "0.17.1"
dependencies = [
"prost-build",
]
@@ -1665,7 +1665,7 @@
[[package]]
name = "jj-cli"
-version = "0.17.0"
+version = "0.17.1"
dependencies = [
"anyhow",
"assert_cmd",
@@ -1721,7 +1721,7 @@
[[package]]
name = "jj-lib"
-version = "0.17.0"
+version = "0.17.1"
dependencies = [
"assert_matches",
"async-trait",
@@ -1777,7 +1777,7 @@
[[package]]
name = "jj-lib-proc-macros"
-version = "0.17.0"
+version = "0.17.1"
dependencies = [
"proc-macro2",
"quote",
@@ -2887,7 +2887,7 @@
[[package]]
name = "testutils"
-version = "0.17.0"
+version = "0.17.1"
dependencies = [
"async-trait",
"config",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jj-0.17.0/Cargo.toml new/jj-0.17.1/Cargo.toml
--- old/jj-0.17.0/Cargo.toml 2024-05-01 19:10:01.000000000 +0200
+++ new/jj-0.17.1/Cargo.toml 2024-05-07 17:39:54.000000000 +0200
@@ -5,7 +5,7 @@
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
-version = "0.17.0"
+version = "0.17.1"
license = "Apache-2.0"
rust-version = "1.76" # NOTE: remember to
update CI, contributing.md, changelog.md, and flake.nix
edition = "2021"
@@ -116,8 +116,8 @@
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
-jj-lib = { path = "lib", version = "0.17.0" }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.17.0" }
+jj-lib = { path = "lib", version = "0.17.1" }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.17.1" }
testutils = { path = "lib/testutils" }
# Insta suggests compiling these packages in opt mode for faster testing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jj-0.17.0/cli/src/commands/status.rs
new/jj-0.17.1/cli/src/commands/status.rs
--- old/jj-0.17.0/cli/src/commands/status.rs 2024-05-01 19:10:01.000000000
+0200
+++ new/jj-0.17.1/cli/src/commands/status.rs 2024-05-07 17:39:54.000000000
+0200
@@ -20,8 +20,8 @@
use crate::cli_util::{print_conflicted_paths, CommandHelper};
use crate::command_error::CommandError;
-use crate::diff_util;
use crate::ui::Ui;
+use crate::{diff_util, revset_util};
/// Show high-level repo status
///
@@ -95,11 +95,15 @@
let wc_revset = RevsetExpression::commit(wc_commit.id().clone());
// Ancestors with conflicts, excluding the current working copy commit.
- let ancestors_conflicts =
RevsetExpression::filter(RevsetFilterPredicate::HasConflict)
- .intersection(&wc_revset.ancestors())
- .minus(&wc_revset)
- .evaluate_programmatic(repo.as_ref())?
- .iter()
+ let ancestors_conflicts = workspace_command
+ .attach_revset_evaluator(
+ RevsetExpression::filter(RevsetFilterPredicate::HasConflict)
+ .intersection(&wc_revset.parents().ancestors())
+ .minus(&revset_util::parse_immutable_expression(
+ &workspace_command.revset_parse_context(),
+ )?),
+ )?
+ .evaluate_to_commit_ids()?
.collect();
workspace_command.report_repo_conflicts(formatter, repo,
ancestors_conflicts)?;
} else {
++++++ jj.obsinfo ++++++
--- /var/tmp/diff_new_pack.chZi76/_old 2024-05-09 17:28:37.287309103 +0200
+++ /var/tmp/diff_new_pack.chZi76/_new 2024-05-09 17:28:37.291309250 +0200
@@ -1,5 +1,5 @@
name: jj
-version: 0.17.0
-mtime: 1714583401
-commit: 19563fee7483ecd6b5f56200520ac81c84ea16c5
+version: 0.17.1
+mtime: 1715096394
+commit: e1d8705546d3971fef23bc6a4a7589283e5e0717
++++++ vendor.tar.zst ++++++
Binary files /var/tmp/diff_new_pack.chZi76/_old and
/var/tmp/diff_new_pack.chZi76/_new differ
