Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package riff for openSUSE:Factory checked in
at 2025-01-14 16:22:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/riff (Old)
and /work/SRC/openSUSE:Factory/.riff.new.1881 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "riff"
Tue Jan 14 16:22:11 2025 rev:21 rq:1237451 version:3.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/riff/riff.changes 2024-11-27
22:15:42.951453727 +0100
+++ /work/SRC/openSUSE:Factory/.riff.new.1881/riff.changes 2025-01-14
16:23:08.607239281 +0100
@@ -1,0 +2,6 @@
+Mon Jan 13 15:03:51 UTC 2025 - Michael Vetter <mvet...@suse.com>
+
+- Update to 3.3.8:
+ * Accept arguments in PAGER variable
+
+-------------------------------------------------------------------
Old:
----
riff-3.3.7.tar.zst
New:
----
riff-3.3.8.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ riff.spec ++++++
--- /var/tmp/diff_new_pack.Szc7tH/_old 2025-01-14 16:23:09.483275529 +0100
+++ /var/tmp/diff_new_pack.Szc7tH/_new 2025-01-14 16:23:09.487275695 +0100
@@ -1,7 +1,7 @@
#
# spec file for package riff
#
-# 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
@@ -17,7 +17,7 @@
Name: riff
-Version: 3.3.7
+Version: 3.3.8
Release: 0
Summary: A diff filter highlighting which line parts have changed
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Szc7tH/_old 2025-01-14 16:23:09.511276688 +0100
+++ /var/tmp/diff_new_pack.Szc7tH/_new 2025-01-14 16:23:09.515276853 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/walles/riff.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="revision">3.3.7</param>
+ <param name="revision">3.3.8</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ riff-3.3.7.tar.zst -> riff-3.3.8.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.3.7/Cargo.lock new/riff-3.3.8/Cargo.lock
--- old/riff-3.3.7/Cargo.lock 2024-11-10 12:29:43.000000000 +0100
+++ new/riff-3.3.8/Cargo.lock 2025-01-11 14:32:02.000000000 +0100
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
@@ -408,7 +408,7 @@
[[package]]
name = "riffdiff"
-version = "3.3.7"
+version = "3.3.8"
dependencies = [
"backtrace",
"bytecount",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.3.7/Cargo.toml new/riff-3.3.8/Cargo.toml
--- old/riff-3.3.7/Cargo.toml 2024-11-10 12:29:43.000000000 +0100
+++ new/riff-3.3.8/Cargo.toml 2025-01-11 14:32:02.000000000 +0100
@@ -2,7 +2,7 @@
[package]
name = "riffdiff" # Actually
"riff", but that was already taken on crates.io
-version = "3.3.7"
+version = "3.3.8"
authors = ["Johan Walles <johan.wal...@gmail.com>"]
edition = "2018"
repository = "https://github.com/walles/riff/";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.3.7/release.sh new/riff-3.3.8/release.sh
--- old/riff-3.3.7/release.sh 2024-11-10 12:29:43.000000000 +0100
+++ new/riff-3.3.8/release.sh 2025-01-11 14:32:02.000000000 +0100
@@ -13,7 +13,7 @@
set -eu -o pipefail
# List available SDKs using "xcodebuild -showsdks"
-CROSSBUILD_MACOS_SDK="macosx15.1"
+CROSSBUILD_MACOS_SDK="macosx15.2"
# Git hooks can use this variable to avoid duplicating the CI work we do in
here
# anyway.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.3.7/src/main.rs new/riff-3.3.8/src/main.rs
--- old/riff-3.3.7/src/main.rs 2024-11-10 12:29:43.000000000 +0100
+++ new/riff-3.3.8/src/main.rs 2025-01-11 14:32:02.000000000 +0100
@@ -75,21 +75,20 @@
after_help = HELP_TEXT_FOOTER,
override_usage = r#"
diff ... | riff [options...]
- riff [-b] [-w] [options...] <F1> <F2>
+ riff [-b] [-w] [options...] <FD1> <FD2>
riff [-b] [-w] [options...] --file <FILE>"#
)]
-
struct Options {
/// First file or directory to compare
- #[arg(requires("f2"))]
- f1: Option<String>,
+ #[arg(requires("fd2"))]
+ fd1: Option<String>,
/// Second file or directory to compare
#[arg()]
- f2: Option<String>,
+ fd2: Option<String>,
/// Read diff or patch file
- #[arg(long, short, conflicts_with_all = ["f1", "f2"])]
+ #[arg(long, short, conflicts_with_all = ["fd1", "fd2"])]
file: Option<PathBuf>,
/// Ignore changes in amount of whitespace
@@ -146,7 +145,10 @@
#[default]
None,
- /// Try it and report back!
+ /// Old unchanged faint yellow, new unchanged plain yellow
+ Yellow,
+
+ /// Try it and report back! Same as yellow for now.
Experimental,
}
@@ -236,11 +238,15 @@
#[must_use]
fn try_pager(
input: &mut dyn io::Read,
- pager_name: &str,
+ pager_space_separated: &str,
color: bool,
formatter: Formatter,
) -> bool {
- let mut command = Command::new(pager_name);
+ let pager_cmdline: Vec<&str> =
pager_space_separated.split_whitespace().collect();
+ let mut command = Command::new(pager_cmdline[0]);
+ for arg in pager_cmdline.iter().skip(1) {
+ command.arg(arg);
+ }
if env::var(PAGER_FORKBOMB_STOP).is_ok() {
// Try preventing fork bombing if $PAGER is set to riff
@@ -496,10 +502,11 @@
let formatter = match
options.unchanged_style.unwrap_or(UnchangedStyle::None) {
UnchangedStyle::None => Formatter::default(),
- UnchangedStyle::Experimental => Formatter::experimental(),
+ UnchangedStyle::Yellow => Formatter::yellow(),
+ UnchangedStyle::Experimental => Formatter::yellow(),
};
- if let (Some(file1), Some(file2)) = (options.f1, options.f2) {
+ if let (Some(file1), Some(file2)) = (options.fd1, options.fd2) {
// "riff file1 file2"
exec_diff_highlight(
&file1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.3.7/src/refiner.rs
new/riff-3.3.8/src/refiner.rs
--- old/riff-3.3.7/src/refiner.rs 2024-11-10 12:29:43.000000000 +0100
+++ new/riff-3.3.8/src/refiner.rs 2025-01-11 14:32:02.000000000 +0100
@@ -36,7 +36,7 @@
}
}
- pub(crate) fn experimental() -> Self {
+ pub(crate) fn yellow() -> Self {
Formatter {
line_style_old: LineStyle {
prefix_style: ANSI_STYLE_NORMAL.with_color(Red),
@@ -112,8 +112,8 @@
fn too_large_to_refine(texts: &[&str]) -> bool {
let size = texts.iter().map(|text| text.len()).sum::<usize>();
- // This limit used to be higher, but then refining too long on Johan's
- // laptop. This number is based on very limited experimentation.
+ // This limit used to be higher, but then refining took too long on
+ // Johan's laptop. This number is based on very limited
experimentation.
return size > 300_000usize;
}
@@ -513,7 +513,7 @@
/// hangs, that's probably what happened again.
#[test]
fn test_format_simple_complexity() {
- // Values from whan this file was added in a single commit:
+ // Values from when this file was added in a single commit:
//
https://github.com/walles/moar/blob/59270d6f8cf454f7a79fcde36a7fcf794768ced9/sample-files/large-git-log-patch.txt
let lines = 300_000;
let line_length = 50;
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/riff/vendor.tar.zst
/work/SRC/openSUSE:Factory/.riff.new.1881/vendor.tar.zst differ: char 7, line 1
