===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.15
retrieving revision 4.19
diff -u -p -r4.15 -r4.19
--- cvsweb/cvsweb.cgi 2019/11/11 12:55:38 4.15
+++ cvsweb/cvsweb.cgi 2019/11/11 14:56:27 4.19
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.15 2019/11/11 12:55:38 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.19 2019/11/11 14:56:27 schwarze Exp $
# $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
#
# cvsweb - a CGI interface to CVS trees.
@@ -69,13 +69,13 @@ use vars qw (
%input $query $barequery $sortby $bydate $byrev $byauthor
$bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
$charset $output_filter
- @command_path %CMD $allow_compress $backicon $diricon $fileicon $graphicon
+ @command_path %CMD $allow_compress $backicon $diricon $fileicon
$fullname $cvstreedefault $logo $defaulttitle $address $binfileicon
$long_intro $short_instruction $shortLogLen $show_author
$tablepadding $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst
$inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos
$allow_log_extra $allow_dir_extra $allow_source_extra
- $allow_cvsgraph $cvsgraph_config $use_java_script $edit_option_form
+ $edit_option_form
$show_subdir_lastmod $show_log_in_markup $preformat_in_markup
$tabstop $state $annTable $sel @ForbiddenFiles
$use_descriptions %descriptions @mytz $dwhere
@@ -83,7 +83,6 @@ use vars qw (
$allow_tar @tar_options @gzip_options @zip_options @cvs_options
@annotate_options @rcsdiff_options
$HTML_DOCTYPE $HTML_META $cssurl $CSS $cvshistory_url
- $allow_enscript @enscript_options %enscript_types
);
require Compress::Zlib;
@@ -119,8 +118,7 @@ BEGIN
$HTML_META = <
-
-
+
EOM
@@ -136,10 +134,10 @@ EOM
# -----------------------------------------------------------------------------
-sub printDiffSelect($);
+sub printDiffSelect();
sub printDiffSelectStickyVars();
sub getDiffLinks($$$);
-sub printLogSortSelect($);
+sub printLogSortSelect();
sub findLastModifiedSubdirs(@);
sub htmlify_sub(&$);
sub htmlify($;$);
@@ -151,16 +149,12 @@ sub config_error($$);
sub redirect($;$);
sub safeglob($);
sub search_path($);
-sub getEnscriptHL($);
sub getMimeType($;$);
sub head($;$);
sub scan_directives(@);
sub openOutputFilter();
sub doAnnotate($$);
sub doCheckout($$$);
-sub doEnscript($$$;$);
-sub doGraph();
-sub doGraphView();
sub cvswebMarkup($$$$$$;$);
sub viewable($);
sub doDiff($$$$$$);
@@ -181,7 +175,6 @@ sub download_url($$;$);
sub download_link($$$;$);
sub display_url($$;$);
sub display_link($$;$$);
-sub graph_link($;$);
sub history_link($$;$);
sub toggleQuery($;$);
sub htmlquote($);
@@ -212,10 +205,10 @@ $cvstreedefault = $logo = $defaulttitle =
$address = $long_intro = $short_instruction = $shortLogLen = $show_author =
$tablepadding = $hr_breakable = $showfunc = $hr_ignwhite =
$hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate =
- $allow_markup = $allow_compress = $use_java_script = $edit_option_form =
+ $allow_markup = $allow_compress = $edit_option_form =
$show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup =
- $tabstop = $use_moddate = $gzip_open = $DEBUG = $allow_cvsgraph =
- $cvsgraph_config = $cvshistory_url = $allow_tar = undef;
+ $tabstop = $use_moddate = $gzip_open = $DEBUG =
+ $cvshistory_url = $allow_tar = undef;
$allow_version_select = $allow_mailtos = $allow_log_extra = 1;
@@ -374,8 +367,8 @@ if (defined($ENV{QUERY_STRING})) {
undef %input;
my $t;
-for my $p (qw(graph hideattic hidecvsroot hidenonreadable ignorecase ln copt
- makeimage options tarball)) {
+for my $p (qw(hideattic hidecvsroot hidenonreadable ignorecase ln copt
+ options tarball)) {
$t = $query{$p};
if (defined($t)) {
($input{$p}) = ($t =~ /^([01]|on)$/)
@@ -538,27 +531,6 @@ foreach (@stickyvars) {
}
}
-if ($allow_enscript) {
- push(@DIFFTYPES, qw(uc cc));
- @DIFFTYPES{qw(uc cc)} = (
- {
- 'descr' => 'unified, colored',
- 'opts' => ['-u'],
- 'colored' => 0,
- },
- {
- 'descr' => 'context, colored',
- 'opts' => ['-c'],
- 'colored' => 0,
- },
- );
-} else {
- # No Enscript -> respect difftype, but don't offer colorization.
- if ($input{f} && $input{f} =~ /^([ucs])c$/) {
- $input{f} = $1;
- }
-}
-
# is there any query ?
if (@barequery) {
$barequery = join (';', @barequery);
@@ -1057,12 +1029,11 @@ EOF
$filesfound++;
printf "
\n", ($dirrow % 2) ? 'even' : 'odd';
- printf '', $allow_cvsgraph ? '' : ' colspan="2"';
+ printf ' | ';
my $icon = $isbinary ? $binfileicon : $fileicon;
print $nofilelinks ? $icon : &link($icon, $url);
print ' ', &link(htmlquote($file), $url), $attic;
- print ' | ', graph_link($fileurl) if $allow_cvsgraph;
print " | \n", display_link($fileurl, $rev);
my $ageclass = 'age';
my $age = '';
@@ -1127,10 +1098,10 @@ EOF
|| $input{$var} ne $DEFAULTVALUE{$var})
&& $var ne 'only_with_tag');
}
- printf(<
|
EOF
- printLogSortSelect(0);
+ printLogSortSelect();
print <
@@ -1247,7 +1218,7 @@ EOF
|
EOF
- printDiffSelect(0);
+ printDiffSelect();
print <
@@ -1286,16 +1257,6 @@ elsif (-f $fullname . ',v') {
exit;
}
- if ($allow_cvsgraph && $input{graph}) {
- if ($input{makeimage}) {
- doGraph();
- } else {
- doGraphView();
- }
- gzipclose();
- exit;
- }
-
&doLog($fullname);
}
@@ -1371,12 +1332,9 @@ gzipclose();
## End MAIN
-sub printDiffSelect($)
+sub printDiffSelect()
{
- my ($use_java_script) = @_;
-
print ' |
EOF
- printDiffSelect($use_java_script);
+ printDiffSelect();
print <
|
@@ -3273,14 +3088,14 @@ EOF
if (@branchnames) {
- printf(<
|
-
+
EOF
my @tmp = ();
@@ -3313,7 +3128,7 @@ EOF
|
EOF
- printLogSortSelect($use_java_script);
+ printLogSortSelect();
print <
|
@@ -3539,7 +3354,7 @@ EOF
| | | |