Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2026-07-21 22:56:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new.24530 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Tue Jul 21 22:56:00 2026 rev:25 rq:1366692 version:1.0.22 Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2022-12-24 14:55:08.732630728 +0100 +++ /work/SRC/openSUSE:Factory/.colordiff.new.24530/colordiff.changes 2026-07-21 22:58:30.413840233 +0200 @@ -1,0 +2,12 @@ +Mon Jul 20 07:15:34 UTC 2026 - [email protected] + +- Remove the last line containing hyphens in the changelog, + which causes an error in source_validator (see sr#1366676) + +------------------------------------------------------------------- +Fri Jul 17 16:23:04 UTC 2026 - [email protected] + +- update to 1.0.22: + * Various improvements for side-by-side diffs and binary comparisons. + +------------------------------------------------------------------- @@ -104 +115,0 @@ -------------------------------------------------------------------- Old: ---- colordiff-1.0.21.tar.gz colordiff-1.0.21.tar.gz.sig New: ---- colordiff-1.0.22.tar.gz colordiff-1.0.22.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.nargcu/_old 2026-07-21 22:58:31.081862997 +0200 +++ /var/tmp/diff_new_pack.nargcu/_new 2026-07-21 22:58:31.085863133 +0200 @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # 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: colordiff -Version: 1.0.21 +Version: 1.0.22 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0-or-later @@ -46,6 +46,8 @@ %license COPYING %doc README CHANGES BUGS colordiffrc colordiffrc-lightbg colordiffrc-gitdiff %config(noreplace) %{_sysconfdir}/colordiffrc -%{_bindir}/* -%{_mandir}/man1/*.1%{?ext_man} +%{_bindir}/cdiff +%{_bindir}/colordiff +%{_mandir}/man1/cdiff.1%{?ext_man} +%{_mandir}/man1/colordiff.1%{?ext_man} ++++++ colordiff-1.0.21.tar.gz -> colordiff-1.0.22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.21/CHANGES new/colordiff-1.0.22/CHANGES --- old/colordiff-1.0.21/CHANGES 2022-12-22 17:40:32.000000000 +0100 +++ new/colordiff-1.0.22/CHANGES 2026-01-12 17:38:38.000000000 +0100 @@ -159,4 +159,8 @@ Support for Windows C:\ProgramData instead of /etc, improved documentation for command-line options. +Changes between 1.0.21 and 1.0.22 + +Various improvements for side-by-side diffs and binary comparisons. + # vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.21/README new/colordiff-1.0.22/README --- old/colordiff-1.0.21/README 2022-12-22 17:29:09.000000000 +0100 +++ new/colordiff-1.0.22/README 2026-01-12 17:52:06.000000000 +0100 @@ -1,135 +1,127 @@ Name -colordiff — a tool to colorize diff output + colordiff -- a tool to colorize diff output Synopsis -colordiff [diff options] [colordiff options] {file1} {file2} + colordiff [diff options] [colordiff options] {file1} {file2} Description -colordiff is a wrapper for diff and produces the same output as diff but with -coloured syntax highlighting at the command line to improve readability. The -output is similar to how a diff-generated patch might appear in Vim or Emacs -with the appropriate syntax highlighting options enabled. The colour schemes -can be read from a central configuration file or from a local user ~ -/.colordiffrc file. - -colordiff makes use of ANSI colours and as such will only work when ANSI -colours can be used - typical examples are xterms and Eterms, as well as -console sessions. + colordiff is a wrapper for diff and produces the same output as + diff but with coloured syntax highlighting at the command line + to improve readability. The output is similar to how a + diff-generated patch might appear in Vim or Emacs with the + appropriate syntax highlighting options enabled. The colour + schemes can be read from a central configuration file or from a + local user ~/.colordiffrc file. + + colordiff makes use of ANSI colours and as such will only work + when ANSI colours can be used - typical examples are xterms and + Eterms, as well as console sessions. -colordiff has been tested on various flavours of Linux and under OpenBSD, but -should be broadly portable to other systems. + colordiff has been tested on various flavours of Linux and + under OpenBSD, but should be broadly portable to other systems. Usage -Use colordiff wherever you would normally use diff, or instead pipe output to -colordiff: - -For example: + Use colordiff wherever you would normally use diff, or instead + pipe output to colordiff: + For example: $ colordiff file1 file2 $ diff -u file1 file2 | colordiff -You can pipe the output to 'less', using the '-R' option (some systems or -terminal types may get better results using '-r' instead), which keeps the -colour escape sequences, otherwise displayed incorrectly or discarded by -'less': - + You can pipe the output to 'less', using the '-R' option (some + systems or terminal types may get better results using '-r' + instead), which keeps the colour escape sequences, otherwise + displayed incorrectly or discarded by 'less': $ diff -u file1 file2 | colordiff | less -R -If you want to force disable colour escape sequences (for example pipe the -output to patch), you can use option '--color=no' to do so: - -$ diff -u file1 file2 | colordiff --color=no | patch -p0 -d another-working-dir - -If you have wdiff installed, colordiff will correctly colourise the added and -removed text, provided that the '-n' option is given to wdiff: - + If you want to force disable colour escape sequences (for + example pipe the output to patch), you can use option + '--color=no' to do so: +$ diff -u file1 file2 | colordiff --color=no | patch -p0 -d another-work +ing-dir + + If you have wdiff installed, colordiff will correctly colourise + the added and removed text, provided that the '-n' option is + given to wdiff: $ wdiff -n file1 file2 | colordiff -You may find it useful to make diff automatically call colordiff. Add the -following line to ~/.bashrc (or equivalent): - + You may find it useful to make diff automatically call + colordiff. Add the following line to ~/.bashrc (or equivalent): alias diff=colordiff -Any options passed to colordiff are passed through to diff except for the -colordiff-specific option 'difftype', e.g. - + Any options passed to colordiff are passed through to diff + except for the colordiff-specific option 'difftype', e.g. colordiff --difftype=debdiff file1 file2 -Valid values for 'difftype' are: diff, diffc, diffu, diffy, wdiff, debdiff; -these correspond to plain diffs, context diffs, unified diffs, side-by-side -diffs, wdiff output and debdiff output respectively. Use these overrides when -colordiff is not able to determine the diff-type automatically. - -Alternatively, a construct such as 'cvs diff SOMETHING | colordiff' can be -included in ~/.bashrc as follows: + Valid values for 'difftype' are: diff, diffc, diffu, diffy, + wdiff, debdiff; these correspond to plain diffs, context diffs, + unified diffs, side-by-side diffs, wdiff output and debdiff + output respectively. Use these overrides when colordiff is not + able to determine the diff-type automatically. + Alternatively, a construct such as 'cvs diff SOMETHING | + colordiff' can be included in ~/.bashrc as follows: function cvsdiff () { cvs diff $@ | colordiff; } -Or, combining the idea above using 'less': - + Or, combining the idea above using 'less': function cvsdiff () { cvs diff $@ | colordiff |less -R; } -Note that the function name, cvsdiff, can be customized. - -By default colordiff returns the exit code of the underlying diff invocation -(if there is one), but there are some circumstances where it is useful to force -colordiff's exit code to be zero: to do this use the option '--fakeexitcode': + Note that the function name, cvsdiff, can be customized. + By default colordiff returns the exit code of the underlying + diff invocation (if there is one), but there are some + circumstances where it is useful to force colordiff's exit code + to be zero: to do this use the option '--fakeexitcode': colordiff --fakeexitcode ... Options -colordiff will send most options through to diff, but there are various -colordiff-specific options which can be used: - ---help + colordiff will send most options through to diff, but there are + various colordiff-specific options which can be used: - Show these colordiff-specific options + --help + Show these colordiff-specific options ---color=(yes|no) + --color=(yes|no) + Force (or suppress) display of colours in output - Force (or suppress) display of colours in output + --color=patches=(yes|no) + Force (or suppress) inclusion of colour codes in patch + output ---color=patches=(yes|no) + --color-term-output-only + Force colour to only appear in terminal output - Force (or suppress) inclusion of colour codes in patch output + --difftype=DIFFTYPE + Force difftype detection to specified format. DIFFTYPE + can be: diff, diffc, diffu, diffy, debdiff, wdiff ---color-term-output-only - - Force colour to only appear in terminal output - ---difftype=DIFFTYPE - - Force difftype detection to specified format. DIFFTYPE can be: diff, diffc, - diffu, diffy, debdiff, wdiff - ---(no)banner - - Show (or suppress) the colordiff banner + --(no)banner + Show (or suppress) the colordiff banner Files -/etc/colordiffrc - - Central configuration file. User-specific settings can be enabled by - copying this file to ~/.colordiffrc and making the appropriate changes. - -colordiffrc-lightbg - - Alternate configuration template for use with terminals having light - backgrounds. Copy this to /etc/colordiffrc or ~/.colordiffrc and customize. - -colordiffrc-gitdiff - - Alternate configuration template for use with terminals having dark - backgrounds, with colour defaults set to match the output of 'git diff'. - Copy this to /etc/colordiffrc or ~/.colordiffrc and customize. + /etc/colordiffrc + Central configuration file. User-specific settings can + be enabled by copying this file to ~/.colordiffrc and + making the appropriate changes. + + colordiffrc-lightbg + Alternate configuration template for use with terminals + having light backgrounds. Copy this to /etc/colordiffrc + or ~/.colordiffrc and customize. + + colordiffrc-gitdiff + Alternate configuration template for use with terminals + having dark backgrounds, with colour defaults set to + match the output of 'git diff'. Copy this to + /etc/colordiffrc or ~/.colordiffrc and customize. Bugs -Bug reports and suggestions/patches to <[email protected]> please. - + Bug reports and suggestions/patches to <[email protected]> + please. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.21/cdiff.1 new/colordiff-1.0.22/cdiff.1 --- old/colordiff-1.0.21/cdiff.1 2022-12-22 15:23:15.000000000 +0100 +++ new/colordiff-1.0.22/cdiff.1 2026-01-12 17:50:32.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: cdiff .\" Author: Ville Skytt\(:a .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 12/22/2022 +.\" Date: 01/12/2026 .\" Manual: User Commands .\" Source: cdiff .\" Language: English .\" -.TH "CDIFF" "1" "12/22/2022" "cdiff" "User Commands" +.TH "CDIFF" "1" "01/12/2026" "cdiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.21/colordiff.1 new/colordiff-1.0.22/colordiff.1 --- old/colordiff-1.0.21/colordiff.1 2022-12-22 15:23:15.000000000 +0100 +++ new/colordiff-1.0.22/colordiff.1 2026-01-12 17:50:22.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: colordiff .\" Author: Dave Ewart .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 12/22/2022 +.\" Date: 01/12/2026 .\" Manual: User Commands .\" Source: colordiff .\" Language: English .\" -.TH "COLORDIFF" "1" "12/22/2022" "colordiff" "User Commands" +.TH "COLORDIFF" "1" "01/12/2026" "colordiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.21/colordiff.pl new/colordiff-1.0.22/colordiff.pl --- old/colordiff-1.0.21/colordiff.pl 2022-12-22 15:21:35.000000000 +0100 +++ new/colordiff-1.0.22/colordiff.pl 2026-01-12 17:33:02.000000000 +0100 @@ -26,11 +26,11 @@ use Getopt::Long qw(:config pass_through no_auto_abbrev); my $app_name = 'colordiff'; -my $version = '1.0.21'; +my $version = '1.0.22'; my $author = 'Dave Ewart'; my $author_email = '[email protected]'; my $app_www = 'http://www.colordiff.org/'; -my $copyright = '(C)2002-2022'; +my $copyright = '(C)2002-2026'; my $show_banner = 1; my $diff_cmd = "diff"; @@ -497,13 +497,13 @@ next if ($separator_col{$i} == 0); next if ($_ =~ /^(Index: |={4,}|RCS file: |retrieving |diff )/); my $subsub = substr ($_, $i, 2); - if ($subsub !~ / [ (|<>]/) { + if ($subsub !~ / [ (|<>\\\/]/) { $separator_col{$i} = 0; if ($candidate_col{$i} > 0) { $possible_cols--; } } - if ($subsub =~ / [|<>]/) { + if ($subsub =~ / [|<>\\\/]/) { $candidate_col{$i}++; if ($candidate_col{$i} == 1) { $possible_cols++; @@ -548,8 +548,8 @@ my $count_marks = 1; while (defined( $_ = @inputstream ? shift @inputstream : ($lastline and <$inputhandle>) )) { - if (/^Binary files (.*) and (.*) differ$/) { - print "Binary files $file_old$1$plain_text and $file_new$2$plain_text differ\n"; + if (($diffy_sep_col == 0) && (/^Binary files (.*) and (.*) differ$/)) { + print "Binary files $file_old$1$plain_text and $file_new$2$plain_text differ$colour{off}\n"; next; } if ($diff_type eq 'diff') { @@ -650,7 +650,7 @@ if ($sepchars eq ' <') { print "$file_old"; } - elsif ($sepchars eq ' |') { + elsif ($sepchars eq ' |' || $sepchars eq ' /' || $sepchars eq ' \\') { print "$diff_stuff"; } elsif ($sepchars eq ' >') {
