version 4.1, 2019/11/08 21:08:26 |
version 4.2, 2019/11/09 09:10:05 |
|
|
@revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution |
@revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution |
$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi |
$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi |
$doCheckout $scriptname $scriptwhere |
$doCheckout $scriptname $scriptwhere |
$where $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp |
$where $Browser $nofilelinks $maycompress @stickyvars |
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased |
%input $query $barequery $sortby $bydate $byrev $byauthor |
%input $query $barequery $sortby $bydate $byrev $byauthor |
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot |
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot |
Line 237 $cvstreedefault = $logo = $defaulttitle = |
|
Line 237 $cvstreedefault = $logo = $defaulttitle = |
|
|
|
$allow_version_select = $allow_mailtos = $allow_log_extra = 1; |
$allow_version_select = $allow_mailtos = $allow_log_extra = 1; |
|
|
@DIFFTYPES = qw(h H u c s); |
@DIFFTYPES = qw(h H u c); |
@DIFFTYPES{@DIFFTYPES} = ( |
@DIFFTYPES{@DIFFTYPES} = ( |
{ |
{ |
'descr' => 'colored', |
'descr' => 'colored', |
Line 259 $allow_version_select = $allow_mailtos = $allow_log_ex |
|
Line 259 $allow_version_select = $allow_mailtos = $allow_log_ex |
|
'opts' => ['-c'], |
'opts' => ['-c'], |
'colored' => 0, |
'colored' => 0, |
}, |
}, |
{ |
|
'descr' => 'side by side', |
|
# width=168 should be enough to support 80 character line lengths |
|
'opts' => ['--side-by-side', '--width=168'], |
|
'colored' => 0, |
|
}, |
|
); |
); |
|
|
@LOGSORTKEYS = qw(cvs date rev); |
@LOGSORTKEYS = qw(cvs date rev); |
Line 555 foreach (@stickyvars) { |
|
Line 549 foreach (@stickyvars) { |
|
} |
} |
|
|
if ($allow_enscript) { |
if ($allow_enscript) { |
push(@DIFFTYPES, qw(uc cc sc)); |
push(@DIFFTYPES, qw(uc cc)); |
@DIFFTYPES{qw(uc cc sc)} = ( |
@DIFFTYPES{qw(uc cc)} = ( |
{ |
{ |
'descr' => 'unified, colored', |
'descr' => 'unified, colored', |
'opts' => ['-u'], |
'opts' => ['-u'], |
Line 567 if ($allow_enscript) { |
|
Line 561 if ($allow_enscript) { |
|
'opts' => ['-c'], |
'opts' => ['-c'], |
'colored' => 0, |
'colored' => 0, |
}, |
}, |
{ |
|
'descr' => 'side by side, colored', |
|
# width=168 should be enough to support 80 character line lengths |
|
'opts' => ['--side-by-side', '--width=168'], |
|
'colored' => 0, |
|
}, |
|
); |
); |
} else { |
} else { |
# No Enscript -> respect difftype, but don't offer colorization. |
# No Enscript -> respect difftype, but don't offer colorization. |
Line 2319 sub doDiff($$$$$$) |
|
Line 2307 sub doDiff($$$$$$) |
|
my @difftype = @{$difftype->{opts}}; |
my @difftype = @{$difftype->{opts}}; |
my $human_readable = $difftype->{colored}; |
my $human_readable = $difftype->{colored}; |
|
|
# Apply special diff options. -p and -F are not available with side by side |
# Apply special diff options. |
# diffs and may cause problems with older (< 2.8) versions of diffutils if |
push @difftype, '-p' if $showfunc; |
# used with --side-by-side. |
|
if ($showfunc && $f !~ /^s/) { |
|
push(@difftype, '-p'); |
|
while (my ($re1, $re2) = each %funcline_regexp) { |
|
if ($fullname =~ $re1) { |
|
push(@difftype, '-F', $re2); |
|
last; |
|
} |
|
} |
|
} |
|
|
|
if ($human_readable) { |
if ($human_readable) { |
push(@difftype, '-w') if $hr_ignwhite; |
push(@difftype, '-w') if $hr_ignwhite; |