Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2015-08-07 00:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2015-03-30 19:34:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2015-08-07 00:24:14.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 5 14:25:05 UTC 2015 - [email protected] + +- Update to 1.0.15 + * see attached CHANGES for details + +------------------------------------------------------------------- Old: ---- colordiff-1.0.13.tar.gz New: ---- colordiff-1.0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.zZQ1fz/_old 2015-08-07 00:24:15.000000000 +0200 +++ /var/tmp/diff_new_pack.zZQ1fz/_new 2015-08-07 00:24:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: colordiff -Version: 1.0.13 +Version: 1.0.15 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0+ ++++++ colordiff-1.0.13.tar.gz -> colordiff-1.0.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/CHANGES new/colordiff-1.0.15/CHANGES --- old/colordiff-1.0.13/CHANGES 2012-11-14 10:36:31.000000000 +0100 +++ new/colordiff-1.0.15/CHANGES 2015-06-23 22:36:28.000000000 +0200 @@ -117,5 +117,15 @@ Avoid accidentally identifying some diffs as side-by-side, handling colordiff arguments better. Plus code refactoring, corrections to docs. +Changes between version 1.0.13 and 1.0.14 + +Big improvements to side-by-side diff detection, thanks Peter Wu. Additional +colordiffrc example colour scheme file to match 'git diff'. Misc fixes thanks +to John Szakmeister, Matthew Wang. + +Changes between 1.0.14 and 1.0.15 + +Missed gitdiff file from tarball, bumping version number for clarity. + # vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/Makefile new/colordiff-1.0.15/Makefile --- old/colordiff-1.0.13/Makefile 2012-10-17 22:14:35.000000000 +0200 +++ new/colordiff-1.0.15/Makefile 2015-06-23 22:35:04.000000000 +0200 @@ -4,11 +4,11 @@ VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'") DIST_FILES=COPYING INSTALL Makefile README \ colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES colordiff.1 \ - colordiff.xml cdiff.xml cdiff.1 + colordiff.xml cdiff.xml cdiff.1 colordiffrc-gitdiff TMPDIR=colordiff-${VERSION} TARBALL=${TMPDIR}.tar.gz - +.PHONY: doc doc: colordiff.xml cdiff.xml xmlto -vv man colordiff.xml xmlto -vv man cdiff.xml @@ -19,6 +19,7 @@ perl -p -i -e 's#</body>#</div></body>#' colordiff.html perl -p -i -e 's#<div class=\"refentry\"#<div id=\"content\"><div class=\"refentry\"#' colordiff.html +.PHONY: install install: install -d ${DESTDIR}${INSTALL_DIR} sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \ @@ -39,6 +40,7 @@ -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc +.PHONY: uninstall uninstall: rm -f ${DESTDIR}${INSTALL_DIR}/colordiff rm -f ${DESTDIR}${ETC_DIR}/colordiffrc @@ -46,14 +48,17 @@ rm -f ${DESTDIR}${MAN_DIR}/colordiff.1 rm -f ${DESTDIR}${MAN_DIR}/cdiff.1 +.PHONY: dist dist: mkdir ${TMPDIR} cp -p ${DIST_FILES} ${TMPDIR} tar -zcvf ${TARBALL} ${TMPDIR} rm -fR ${TMPDIR} +.PHONY: gitclean gitclean: rm -f colordiff.1 colordiff.html cdiff.1 +.PHONY: clean clean: rm -f README colordiff.1 colordiff.html cdiff.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/README new/colordiff-1.0.15/README --- old/colordiff-1.0.13/README 2012-11-14 10:50:32.000000000 +0100 +++ new/colordiff-1.0.15/README 2015-05-21 11:19:12.000000000 +0200 @@ -39,6 +39,11 @@ $ 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: @@ -70,6 +75,12 @@ 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 ... + Files /etc/colordiffrc @@ -82,6 +93,12 @@ 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/cdiff.1 new/colordiff-1.0.15/cdiff.1 --- old/colordiff-1.0.13/cdiff.1 2012-11-14 10:50:31.000000000 +0100 +++ new/colordiff-1.0.15/cdiff.1 2015-05-21 11:18:02.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: cdiff .\" Author: Ville Skytt\(:a -.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 11/14/2012 +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 05/21/2015 .\" Manual: User Commands .\" Source: cdiff .\" Language: English .\" -.TH "CDIFF" "1" "11/14/2012" "cdiff" "User Commands" +.TH "CDIFF" "1" "05/21/2015" "cdiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/colordiff.1 new/colordiff-1.0.15/colordiff.1 --- old/colordiff-1.0.13/colordiff.1 2012-11-14 10:50:29.000000000 +0100 +++ new/colordiff-1.0.15/colordiff.1 2015-05-21 11:18:01.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: colordiff .\" Author: Dave Ewart -.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 11/14/2012 +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 05/21/2015 .\" Manual: User Commands .\" Source: colordiff .\" Language: English .\" -.TH "COLORDIFF" "1" "11/14/2012" "colordiff" "User Commands" +.TH "COLORDIFF" "1" "05/21/2015" "colordiff" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -86,6 +86,19 @@ .RE .\} .PP +If you want to force disable colour escape sequences (for example pipe the output to +\fBpatch\fR), you can use option \*(Aq\-\-color=no\*(Aq to do so: +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ diff \-u file1 file2 | colordiff \-\-color=no | patch \-p0 \-d another\-working\-dir +.fi +.if n \{\ +.RE +.\} +.PP If you have \fBwdiff\fR installed, colordiff will correctly colourise the added and removed text, provided that the \*(Aq\-n\*(Aq option is given to @@ -163,6 +176,19 @@ .\} .PP Note that the function name, cvsdiff, can be customized\&. +.PP +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\*(Aqs exit code to be zero: to do this use the option \*(Aq\-\-fakeexitcode\*(Aq: +.sp +.if n \{\ +.RS 4 +.\} +.nf +colordiff \-\-fakeexitcode \&.\&.\&. +.fi +.if n \{\ +.RE +.\} +.sp .SH "FILES" .PP /etc/colordiffrc @@ -176,6 +202,11 @@ .RS 4 Alternate configuration template for use with terminals having light backgrounds\&. Copy this to /etc/colordiffrc or ~/\&.colordiffrc and customize\&. .RE +.PP +colordiffrc\-gitdiff +.RS 4 +Alternate configuration template for use with terminals having dark backgrounds, with colour defaults set to match the output of \*(Aqgit diff\*(Aq\&. Copy this to /etc/colordiffrc or ~/\&.colordiffrc and customize\&. +.RE .SH "BUGS" .PP Bug reports and suggestions/patches to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/colordiff.pl new/colordiff-1.0.15/colordiff.pl --- old/colordiff-1.0.13/colordiff.pl 2012-11-14 10:36:38.000000000 +0100 +++ new/colordiff-1.0.15/colordiff.pl 2015-06-23 22:36:36.000000000 +0200 @@ -2,10 +2,10 @@ ######################################################################## # # -# ColorDiff - a wrapper/replacment for 'diff' producing # +# ColorDiff - a wrapper/replacement for 'diff' producing # # colourful output # # # -# Copyright (C)2002-2012 Dave Ewart ([email protected]) # +# Copyright (C)2002-2015 Dave Ewart ([email protected]) # # # ######################################################################## # # @@ -23,14 +23,13 @@ use strict; use Getopt::Long qw(:config pass_through no_auto_abbrev); -use IPC::Open2; my $app_name = 'colordiff'; -my $version = '1.0.13'; +my $version = '1.0.15'; my $author = 'Dave Ewart'; my $author_email = '[email protected]'; my $app_www = 'http://www.colordiff.org/'; -my $copyright = '(C)2002-2012'; +my $copyright = '(C)2002-2015'; my $show_banner = 1; my $color_patch = 0; my $diff_cmd = "diff"; @@ -92,7 +91,7 @@ $ddash = 1; next; } - if ($ddash) { + if ($ddash || $arg eq "-") { $nonopts++; next; } @@ -108,63 +107,65 @@ sub detect_diff_type { # Two parameters: - # $isref is reference to @inputstream + # $record is line in which a diff format has to be detected # $allow_diffy is flag indicating whether diffy is a # permitted diff type - my $isref = shift; + my $record = shift; my $allow_diffy = shift; - my @is = @$isref; # This may not be perfect - should identify most reasonably # formatted diffs and patches - foreach my $record (@is) { - # Unified diffs are the only flavour having '+++ ' or '--- ' - # at the start of a line - if ($record =~ /^(\+\+\+ |--- |@@ )/) { - return 'diffu'; - } - # Context diffs are the only flavour having '***' - # at the start of a line - elsif ($record =~ /^\*\*\*/) { - return 'diffc'; - } - # Plain diffs have NcN, NdN and NaN etc. - elsif ($record =~ /^[0-9,]+[acd][0-9,]+$/) { - return 'diff'; - } - # FIXME - This is not very specific, since the regex matches could - # easily match non-diff output. - # However, given that we have not yet matched any of the *other* diff - # types, this might be good enough - # - # Only pick diffy if our flag parameter indicates so - elsif ( ($allow_diffy == 1) && ($record =~ /(\s\|\s|\s<$|\s>\s)/) ) { - return 'diffy'; - } - # wdiff deleted/added patterns - # should almost always be pairwise? - elsif ($record =~ /\[-.*?-\]/s - || $record =~ /\{\+.*?\+\}/s) { - return 'wdiff'; - } - # FIXME - This is a bit risky, but if we haven't matched any other - # diff type by this stage, this line usually indicates we have - # debdiff output - elsif ($record =~ /^Control files: lines which differ/) { - return 'debdiff'; - } + # Unified diffs are the only flavour having '+++ ' or '--- ' + # at the start of a line + if ($record =~ /^(\+\+\+ |--- |@@ )/) { + return 'diffu'; + } + # Context diffs are the only flavour having '***' + # at the start of a line + elsif ($record =~ /^\*\*\*/) { + return 'diffc'; + } + # Plain diffs have NcN, NdN and NaN etc. + elsif ($record =~ /^[0-9,]+[acd][0-9,]+$/) { + return 'diff'; + } + # FIXME - This is not very specific, since the regex matches could + # easily match non-diff output. + # However, given that we have not yet matched any of the *other* diff + # types, this might be good enough + # + # Only pick diffy if our flag parameter indicates so + elsif ( ($allow_diffy == 1) && ($record =~ /(\s\|\s|\s<$|\s>\s)/) ) { + return 'diffy'; + } + # wdiff deleted/added patterns + # should almost always be pairwise? + elsif ($record =~ /\[-.*?-\]/s + || $record =~ /\{\+.*?\+\}/s) { + return 'wdiff'; + } + # FIXME - This is a bit risky, but if we haven't matched any other + # diff type by this stage, this line usually indicates we have + # debdiff output + elsif ($record =~ /^Control files: lines which differ/) { + return 'debdiff'; } - $diff_type = 'unknown'; + + return 'unknown'; } my $enable_verifymode; my $specified_difftype; +my $enable_fakeexitcode; +my $color_mode = "auto"; GetOptions( # --enable-verifymode option is for testing behaviour of colordiff # against standard test diffs "verifymode" => \$enable_verifymode, - "difftype=s" => \$specified_difftype + "fakeexitcode" => \$enable_fakeexitcode, + "difftype=s" => \$specified_difftype, + "color=s" => \$color_mode # TODO - check that specified type is valid, issue warning if not ); @@ -217,7 +218,7 @@ $colourval = "\033[0;3${value}m"; } elsif( $value < 15 ) { - $colourval = "\033[0;9${value}m"; + $colourval = "\033[0;9" . (${value} - 8) . "m"; } else { $colourval = "\033[0;38;5;${value}m"; @@ -253,7 +254,15 @@ } } -# If output is to a file, switch off colours, unless 'color_patch' is set +# --color=yes and --color=no will override the color_patches setting +if ($color_mode eq "yes") { + $color_patch = 1; +} elsif ($color_mode eq "no") { + $color_patch = 0; +} + +# If output is to a file, switch off colours, unless 'color_patch' is set, +# which might be due to --color=no being specified # Relates to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=378563 if ((-f STDOUT) && ($color_patch == 0)) { $plain_text = ''; @@ -265,6 +274,10 @@ $colour{off} = ''; } +# Disable output buffering. This allows "producer | colordiff | less" to output +# earlier without having to wait for 'producer' to finish. +select STDOUT; +$| = 1; # ---------------------------------------------------------------------------- @@ -283,32 +296,37 @@ my @inputstream; -my $exitcode = 0; +my $inputhandle; +my $pid; if ($operating_methodology == 1) { - # Run diff and then post-process the output - my $pid = open2(\*INPUTSTREAM, undef, "$diff_cmd", @ARGV); - @inputstream = <INPUTSTREAM>; - close INPUTSTREAM; - waitpid $pid, 0; - $exitcode=$? >> 8; -} -else { - # No need to call diff, just process standard input - @inputstream = <STDIN>; + # Feed stdin of colordiff with output from the diff program + $pid = open($inputhandle, "-|", "$diff_cmd", @ARGV); +} else { + $inputhandle = \*STDIN; } # Input stream has been read - need to examine it # to determine type of diff we have. +my $lastline; my $record; -my $longest_record = 0; if (defined $specified_difftype) { $diff_type = $specified_difftype; + # diffy needs at least one line to look at + if ($diff_type eq 'diffy' and ($_ = <$inputhandle>)) { + push @inputstream, $_; + } + $lastline = $_; } else { # Detect diff type, diffy is permitted - $diff_type = detect_diff_type(\@inputstream, 1); + while (<$inputhandle>) { + push @inputstream, $_; + $diff_type = detect_diff_type($_, 1); + last if $diff_type ne 'unknown'; + } + $lastline = $_; } my $inside_file_old = 1; @@ -319,37 +337,65 @@ # three columns where the first and third always consist of spaces and the # second consists only of spaces, '<', '>' and '|' # This is not a 100% certain match, but should be good enough - -my %separator_col = (); -my %candidate_col = (); my $diffy_sep_col = 0; my $mostlikely_sum = 0; if ($diff_type eq 'diffy') { # Not very elegant, but does the job - # Unfortunately requires parsing the input stream multiple times - foreach (@inputstream) { - $record = expand_tabs_to_spaces $_; - $longest_record = length ($record) if (length ($record) > $longest_record); - } - for (my $i = 0 ; $i <= $longest_record ; $i++) { - $separator_col{$i} = 1; - $candidate_col{$i} = 0; - } - foreach (@inputstream) { + my $longest_record = -1; + my %separator_col = (); + my %candidate_col = (); + my $possible_cols = 0; + my @checkbuffer; + + (@checkbuffer, @inputstream) = (@inputstream, @checkbuffer); + + while (@checkbuffer) { + $_ = shift @checkbuffer; + push @inputstream, $_; $_ = expand_tabs_to_spaces $_; + + if (length ($_) > $longest_record) { + my $i = $longest_record + 1; + + $longest_record = length ($_); + while ($i <= $longest_record) { + $separator_col{$i} = 1; + $candidate_col{$i} = 0; + $i++; + } + } + for (my $i = 0 ; $i < (length ($_) - 2) ; $i++) { - next if (!defined $separator_col{$i}); 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 =~ / [|<>]/) { $candidate_col{$i}++; + if ($candidate_col{$i} == 1) { + $possible_cols++; + } } } + + if ( !@checkbuffer ) { + if (! (defined $specified_difftype) and + $possible_cols == 0 && detect_diff_type($_, 0) ne 'unknown') { + $diff_type = detect_diff_type($_, 0); + last; + } + if (defined ($_ = <$inputhandle>)) { + push @checkbuffer, $_; + } + $lastline = $_; + } } for (my $i = 0 ; $i < $longest_record - 2 ; $i++) { @@ -366,12 +412,19 @@ # as a possible outcome if ($diffy_sep_col == 0) { # Detect diff type, diffy is NOT permitted - $diff_type = detect_diff_type(\@inputstream, 0); + foreach (@inputstream) { + $diff_type = detect_diff_type($_, 0); + last if $diff_type ne 'unknown'; + } } } # ------------------------------------------------------------------------------ -foreach (@inputstream) { +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"; + next; + } if ($diff_type eq 'diff') { if (/^</) { print "$file_old"; @@ -457,6 +510,7 @@ # Works with previously-identified column containing the diff-y # separator characters elsif ($diff_type eq 'diffy') { + $_ = expand_tabs_to_spaces $_; if (length ($_) > ($diffy_sep_col + 2)) { my $sepchars = substr ($_, $diffy_sep_col, 2); if ($sepchars eq ' <') { @@ -491,4 +545,14 @@ print "$_"; } -exit $exitcode; +my $exitcode = 0; +if ($operating_methodology == 1) { + waitpid $pid, 0; + $exitcode=$? >> 8; +} +if (defined $enable_fakeexitcode) { + exit 0; +} +else { + exit $exitcode; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/colordiff.xml new/colordiff-1.0.15/colordiff.xml --- old/colordiff-1.0.13/colordiff.xml 2012-10-17 22:14:35.000000000 +0200 +++ new/colordiff-1.0.15/colordiff.xml 2015-05-21 11:17:57.000000000 +0200 @@ -94,6 +94,16 @@ </para> +<para>If you want to force disable colour escape sequences (for example +pipe the output to <command>patch</command>), you can use option +'--color=no' to do so: + +<screen> +$ diff -u file1 file2 | colordiff --color=no | patch -p0 -d another-working-dir +</screen> + +</para> + <para>If you have <command>wdiff</command> installed, colordiff will correctly colourise the added and removed text, provided that the '-n' option is given to <command>wdiff</command>: @@ -145,6 +155,17 @@ <para>Note that the function name, cvsdiff, can be customized.</para> +<para>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': + +<screen> +colordiff --fakeexitcode ... +</screen> + +</para> + </refsect1> <refsect1 id='files'><title>Files</title> @@ -157,7 +178,11 @@ <varlistentry><term><filename>colordiffrc-lightbg</filename></term> <listitem><para>Alternate configuration template for use with terminals having light backgrounds. Copy this to /etc/colordiffrc or ~/.colordiffrc and - customize.</para></listitem> + customize.</para></listitem></varlistentry> + <varlistentry><term><filename>colordiffrc-gitdiff</filename></term> + <listitem><para>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.</para></listitem> </varlistentry></variablelist> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/colordiffrc new/colordiff-1.0.15/colordiffrc --- old/colordiff-1.0.13/colordiffrc 2012-10-17 22:14:35.000000000 +0200 +++ new/colordiff-1.0.15/colordiffrc 2014-03-08 20:19:09.000000000 +0100 @@ -23,7 +23,7 @@ # this, use the default output colour" # plain=off -newtext=blue -oldtext=red -diffstuff=magenta -cvsstuff=green +newtext=darkgreen +oldtext=darkred +diffstuff=darkcyan +cvsstuff=cyan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.13/colordiffrc-gitdiff new/colordiff-1.0.15/colordiffrc-gitdiff --- old/colordiff-1.0.13/colordiffrc-gitdiff 1970-01-01 01:00:00.000000000 +0100 +++ new/colordiff-1.0.15/colordiffrc-gitdiff 2015-05-21 11:13:01.000000000 +0200 @@ -0,0 +1,30 @@ +# Example colordiffrc file for dark backgrounds with colour +# defaults set to match 'git diff' +# +# Set banner=no to suppress authorship info at top of +# colordiff output +banner=no +# By default, when colordiff output is being redirected +# to a file, it detects this and does not colour-highlight +# To make the patch file *include* colours, change the option +# below to 'yes' +color_patches=no +# Sometimes it can be useful to specify which diff command to +# use: that can be specified here +diff_cmd=diff +# +# available colours are: white, yellow, green, blue, +# cyan, red, magenta, black, +# darkwhite, darkyellow, darkgreen, +# darkblue, darkcyan, darkred, +# darkmagenta, darkblack +# +# Can also specify 'none', 'normal' or 'off' which are all +# aliases for the same thing, namely "don't colour highlight +# this, use the default output colour" +# +plain=off +newtext=darkgreen +oldtext=darkred +diffstuff=darkcyan +cvsstuff=white ++++++ colordiff-fix-permission.diff ++++++ --- /var/tmp/diff_new_pack.zZQ1fz/_old 2015-08-07 00:24:15.000000000 +0200 +++ /var/tmp/diff_new_pack.zZQ1fz/_new 2015-08-07 00:24:15.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.orig +++ Makefile -@@ -35,9 +35,7 @@ install: +@@ -36,9 +36,7 @@ install: else \ install -d ${DESTDIR}${ETC_DIR}; \ fi @@ -11,5 +11,5 @@ - chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc + install -m 644 colordiffrc ${ETC_DIR}/colordiffrc + .PHONY: uninstall uninstall: - rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
