264af6cd73
* Add further modules to README so that "annotate" will work. * Fix a deprecation warning. ok tobias@, sthen@
70 lines
1.8 KiB
Plaintext
70 lines
1.8 KiB
Plaintext
$OpenBSD: patch-cvsweb_cgi,v 1.13 2013/04/07 20:07:24 naddy Exp $
|
|
--- cvsweb.cgi.orig Thu Sep 26 22:56:05 2002
|
|
+++ cvsweb.cgi Sun Apr 7 14:15:55 2013
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/perl -wT
|
|
+#!/usr/bin/perl -w
|
|
#
|
|
# cvsweb - a CGI interface to CVS trees.
|
|
#
|
|
@@ -157,7 +157,7 @@ use File::Basename ();
|
|
|
|
# == EDIT this ==
|
|
# Locations to search for user configuration, in order:
|
|
-for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
|
|
+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
|
|
if (defined($_) && -r $_) {
|
|
$config = $_;
|
|
last;
|
|
@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
|
|
$LOG_FILESEPARATOR = q/^={77}$/;
|
|
$LOG_REVSEPARATOR = q/^-{28}$/;
|
|
|
|
-@DIFFTYPES = qw(h H u c s);
|
|
+@DIFFTYPES = qw(h H u c);
|
|
@DIFFTYPES{@DIFFTYPES} = (
|
|
{
|
|
'descr' => 'colored',
|
|
@@ -215,11 +215,6 @@ $LOG_REVSEPARATOR = q/^-{28}$/;
|
|
'opts' => ['-c'],
|
|
'colored' => 0,
|
|
},
|
|
- {
|
|
- 'descr' => 'side by side',
|
|
- 'opts' => ['--side-by-side', '--width=164'],
|
|
- 'colored' => 0,
|
|
- },
|
|
);
|
|
|
|
@LOGSORTKEYS = qw(cvs date rev);
|
|
@@ -2014,20 +2009,6 @@ sub doDiff($$$$$$) {
|
|
my @difftype = @{$difftype->{'opts'}};
|
|
my $human_readable = $difftype->{'colored'};
|
|
|
|
- # apply special options
|
|
- if ($showfunc) {
|
|
- push @difftype, '-p' if $f ne 's';
|
|
-
|
|
- my ($re1, $re2);
|
|
-
|
|
- while (($re1, $re2) = each %funcline_regexp) {
|
|
- if ($fullname =~ /$re1/) {
|
|
- push @difftype, '-F', $re2;
|
|
- last;
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
if ($human_readable) {
|
|
if ($hr_ignwhite) {
|
|
push @difftype, '-w';
|
|
@@ -2658,7 +2639,7 @@ sub printLog($;$) {
|
|
if (/^1\.1\.1\.\d+$/) {
|
|
print " <i>(vendor branch)</i>";
|
|
}
|
|
- if (defined @mytz) {
|
|
+ if (@mytz) {
|
|
my ($est) = $mytz[(localtime($date{$_}))[8]];
|
|
print ", <i>", scalar localtime($date{$_}), " $est</i> (";
|
|
} else {
|