=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 4.17 retrieving revision 4.18 diff -u -p -r4.17 -r4.18 --- cvsweb/cvsweb.cgi 2019/11/11 13:28:36 4.17 +++ cvsweb/cvsweb.cgi 2019/11/11 14:37:54 4.18 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: cvsweb.cgi,v 4.17 2019/11/11 13:28:36 schwarze Exp $ +# $Id: cvsweb.cgi,v 4.18 2019/11/11 14:37:54 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 $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 @@ -158,8 +158,6 @@ sub openOutputFilter(); sub doAnnotate($$); sub doCheckout($$$); sub doEnscript($$$;$); -sub doGraph(); -sub doGraphView(); sub cvswebMarkup($$$$$$;$); sub viewable($); sub doDiff($$$$$$); @@ -180,7 +178,6 @@ sub download_url($$;$); sub download_link($$$;$); sub display_url($$;$); sub display_link($$;$$); -sub graph_link($;$); sub history_link($$;$); sub toggleQuery($;$); sub htmlquote($); @@ -213,8 +210,8 @@ $cvstreedefault = $logo = $defaulttitle = $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate = $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; @@ -373,8 +370,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)$/) @@ -1056,12 +1053,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 = ''; @@ -1285,16 +1281,6 @@ elsif (-f $fullname . ',v') { exit; } - if ($allow_cvsgraph && $input{graph}) { - if ($input{makeimage}) { - doGraph(); - } else { - doGraphView(); - } - gzipclose(); - exit; - } - &doLog($fullname); } @@ -2912,8 +2898,6 @@ sub printLog($$$;$$) $fileurl, $_, $barequery, $_)); } } - print ' - ', graph_link('', 'revision graph') - if (!$inlogview && $allow_cvsgraph); } print "
\n"; @@ -3046,89 +3030,6 @@ sub printLog($$$;$$) } -# -# Generates the HTML view for CvsGraph. -# -sub doGraphView() -{ - (my $pathname = $where) =~ s|[^/]*$||; - (my $filename = $where) =~ s|^.*/||; - - navigateHeader($scriptwhere, $pathname, $filename, undef, 'graph'); - - my $title = 'Revision graph of ' . htmlquote($pathname . $filename); - my $mapname = 'CvsGraphMap'; - - printf(<%s -
%s -EOF - - # Remove any pre-existing tag/branch names from branch links. - (my $notag_query = $barequery) =~ s/;+only_with_tag=.*?(?=;|$)//g; - - my @graph_cmd = - ($CMD{cvsgraph}, - '-r', $cvsroot, - '-m', $pathname, - '-i', - '-M', $mapname, - '-x', 'x', - "-Omap_branch_href=\"href=\\\"./?only_with_tag=%(%t%)$notag_query\\\"\"", - "-Omap_rev_href=\"href=\\\"?rev=%(%R%)$barequery\\\"\"", - "-Omap_diff_href=\"href=\\\"%(%F%).diff" . - "?r1=%(%P%);r2=%(%R%)$barequery\\\"\"", - ); - push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config; - push(@graph_cmd, $filename . ',v'); - - local *CVSGRAPH_OUT; - my ($h, $err) = - startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT); - fatal('500 Internal Error', $err) unless $h; - - # Browser compatibility kludge: many browsers do not support client side - # image maps where the element contains only the id attribute. Let's - # add the corresponding name attribute to it on the fly. - while () { - s/(/$1 name="$2">/; - print; - } - - $h->finish(); - print "
\n"; - - html_footer(); -} - - -# -# Generates a graph using CvsGraph. -# -sub doGraph() -{ - (my $pathname = $where) =~ s|[^/]*$||; - (my $filename = $where) =~ s|^.*/||; - - http_header('image/png'); - - my @graph_cmd = ($CMD{cvsgraph}, '-r', $cvsroot, '-m', $pathname); - push(@graph_cmd, '-c', $cvsgraph_config) if $cvsgraph_config; - push(@graph_cmd, $filename . ',v'); - - local *CVSGRAPH_OUT; - my ($h, $err) = - startproc(\@graph_cmd, \"", '>pipe', \*CVSGRAPH_OUT); - fatal('500 Internal Error', $err) unless $h; - { - local $/ = undef; - binmode(\*STDOUT); - print ; - } - $h->finish(); -} - - sub doLog($) { my ($fullname) = @_; @@ -3153,8 +3054,6 @@ sub doLog($) &clickablePath($upwhere, 1), "\n

\n"; print "

\n "; print &link('Request diff between arbitrary revisions', '#diff'); - print ' - ', &graph_link('', 'Display revisions graphically') - if $allow_cvsgraph; if ($cvshistory_url) { (my $d = $upwhere) =~ s|/+$||; print ' - ', history_link($d, $filename); @@ -3919,17 +3818,6 @@ sub display_link($$;$$) return sprintf('%s', display_url($url, $revision, $mtype) . $barequery, htmlquote($textlink)); -} - -# -# Expects the passed in URL to be URI escaped, and without a query string. -# The passed in link text should be already HTML escaped as appropriate. -# -sub graph_link($;$) -{ - my ($url, $text) = @_; - $text ||= $graphicon; - return sprintf('%s', $url, $barequery, $text); } #