Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2022-12-24 14:52:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Sat Dec 24 14:52:16 2022 rev:24 rq:1045116 version:1.0.21 Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2022-02-27 22:44:21.746652570 +0100 +++ /work/SRC/openSUSE:Factory/.colordiff.new.1563/colordiff.changes 2022-12-24 14:55:08.732630728 +0100 @@ -1,0 +2,7 @@ +Fri Dec 23 20:46:49 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 1.0.21: + * Support for Windows C:\ProgramData instead of /etc, + * improved documentation for command-line options + +------------------------------------------------------------------- Old: ---- colordiff-1.0.20.tar.gz colordiff-1.0.20.tar.gz.sig New: ---- colordiff-1.0.21.tar.gz colordiff-1.0.21.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.oKBZXg/_old 2022-12-24 14:55:09.136633085 +0100 +++ /var/tmp/diff_new_pack.oKBZXg/_new 2022-12-24 14:55:09.144633131 +0100 @@ -17,13 +17,13 @@ Name: colordiff -Version: 1.0.20 +Version: 1.0.21 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0-or-later URL: https://www.colordiff.org -Source0: http://www.colordiff.org/%{name}-%{version}.tar.gz -Source1: http://www.colordiff.org/%{name}-%{version}.tar.gz.sig +Source0: https://www.colordiff.org/%{name}-%{version}.tar.gz +Source1: https://www.colordiff.org/%{name}-%{version}.tar.gz.sig Source2: https://www.sungate.co.uk/gpgkey_2013.txt#/%{name}.keyring BuildArch: noarch ++++++ colordiff-1.0.20.tar.gz -> colordiff-1.0.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/CHANGES new/colordiff-1.0.21/CHANGES --- old/colordiff-1.0.20/CHANGES 2022-02-12 17:02:06.000000000 +0100 +++ new/colordiff-1.0.21/CHANGES 2022-12-22 17:40:32.000000000 +0100 @@ -154,4 +154,9 @@ portability. Support for Windows configurations, thanks Rafael Kitover; and for Octopus git/merge thanks Kiyoshi Ohgishi. +Changes between 1.0.20 and 1.0.21 + +Support for Windows C:\ProgramData instead of /etc, improved documentation for +command-line options. + # vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/README new/colordiff-1.0.21/README --- old/colordiff-1.0.20/README 2015-05-21 11:19:12.000000000 +0200 +++ new/colordiff-1.0.21/README 2022-12-22 17:29:09.000000000 +0100 @@ -81,6 +81,36 @@ colordiff --fakeexitcode ... +Options + +colordiff will send most options through to diff, but there are various +colordiff-specific options which can be used: + +--help + + Show these colordiff-specific options + +--color=(yes|no) + + Force (or suppress) display of colours in output + +--color=patches=(yes|no) + + Force (or suppress) inclusion of colour codes in patch output + +--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 + Files /etc/colordiffrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/cdiff.1 new/colordiff-1.0.21/cdiff.1 --- old/colordiff-1.0.20/cdiff.1 2015-05-21 11:18:02.000000000 +0200 +++ new/colordiff-1.0.21/cdiff.1 2022-12-22 15:23:15.000000000 +0100 @@ -1,13 +1,13 @@ '\" t .\" Title: cdiff .\" Author: Ville Skytt\(:a -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/21/2015 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 12/22/2022 .\" Manual: User Commands .\" Source: cdiff .\" Language: English .\" -.TH "CDIFF" "1" "05/21/2015" "cdiff" "User Commands" +.TH "CDIFF" "1" "12/22/2022" "cdiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/colordiff.1 new/colordiff-1.0.21/colordiff.1 --- old/colordiff-1.0.20/colordiff.1 2015-05-21 11:18:01.000000000 +0200 +++ new/colordiff-1.0.21/colordiff.1 2022-12-22 15:23:15.000000000 +0100 @@ -1,13 +1,13 @@ '\" t .\" Title: colordiff .\" Author: Dave Ewart -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/21/2015 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 12/22/2022 .\" Manual: User Commands .\" Source: colordiff .\" Language: English .\" -.TH "COLORDIFF" "1" "05/21/2015" "colordiff" "User Commands" +.TH "COLORDIFF" "1" "12/22/2022" "colordiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -189,6 +189,39 @@ .RE .\} .sp +.SH "OPTIONS" +.PP +colordiff will send most options through to diff, but there are various colordiff\-specific options which can be used: +.PP +\-\-help +.RS 4 +Show these colordiff\-specific options +.RE +.PP +\-\-color=(yes|no) +.RS 4 +Force (or suppress) display of colours in output +.RE +.PP +\-\-color=patches=(yes|no) +.RS 4 +Force (or suppress) inclusion of colour codes in patch output +.RE +.PP +\-\-color\-term\-output\-only +.RS 4 +Force colour to only appear in terminal output +.RE +.PP +\-\-difftype=DIFFTYPE +.RS 4 +Force difftype detection to specified format\&. DIFFTYPE can be: diff, diffc, diffu, diffy, debdiff, wdiff +.RE +.PP +\-\-(no)banner +.RS 4 +Show (or suppress) the colordiff banner +.RE .SH "FILES" .PP /etc/colordiffrc @@ -210,7 +243,7 @@ .SH "BUGS" .PP Bug reports and suggestions/patches to -davee@sungate\&.co\&.uk +<davee@sungate\&.co\&.uk> please\&. .SH "AUTHORS" .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/colordiff.pl new/colordiff-1.0.21/colordiff.pl --- old/colordiff-1.0.20/colordiff.pl 2022-02-12 17:21:49.000000000 +0100 +++ new/colordiff-1.0.21/colordiff.pl 2022-12-22 15:21:35.000000000 +0100 @@ -26,7 +26,7 @@ use Getopt::Long qw(:config pass_through no_auto_abbrev); my $app_name = 'colordiff'; -my $version = '1.0.20'; +my $version = '1.0.21'; my $author = 'Dave Ewart'; my $author_email = 'da...@sungate.co.uk'; my $app_www = 'http://www.colordiff.org/'; @@ -75,7 +75,8 @@ # Locations for personal and system-wide colour configurations my $HOME = (grep { defined && length } @ENV{qw/HOME USERPROFILE/})[0] || ''; -my $etcdir = '/etc'; +my $etcdir = (grep { defined && length && -d } + '/etc', $ENV{ALLUSERSPROFILE})[0] || '/etc'; my ($setting, $value); my @config_files = ("$etcdir/colordiffrc"); my $USER_CONFIG_DIR = (grep { defined && length } @@ -179,6 +180,8 @@ my $specified_difftype; my $enable_fakeexitcode; my $color_term_output_only = "no"; +my $cmd_banner; +my $cmd_help; # Command-line options may over-ride config files GetOptions( @@ -189,9 +192,25 @@ "difftype=s" => \$specified_difftype, "color=s" => \$cmd_color_mode, "color-patches=s" => \$cmd_color_patch, - "color-term-output-only=s" => \$color_term_output_only + "color-term-output-only=s" => \$color_term_output_only, + "help" => \$cmd_help, + "banner!" => \$cmd_banner ); +if (defined $cmd_help) { + print "colordiff:\n"; + print " --help : Displays this help\n"; + print " --color=(yes|no) : Force (or suppress) display of colours in output\n"; + print " --color=patches=(yes|no) : Force (or suppress) inclusion of colour codes in patch output\n"; + print " --color-term-output-only : Force (or suppress) colour to only appear in terminal output\n"; + print " --difftype=DIFFTYPE : Force difftype detection to specified format\n"; + print " --(no)banner : Show (or suppress) the colordiff banner\n"; + print "\n"; + print " DIFFTYPE is usually auto-detected, but can be set to:\n"; + print " diff, diffc, diffu, diffy, debdiff or wdiff\n"; + exit(0); +} + $_ = $specified_difftype; if (defined $_ and not /^diff[cuy]?|(deb|w)diff$/) { print STDERR "Invalid --difftype value\n"; @@ -218,7 +237,9 @@ next; } if ($setting eq 'banner') { - if ($value eq 'no') { + if ($value eq 'yes') { + $show_banner = 1; + } elsif ($value eq 'no') { $show_banner = 0; } next; @@ -364,6 +385,16 @@ $colour{off} = ''; } +# If command-line option refers to banner, honour this ahead of config files +if (defined $cmd_banner) { + if ($cmd_banner) { + $show_banner = 1; + } + if (!$cmd_banner) { + $show_banner = 0; + } +} + # Disable output buffering. This allows "producer | colordiff | less" to output # earlier without having to wait for 'producer' to finish. select STDOUT; @@ -559,14 +590,14 @@ $inside_file_old = 1; } elsif (/^\*\*\* /) { - print "$file_old"; + print "$diff_file"; } elsif (/^--- [0-9]+,[0-9]+/) { print "$diff_file"; $inside_file_old = 0; } elsif (/^--- /) { - print "$file_new"; + print "$diff_file"; } elsif (/^!/) { if ($inside_file_old == 1) { @@ -584,11 +615,8 @@ } } elsif ($diff_type eq 'diffu') { - if (/^--- /) { - print "$file_old"; - } - elsif (/^\+\+\+ /) { - print "$file_new"; + if (/^(---|\+\+\+) /) { + print "$diff_file"; } elsif (/^([-\+ ]{$count_marks})/) { my $diff_marks = $1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.20/colordiff.xml new/colordiff-1.0.21/colordiff.xml --- old/colordiff-1.0.20/colordiff.xml 2015-05-21 11:17:57.000000000 +0200 +++ new/colordiff-1.0.21/colordiff.xml 2022-12-22 15:20:52.000000000 +0100 @@ -168,6 +168,36 @@ </refsect1> +<refsect1 id='options'><title>Options</title> + +<para>colordiff will send most options through to diff, but there are various +colordiff-specific options which can be used:</para> + +<variablelist> + <varlistentry> + <term><filename>--help</filename></term> + <listitem><para>Show these colordiff-specific + options</para></listitem></varlistentry> + <varlistentry> + <term><filename>--color=(yes|no)</filename></term> + <listitem><para>Force (or suppress) display of colours in output</para></listitem></varlistentry> + <varlistentry> + <term><filename>--color=patches=(yes|no)</filename></term> + <listitem><para>Force (or suppress) inclusion of colour codes in patch output</para></listitem></varlistentry> + <varlistentry> + <term><filename>--color-term-output-only</filename></term> + <listitem><para>Force colour to only appear in terminal output</para></listitem></varlistentry> + <varlistentry> + <term><filename>--difftype=DIFFTYPE</filename></term> + <listitem><para>Force difftype detection to specified format. DIFFTYPE can be: + diff, diffc, diffu, diffy, debdiff, wdiff</para></listitem></varlistentry> + <varlistentry> + <term><filename>--(no)banner</filename></term> + <listitem><para>Show (or suppress) the colordiff banner</para></listitem></varlistentry> +</variablelist> + +</refsect1> + <refsect1 id='files'><title>Files</title> <variablelist><varlistentry>
