Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package riff for openSUSE:Factory checked in
at 2024-09-09 14:45:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/riff (Old)
and /work/SRC/openSUSE:Factory/.riff.new.10096 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "riff"
Mon Sep 9 14:45:02 2024 rev:13 rq:1199547 version:3.2.1~0
Changes:
--------
--- /work/SRC/openSUSE:Factory/riff/riff.changes 2024-05-21
18:37:07.047869994 +0200
+++ /work/SRC/openSUSE:Factory/.riff.new.10096/riff.changes 2024-09-09
14:46:05.338804251 +0200
@@ -1,0 +2,9 @@
+Mon Sep 9 06:22:27 UTC 2024 - Michael Vetter <mvet...@suse.com>
+
+- Update to 3.2.1:
+ * Before this release, file names were rendered in all bold.
+ Starting with this release though, the paths are rendered
+ in normal intensity, but the actual file names are kept bold.
+ The goal of this is to improve readability of the output.
+
+-------------------------------------------------------------------
Old:
----
riff-3.2.0~0.tar.zst
New:
----
riff-3.2.1~0.tar.zst
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ riff.spec ++++++
--- /var/tmp/diff_new_pack.trqM5K/_old 2024-09-09 14:46:06.466851176 +0200
+++ /var/tmp/diff_new_pack.trqM5K/_new 2024-09-09 14:46:06.466851176 +0200
@@ -17,7 +17,7 @@
Name: riff
-Version: 3.2.0~0
+Version: 3.2.1~0
Release: 0
Summary: A diff filter highlighting which line parts have changed
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.trqM5K/_old 2024-09-09 14:46:06.506852840 +0200
+++ /var/tmp/diff_new_pack.trqM5K/_new 2024-09-09 14:46:06.514853173 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/walles/riff.git</param>
<param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param>
<param name="scm">git</param>
- <param name="revision">3.2.0</param>
+ <param name="revision">3.2.1</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ riff-3.2.0~0.tar.zst -> riff-3.2.1~0.tar.zst ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/Cargo.lock new/riff-3.2.1~0/Cargo.lock
--- old/riff-3.2.0~0/Cargo.lock 2024-05-20 08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/Cargo.lock 2024-09-08 21:19:12.000000000 +0200
@@ -417,7 +417,7 @@
[[package]]
name = "riffdiff"
-version = "3.2.0"
+version = "3.2.1"
dependencies = [
"backtrace",
"bytecount",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/Cargo.toml new/riff-3.2.1~0/Cargo.toml
--- old/riff-3.2.0~0/Cargo.toml 2024-05-20 08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/Cargo.toml 2024-09-08 21:19:12.000000000 +0200
@@ -2,7 +2,7 @@
[package]
name = "riffdiff" # Actually
"riff", but that was already taken on crates.io
-version = "3.2.0"
+version = "3.2.1"
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.2.0~0/src/plusminus_header_highlighter.rs
new/riff-3.2.1~0/src/plusminus_header_highlighter.rs
--- old/riff-3.2.0~0/src/plusminus_header_highlighter.rs 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/src/plusminus_header_highlighter.rs 2024-09-08
21:19:12.000000000 +0200
@@ -6,8 +6,8 @@
use crate::refiner::to_highlighted_tokens;
use crate::string_future::StringFuture;
use crate::token_collector::{
- align_tabs, lowlight_timestamp, render, unhighlight_git_prefix,
LINE_STYLE_NEW_FILENAME,
- LINE_STYLE_OLD_FILENAME,
+ align_tabs, brighten_filename, lowlight_timestamp, render,
unhighlight_git_prefix,
+ LINE_STYLE_NEW_FILENAME, LINE_STYLE_OLD_FILENAME,
};
pub(crate) struct PlusMinusHeaderHighlighter {
@@ -120,6 +120,9 @@
let (mut old_tokens, mut new_tokens, _, _) =
to_highlighted_tokens(&self.old_name, &self.new_name, false);
+ brighten_filename(&mut old_tokens);
+ brighten_filename(&mut new_tokens);
+
lowlight_timestamp(&mut old_tokens);
lowlight_timestamp(&mut new_tokens);
@@ -147,6 +150,9 @@
use super::*;
+ const NOT_INVERSE_VIDEO: &str = "\x1b[27m";
+ const DEFAULT_COLOR: &str = "\x1b[39m";
+
#[test]
fn test_align_timestamps() {
let mut test_me =
@@ -169,4 +175,64 @@
plain.as_str()
);
}
+
+ #[test]
+ fn test_brighten_filename() {
+ let mut test_me = PlusMinusHeaderHighlighter::from_line("---
a/x/y/z.txt").unwrap();
+ let mut response = test_me
+ .consume_line("+++ b/x/y/z.txt", &ThreadPool::new(1))
+ .unwrap();
+ assert_eq!(LineAcceptance::AcceptedDone, response.line_accepted);
+ assert_eq!(1, response.highlighted.len());
+
+ let highlighted = response.highlighted[0].get().to_string();
+ assert_eq!(
+ format!(
+ "\
+ {BOLD}---
{NORMAL_INTENSITY}{FAINT}a/{NORMAL}x/y/{BOLD}z.txt{NORMAL}\n\
+ {BOLD}+++
{NORMAL_INTENSITY}{FAINT}b/{NORMAL}x/y/{BOLD}z.txt{NORMAL}\n"
+ ),
+ highlighted
+ );
+ }
+
+ #[test]
+ fn test_brighten_filename_without_path() {
+ let mut test_me = PlusMinusHeaderHighlighter::from_line("---
z.txt").unwrap();
+ let mut response = test_me
+ .consume_line("+++ z.txt", &ThreadPool::new(1))
+ .unwrap();
+ assert_eq!(LineAcceptance::AcceptedDone, response.line_accepted);
+ assert_eq!(1, response.highlighted.len());
+
+ let highlighted = response.highlighted[0].get().to_string();
+ assert_eq!(
+ format!(
+ "\
+ {BOLD}--- z.txt{NORMAL}\n\
+ {BOLD}+++ z.txt{NORMAL}\n"
+ ),
+ highlighted
+ );
+ }
+
+ #[test]
+ fn test_brighten_file_rename() {
+ let mut test_me = PlusMinusHeaderHighlighter::from_line("---
x.txt").unwrap();
+ let mut response = test_me
+ .consume_line("+++ y.txt", &ThreadPool::new(1))
+ .unwrap();
+ assert_eq!(LineAcceptance::AcceptedDone, response.line_accepted);
+ assert_eq!(1, response.highlighted.len());
+
+ let highlighted = response.highlighted[0].get().to_string();
+ assert_eq!(
+ format!(
+ "\
+ {BOLD}---
{INVERSE_VIDEO}{NORMAL_INTENSITY}{OLD}x{NOT_INVERSE_VIDEO}{BOLD}{DEFAULT_COLOR}.txt{NORMAL}\n\
+ {BOLD}+++
{INVERSE_VIDEO}{NORMAL_INTENSITY}{NEW}y{NOT_INVERSE_VIDEO}{BOLD}{DEFAULT_COLOR}.txt{NORMAL}\n"
+ ),
+ highlighted
+ );
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/src/refiner.rs
new/riff-3.2.1~0/src/refiner.rs
--- old/riff-3.2.0~0/src/refiner.rs 2024-05-20 08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/src/refiner.rs 2024-09-08 21:19:12.000000000 +0200
@@ -164,7 +164,7 @@
/// there were any highlights found in the old text. The second bool is true if
/// any highlights were removed for readability in the new text.
///
-/// `old_text` and `new_text` are multi lines strings. Having or not having
+/// `old_text` and `new_text` are multi line strings. Having or not having
/// trailing newlines will affect tokenization. The lines are not expected to
/// have any prefixes like `+` or `-`.
///
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/src/token_collector.rs
new/riff-3.2.1~0/src/token_collector.rs
--- old/riff-3.2.0~0/src/token_collector.rs 2024-05-20 08:21:54.000000000
+0200
+++ new/riff-3.2.1~0/src/token_collector.rs 2024-09-08 21:19:12.000000000
+0200
@@ -12,6 +12,9 @@
Lowlighted,
Context,
Plain,
+ /// Brightened up, but not a highlighted difference
+ Bright,
+ /// A difference to be highlighted
Highlighted,
Error,
}
@@ -136,11 +139,7 @@
weight: Weight::Bold,
color: Default,
},
- plain_style: AnsiStyle {
- inverse: false,
- weight: Weight::Bold,
- color: Default,
- },
+ plain_style: ANSI_STYLE_NORMAL,
highlighted_style: AnsiStyle {
inverse: true,
weight: Weight::Normal,
@@ -156,11 +155,7 @@
weight: Weight::Bold,
color: Default,
},
- plain_style: AnsiStyle {
- inverse: false,
- weight: Weight::Bold,
- color: Default,
- },
+ plain_style: ANSI_STYLE_NORMAL,
highlighted_style: AnsiStyle {
inverse: true,
weight: Weight::Normal,
@@ -211,6 +206,11 @@
weight: Weight::Faint,
color: Default,
},
+ Style::Bright => AnsiStyle {
+ inverse: false,
+ weight: Weight::Bold,
+ color: Default,
+ },
Style::Plain => line_style.plain_style,
Style::Highlighted => line_style.highlighted_style,
Style::Error => AnsiStyle {
@@ -531,6 +531,32 @@
}
}
+/// If we get "x/y/z.txt", make "z.txt" bright.
+///
+/// As an exception, if the file name is already highlighted, don't brighten
it.
+pub fn brighten_filename(row: &mut [StyledToken]) {
+ let mut last_slash_index = None;
+ for (i, token) in row.iter().enumerate() {
+ if token.token == "/" {
+ last_slash_index = Some(i);
+ }
+ }
+
+ let to_brighten: &mut [StyledToken];
+ if let Some(last_slash_index) = last_slash_index {
+ to_brighten = &mut row[last_slash_index + 1..];
+ } else {
+ to_brighten = row;
+ }
+
+ for token in to_brighten {
+ if token.style == Style::Highlighted {
+ continue;
+ }
+ token.style = Style::Bright;
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/riff-3.2.0~0/testdata/add-remove-trailing-newline.riff-output
new/riff-3.2.1~0/testdata/add-remove-trailing-newline.riff-output
--- old/riff-3.2.0~0/testdata/add-remove-trailing-newline.riff-output
2024-05-20 08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/add-remove-trailing-newline.riff-output
2024-09-08 21:19:12.000000000 +0200
@@ -1,5 +1,5 @@
-[1m--- /tmp/[7m[22m[31mbefore[27m[1m[39m.txt[22m[2m 2023-04-17
07:11:37.000000000 +0200[0m
-[1m+++ /tmp/[7m[22m[32mafter[27m[1m[39m.txt[22m[2m 2023-04-17
07:13:14.000000000 +0200[0m
+[1m--- [0m/tmp/[7m[31mbefore[27m[1m[39m.txt[22m[2m 2023-04-17
07:11:37.000000000 +0200[0m
+[1m+++ [0m/tmp/[7m[32mafter[27m[1m[39m.txt[22m[2m 2023-04-17
07:13:14.000000000 +0200[0m
[36m@@ -1,1 +1,3 @@[0m
Hello
[32m+[0m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/adds-only.riff-output
new/riff-3.2.1~0/testdata/adds-only.riff-output
--- old/riff-3.2.0~0/testdata/adds-only.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/adds-only.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,5 +1,5 @@
-[1m--- /tmp/[7m[22m[31ma[27m[1m[39m.txt [22m[2m 2023-08-06
16:07:37.000000000 +0200[0m
-[1m+++ /tmp/[7m[22m[32mb[27m[1m[39m.txt [22m[2m 2023-08-06
16:07:39.000000000 +0200[0m
+[1m--- [0m/tmp/[7m[31ma[27m[1m[39m.txt [22m[2m 2023-08-06
16:07:37.000000000 +0200[0m
+[1m+++ [0m/tmp/[7m[32mb[27m[1m[39m.txt [22m[2m 2023-08-06
16:07:39.000000000 +0200[0m
[36m@@ -1,2 +1,2 @@[0m
[2m[31m-Hello, my name is Johan[0m
[2m[32m+[0mHello, my [7m[32mfirst [0mname is Johan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/riff-3.2.0~0/testdata/conflict-with-context.riff-output
new/riff-3.2.1~0/testdata/conflict-with-context.riff-output
--- old/riff-3.2.0~0/testdata/conflict-with-context.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/conflict-with-context.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --cc m/search.go[0m
[2mindex 5b67346,e5b580f..0000000[0m
-[1m--- m/search.go[0m
-[1m+++ m/search.go[0m
+[1m--- [0mm/[1msearch.go[0m
+[1m+++ [0mm/[1msearch.go[0m
[36m@@@ -10,45 -6,9 +10,79 @@@ [1mimport [0m
"github.com/walles/moar/m/linenumbers"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/consecutive-words.riff-output
new/riff-3.2.1~0/testdata/consecutive-words.riff-output
--- old/riff-3.2.0~0/testdata/consecutive-words.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/consecutive-words.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -9,8 +9,8 @@
[2mdiff --git src/refiner.rs src/refiner.rs[0m
[2mindex d1ebdc1..40ae0df 100644[0m
-[1m--- src/refiner.rs[0m
-[1m+++ src/refiner.rs[0m
+[1m--- [0msrc/[1mrefiner.rs[0m
+[1m+++ [0msrc/[1mrefiner.rs[0m
[36m@@ -15,8 +15,8 @@ [1muse diffus::{[0m
/// it.
const MAX_HIGHLIGHT_PERCENTAGE: usize = 30;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/git-log-n3-p.riff-output
new/riff-3.2.1~0/testdata/git-log-n3-p.riff-output
--- old/riff-3.2.0~0/testdata/git-log-n3-p.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/git-log-n3-p.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -51,8 +51,8 @@
[2mdiff --git src/commit_line.rs src/commit_line.rs[0m
[2mindex 034b97e..7bcbf6b 100644[0m
-[1m--- src/commit_line.rs[0m
-[1m+++ src/commit_line.rs[0m
+[1m--- [0msrc/[1mcommit_line.rs[0m
+[1m+++ [0msrc/[1mcommit_line.rs[0m
[36m@@ -26,13 +26,14 @@ [1mpub fn format_commit_line(line: &str) -> String
{[0m
let comma = format!("{}, {}", YELLOW, NORMAL);
@@ -71,8 +71,8 @@
}
[2mdiff --git testdata/git-commit-line.riff-output
testdata/git-commit-line.riff-output[0m
[2mindex 0b42b6d..5edede3 100644[0m
-[1m--- testdata/git-commit-line.riff-output[0m
-[1m+++ testdata/git-commit-line.riff-output[0m
+[1m--- [0mtestdata/[1mgit-commit-line.riff-output[0m
+[1m+++ [0mtestdata/[1mgit-commit-line.riff-output[0m
[36m@@ -1,3 +1,3 @@[0m
[2m[31m-commit b24b967d952a8b7cf538d57d12aae8019cedada2 (HEAD -> master,
tag: 2.20.0, origin/master, origin/HEAD)[0m
[2m[32m+[0mcommit b24b967d952a8b7cf538d57d12aae8019cedada2 (HEAD -> master,
tag: 2.20.0, origin/master, origin/HEAD)
@@ -80,8 +80,8 @@
Date: Wed Sep 14 19:07:05 2022 +0200
[2mdiff --git testdata/remove-file.riff-output
testdata/remove-file.riff-output[0m
[2mindex 46f5a18..5a64fa1 100644[0m
-[1m--- testdata/remove-file.riff-output[0m
-[1m+++ testdata/remove-file.riff-output[0m
+[1m--- [0mtestdata/[1mremove-file.riff-output[0m
+[1m+++ [0mtestdata/[1mremove-file.riff-output[0m
[36m@@ -1,4 +1,4 @@[0m
[2m[31m-commit 90a1c38ad8b74134c24a4726f25958da4806738d (HEAD -> main)[0m
[2m[32m+[0mcommit 90a1c38ad8b74134c24a4726f25958da4806738d (HEAD -> main)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/riff-3.2.0~0/testdata/git-rebase-unmerged.riff-output
new/riff-3.2.1~0/testdata/git-rebase-unmerged.riff-output
--- old/riff-3.2.0~0/testdata/git-rebase-unmerged.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/git-rebase-unmerged.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --cc ansible/roles/zfsbootmenu/tasks/main.yaml[0m
[2mindex 73fa864,08648fa..0000000[0m
-[1m--- [22m[2ma/[22m[1mansible/roles/zfsbootmenu/tasks/main.yaml[0m
-[1m+++ [22m[2mb/[22m[1mansible/roles/zfsbootmenu/tasks/main.yaml[0m
+[1m--- [22m[2ma/[0mansible/roles/zfsbootmenu/tasks/[1mmain.yaml[0m
+[1m+++ [22m[2mb/[0mansible/roles/zfsbootmenu/tasks/[1mmain.yaml[0m
[36m@@@ -6,6 -6,60 +6,60 @@@[0m
- zfsbootmenu
state: present
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/indentation-l.riff-output
new/riff-3.2.1~0/testdata/indentation-l.riff-output
--- old/riff-3.2.0~0/testdata/indentation-l.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/indentation-l.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -6,8 +6,8 @@
[2mdiff --git a/bin/riff b/bin/riff[0m
[2mindex 17ded03..92a771a 100755[0m
-[1m--- [22m[2ma/[22m[1mbin/riff[0m
-[1m+++ [22m[2mb/[22m[1mbin/riff[0m
+[1m--- [22m[2ma/[0mbin/[1mriff[0m
+[1m+++ [22m[2mb/[0mbin/[1mriff[0m
[36m@@ -1,15 +1,23 @@[0m
#!/usr/bin/env ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/issue-15.riff-output
new/riff-3.2.1~0/testdata/issue-15.riff-output
--- old/riff-3.2.0~0/testdata/issue-15.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/issue-15.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --git tools/bump-buildfarm-to-latest.sh
tools/bump-buildfarm-to-latest.sh[0m
[2mindex 591347e..1e68cdf 100755[0m
-[1m--- tools/bump-buildfarm-to-latest.sh[0m
-[1m+++ tools/bump-buildfarm-to-latest.sh[0m
+[1m--- [0mtools/[1mbump-buildfarm-to-latest.sh[0m
+[1m+++ [0mtools/[1mbump-buildfarm-to-latest.sh[0m
[36m@@ -122,7 +122,7 @@ [1mEOM[0m
after_rebase() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/issue-37.riff-output
new/riff-3.2.1~0/testdata/issue-37.riff-output
--- old/riff-3.2.0~0/testdata/issue-37.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/issue-37.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,5 +1,5 @@
-[1m--- /tmp/hej/[7m[22m[31mbefore[27m[1m[39m.txt[22m[2m 2022-12-09
21:33:03.000000000 +0100[0m
-[1m+++ /tmp/hej/[7m[22m[32mafter[27m[1m[39m.txt[22m[2m 2022-12-09
21:33:07.000000000 +0100[0m
+[1m--- [0m/tmp/hej/[7m[31mbefore[27m[1m[39m.txt[22m[2m 2022-12-09
21:33:03.000000000 +0100[0m
+[1m+++ [0m/tmp/hej/[7m[32mafter[27m[1m[39m.txt[22m[2m 2022-12-09
21:33:07.000000000 +0100[0m
[36m@@ -1,6 +1,6 @@[0m
Minus to not-minus:
[31m----------------[0m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/riff-3.2.0~0/testdata/issue-with-incomplete-output.riff-output
new/riff-3.2.1~0/testdata/issue-with-incomplete-output.riff-output
--- old/riff-3.2.0~0/testdata/issue-with-incomplete-output.riff-output
2024-05-20 08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/issue-with-incomplete-output.riff-output
2024-09-08 21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --git src/plusminus_header_highlighter.rs
src/plusminus_header_highlighter.rs[0m
[2mindex 5bb5056..c354931 100644[0m
-[1m--- src/plusminus_header_highlighter.rs[0m
-[1m+++ src/plusminus_header_highlighter.rs[0m
+[1m--- [0msrc/[1mplusminus_header_highlighter.rs[0m
+[1m+++ [0msrc/[1mplusminus_header_highlighter.rs[0m
[36m@@ -6,7 +6,7 @@ [1muse crate::lines_highlighter::{LinesHighlighter,
Response};[0m
use crate::refiner::to_highlighted_tokens;
use crate::string_future::StringFuture;
@@ -61,8 +61,8 @@
[32m+}[0m
[2mdiff --git src/token_collector.rs src/token_collector.rs[0m
[2mindex b58c50f..e4d4152 100644[0m
-[1m--- src/token_collector.rs[0m
-[1m+++ src/token_collector.rs[0m
+[1m--- [0msrc/[1mtoken_collector.rs[0m
+[1m+++ [0msrc/[1mtoken_collector.rs[0m
[36m@@ -1,3 +1,5 @@[0m
[32m+use std::cmp;[0m
[32m+[0m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/moar-570d780b.riff-output
new/riff-3.2.1~0/testdata/moar-570d780b.riff-output
--- old/riff-3.2.0~0/testdata/moar-570d780b.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/moar-570d780b.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --git a/m/reader.go b/m/reader.go[0m
[2mindex 0cec7f2..7091f6a 100644[0m
-[1m--- [22m[2ma/[22m[1mm/reader.go[0m
-[1m+++ [22m[2mb/[22m[1mm/reader.go[0m
+[1m--- [22m[2ma/[0mm/[1mreader.go[0m
+[1m+++ [22m[2mb/[0mm/[1mreader.go[0m
[36m@@ -146,11 +146,19 @@ [1mfunc readStream(stream io.Reader, reader
*Reader, fromFilter *exec.Cmd) {[0m
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/riff-3.2.0~0/testdata/no-newline-in-context.riff-output
new/riff-3.2.1~0/testdata/no-newline-in-context.riff-output
--- old/riff-3.2.0~0/testdata/no-newline-in-context.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/no-newline-in-context.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,5 +1,5 @@
-[1m--- /tmp/dom/[7m[22m[31mapa[27m[1m[39m.txt[22m[2m 2024-02-04
08:36:46[0m
-[1m+++ /tmp/dom/[7m[22m[32mbepa[27m[1m[39m.txt[22m[2m 2024-02-04
08:37:13[0m
+[1m--- [0m/tmp/dom/[7m[31mapa[27m[1m[39m.txt[22m[2m 2024-02-04
08:36:46[0m
+[1m+++ [0m/tmp/dom/[7m[32mbepa[27m[1m[39m.txt[22m[2m 2024-02-04
08:37:13[0m
[36m@@ -1,2 +1,2 @@[0m
[31m-[7mChange this[27m line[0m
[32m+This line was changed[0m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/riff-3.2.0~0/testdata/partial-refine.riff-output
new/riff-3.2.1~0/testdata/partial-refine.riff-output
--- old/riff-3.2.0~0/testdata/partial-refine.riff-output 2024-05-20
08:21:54.000000000 +0200
+++ new/riff-3.2.1~0/testdata/partial-refine.riff-output 2024-09-08
21:19:12.000000000 +0200
@@ -1,7 +1,7 @@
[2mdiff --git a/src/main.rs b/src/main.rs[0m
[2mindex 55a7c18..8826249 100644[0m
-[1m--- [22m[2ma/[22m[1msrc/main.rs[0m
-[1m+++ [22m[2mb/[22m[1msrc/main.rs[0m
+[1m--- [22m[2ma/[0msrc/[1mmain.rs[0m
+[1m+++ [22m[2mb/[0msrc/[1mmain.rs[0m
[36m@@ -90,7 +91,15 @@ [1mfn get_fixed_highlight(line: &str) -> &str {[0m
}
++++++ vendor.tar.zst ++++++
/work/SRC/openSUSE:Factory/riff/vendor.tar.zst
/work/SRC/openSUSE:Factory/.riff.new.10096/vendor.tar.zst differ: char 7, line 1
