From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: merge rev.
Date: Sat, 9 Nov 2019 04:10:36 -0500 (EST) [thread overview]
Message-ID: <8d0767cdb5296624@mandoc.bsd.lv> (raw)
Log Message:
-----------
merge rev. 3.119.2.10:
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@
Modified Files:
--------------
cvsweb:
cvsweb.cgi
Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 4.1
retrieving revision 4.2
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.1 -r4.2
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -65,7 +65,7 @@ use vars qw (
@revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution
$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
$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
%input $query $barequery $sortby $bydate $byrev $byauthor
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
@@ -237,7 +237,7 @@ $cvstreedefault = $logo = $defaulttitle
$allow_version_select = $allow_mailtos = $allow_log_extra = 1;
-@DIFFTYPES = qw(h H u c s);
+@DIFFTYPES = qw(h H u c);
@DIFFTYPES{@DIFFTYPES} = (
{
'descr' => 'colored',
@@ -259,12 +259,6 @@ $allow_version_select = $allow_mailtos =
'opts' => ['-c'],
'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);
@@ -555,8 +549,8 @@ foreach (@stickyvars) {
}
if ($allow_enscript) {
- push(@DIFFTYPES, qw(uc cc sc));
- @DIFFTYPES{qw(uc cc sc)} = (
+ push(@DIFFTYPES, qw(uc cc));
+ @DIFFTYPES{qw(uc cc)} = (
{
'descr' => 'unified, colored',
'opts' => ['-u'],
@@ -567,12 +561,6 @@ if ($allow_enscript) {
'opts' => ['-c'],
'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 {
# No Enscript -> respect difftype, but don't offer colorization.
@@ -2319,18 +2307,8 @@ sub doDiff($$$$$$)
my @difftype = @{$difftype->{opts}};
my $human_readable = $difftype->{colored};
- # Apply special diff options. -p and -F are not available with side by side
- # diffs and may cause problems with older (< 2.8) versions of diffutils if
- # 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;
- }
- }
- }
+ # Apply special diff options.
+ push @difftype, '-p' if $showfunc;
if ($human_readable) {
push(@difftype, '-w') if $hr_ignwhite;
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
next reply other threads:[~2019-11-09 9:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 9:10 schwarze [this message]
2019-11-09 9:12 schwarze
2019-11-09 9:19 schwarze
2019-11-09 9:24 schwarze
2019-11-09 9:27 schwarze
2019-11-10 16:00 schwarze
2019-11-12 9:28 schwarze
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d0767cdb5296624@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).