* cvsweb: merge patch-cvsweb_cgi rev.
@ 2019-03-21 15:53 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2019-03-21 15:53 UTC (permalink / raw)
To: source
Log Message:
-----------
merge patch-cvsweb_cgi rev. 1.10 from the OpenBSD port, tweaked by me
original commit message:
date: 2003/08/16 18:12:10; author: naddy;
excise functions that require GNU diff; prodding by jolan@
Tags:
----
FreeBSD-cvsweb-2_0-branch
Modified Files:
--------------
cvsweb:
cvsweb.cgi
cvsweb.conf
Revision Data
-------------
Index: cvsweb.conf
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v
retrieving revision 3.36.2.4
retrieving revision 3.36.2.5
diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r3.36.2.4 -r3.36.2.5
--- cvsweb.conf
+++ cvsweb.conf
@@ -290,13 +290,6 @@ $hr_breakable = 1;
# ( '-p' option to diff)
$showfunc = 1;
-# For each pair of regexps, files that match the first regexp will be diff'ed
-# with an '-F' option with the second regexp.
-%funcline_regexp = (
- "\\.(4th|fr)\$" => "\\(^\\|[ \t]\\): ",
- "\\.rb\$" => "^[\t ]*\\(class\\|module\\|def\\) ",
-);
-
# ignore whitespaces for human readable diffs
# (indendation and stuff ..)
# ( '-w' option to diff)
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.9
retrieving revision 3.119.2.10
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.9 -r3.119.2.10
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -68,7 +68,7 @@ use vars qw (
$checkoutMagic $doCheckout $scriptname $scriptwhere
$where $pathinfo $Browser $nofilelinks $maycompress
@stickyvars @unsafevars
- %funcline_regexp $is_mod_perl
+ $is_mod_perl
$is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
%input $query $barequery $sortby $bydate $byrev $byauthor
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
$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);
@@ -2020,16 +2015,7 @@ sub doDiff($$$$$$) {
# 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;
- }
- }
+ push @difftype, '-p';
}
if ($human_readable) {
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
* cvsweb: merge patch-cvsweb_cgi rev.
@ 2019-03-21 16:08 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2019-03-21 16:08 UTC (permalink / raw)
To: source
Log Message:
-----------
merge patch-cvsweb_cgi rev. 1.13 from the OpenBSD port
relevant part of the original commit message:
date: 2013/04/07 20:07:24; author: naddy;
More perl 5.16 fixes:
* [...]
* Fix a deprecation warning.
ok tobias@, sthen@
Tags:
----
FreeBSD-cvsweb-2_0-branch
Modified Files:
--------------
cvsweb:
cvsweb.cgi
Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.10
retrieving revision 3.119.2.11
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.10 -r3.119.2.11
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -2648,7 +2648,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 {
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-21 16:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-21 15:53 cvsweb: merge patch-cvsweb_cgi rev schwarze
2019-03-21 16:08 schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).