cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 4.16 and 4.20

version 4.16, 2019/11/11 13:15:09

version 4.20, 2019/11/11 15:46:39

Line 62 use vars qw (

%alltags %fileinfo %tags @branchnames %nameprinted

%symrev %revsym @allrevisions %date %author @revdisplayorder

@revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution

$prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi

$mancgi $doCheckout $scriptname $scriptwhere

$doCheckout $scriptname $scriptwhere

$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

$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

Line 83 use vars qw (

Line 82 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;

Line 120 BEGIN

Line 118 BEGIN

$HTML_META = <<EOM;

EOM

Line 136 EOM

Line 133 EOM

# -----------------------------------------------------------------------------

sub printDiffSelect($);

sub printDiffSelect();

sub printDiffSelectStickyVars();

sub getDiffLinks($$$);

sub printLogSortSelect($);

sub printLogSortSelect();

sub findLastModifiedSubdirs(@);

sub htmlify_sub(&$);

sub htmlify($;$);

Line 151 sub config_error($$);

Line 148 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($$$$$$);

Line 181 sub download_url($$;$);

Line 174 sub download_url($$;$);

sub download_link($$$;$);

sub display_url($$;$);

sub display_link($$;$$);

sub graph_link($;$);

sub history_link($$;$);

sub toggleQuery($;$);

sub htmlquote($);

Line 212 $cvstreedefault = $logo = $defaulttitle =

Line 204 $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 =

$tabstop = $use_moddate = $gzip_open = $DEBUG =

$cvsgraph_config = $cvshistory_url = $allow_tar = undef;

$cvshistory_url = $allow_tar = undef;

$allow_version_select = $allow_mailtos = $allow_log_extra = 1;

Line 374 if (defined($ENV{QUERY_STRING})) {

Line 366 if (defined($ENV{QUERY_STRING})) {

undef %input;

my $t;

for my $p (qw(graph hideattic hidecvsroot hidenonreadable ignorecase ln copt

for my $p (qw(hideattic hidecvsroot hidenonreadable ignorecase ln copt

makeimage options tarball)) {

options tarball)) {

$t = $query{$p};

if (defined($t)) {

($input{$p}) = ($t =~ /^([01]|on)$/)

Line 538 foreach (@stickyvars) {

Line 530 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);

Line 631 if (-f $config_cvstree) {

Line 602 if (-f $config_cvstree) {

}

undef $config_cvstree;

$re_prcategories = '(?:' . join ('|', @prcategories) . ')' if @prcategories;

$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword);

$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;

$fullname = catfile($cvsroot, $where);

my $rewrite = 0;

Line 1057 EOF

Line 1024 EOF

$filesfound++;

printf "<tr class=\"%s\">\n", ($dirrow % 2) ? 'even' : 'odd';

printf '<td class="file"%s>', $allow_cvsgraph ? '' : ' colspan="2"';

printf '<td class="file" colspan="2">';

my $icon = $isbinary ? $binfileicon : $fileicon;

print $nofilelinks ? $icon : &link($icon, $url);

print ' ', &link(htmlquote($file), $url), $attic;

print '</td><td class="graph">', graph_link($fileurl) if $allow_cvsgraph;

print "</td>\n<td width=\"30\">", display_link($fileurl, $rev);

my $ageclass = 'age';

my $age = '';

Line 1127 EOF

Line 1093 EOF

|| $input{$var} ne $DEFAULTVALUE{$var})

&& $var ne 'only_with_tag');

}

printf(<<EOF, ($use_java_script ? ' onchange="this.form.submit()"' : ''));

print <<EOF;

<label for="only_with_tag" accesskey="T">Show only files with tag:

<option value="">All tags / default branch</option>

EOF

foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {

Line 1228 EOF

Line 1194 EOF

</td>

EOF

printLogSortSelect(0);

printLogSortSelect();

print <<EOF;

</td>

Line 1247 EOF

Line 1213 EOF

</td>

<td>

EOF

printDiffSelect(0);

printDiffSelect();

print <<EOF;

</td>

Line 1286 elsif (-f $fullname . ',v') {

Line 1252 elsif (-f $fullname . ',v') {

exit;

}

if ($allow_cvsgraph && $input{graph}) {

if ($input{makeimage}) {

doGraph();

} else {

doGraphView();

}

gzipclose();

exit;

}

&doLog($fullname);

}

Line 1371 gzipclose();

Line 1327 gzipclose();

## End MAIN

sub printDiffSelect($)

sub printDiffSelect()

{

my ($use_java_script) = @_;

print '<select id="f" name="f"';

print ' onchange="this.form.submit()"' if $use_java_script;

print ">\n";

for my $difftype (@DIFFTYPES) {

Line 1400 sub printDiffSelectStickyVars()

Line 1353 sub printDiffSelectStickyVars()

}

sub printLogSortSelect($)

sub printLogSortSelect()

{

my ($use_java_script) = @_;

print '<select id="logsort" name="logsort"';

print ' onchange="this.form.submit()"' if $use_java_script;

print ">\n";

for my $sortkey (@LOGSORTKEYS) {

Line 1499 sub htmlify($;$)

Line 1449 sub htmlify($;$)

}

if ($extra) {

# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"

if (defined($prcgi) && defined($re_prkeyword)) {

my $prev;

do {

$prev = $_;

$_ = htmlify_sub {

(\b$re_prkeyword[:\#]?\s*

(?:

\#?

\d+[,\s]\s*

\#?)

(\d+)\b

}{

$1 . &link($2, sprintf($prcgi, $2))

}egix;

} $_;

} while ($_ ne $prev);

if (defined($re_prcategories)) {

$_ = htmlify_sub {

(\b$re_prcategories/(\d+)\b)

}{

&link($1, sprintf($prcgi, $2))

}egox;

} $_;

}

# get manpage specs as link: "foo.1" "foo(1)"

if (defined($mancgi)) {

$_ = htmlify_sub {

Line 1709 sub search_path($)

Line 1626 sub search_path($)

# Gets the enscript(1) highlight mode corresponding to the given filename,

# or undef if unsupported.

sub getEnscriptHL($)

{

return undef unless $allow_enscript;

my ($filename) = @_;

while (my ($hl, $regex) = each %enscript_types) {

return $hl if ($filename =~ $regex);

}

return undef;

}

# Gets the MIME type for the given file name.

sub getMimeType($;$)

Line 2151 EOF

Line 2053 EOF

printf '<embed src="%s" width="100%%" height="100%%" /><br />',

$url . $barequery;

} else {

print "<pre>\n";

my $linenumbers = $input{ln} || 0;

if (my $enscript_hl = getEnscriptHL($filename)) {

doEnscript($filehandle, $enscript_hl, $linenumbers);

} else {

my $ln = 0;

my @buf = ();

my $ts = undef;

Line 2178 EOF

Line 2074 EOF

}

print $preformat_in_markup ? spacedHtmlText($_, $ts) : htmlquote($_);

}

print "</pre>\n";

}

html_footer();

Line 2322 sub doDiff($$$$$$)

Line 2216 sub doDiff($$$$$$)

html_footer();

gzipclose();

exit;

} elsif ($f =~ /^([ucs])c$/) {

# Enscript colored diff.

my $hl = 'diff';

$hl .= $1 if ($1 eq 'u' || $1 eq 's');

(my $where_nd = $where) =~ s/\.diff$//;

(my $pathname = $where_nd) =~ s|((?<=/)Attic/)?[^/]*$||;

(my $filename = $where_nd) =~ s|^.*/||;

(my $swhere = $scriptwhere) =~ s|\.diff$||;

navigateHeader($swhere, $pathname, $filename, $rev2, 'diff');

printf(<<EOF, $where_nd, $rev1, $rev2);

<h3 style="text-align: center">Diff for /%s between versions %s and %s</h3>

<pre>

EOF

doEnscript(\$fh, $hl, 0, 'cvsweb_diff');

print <<EOF;

</pre>

EOF

printDiffSelectStickyVars();

print 'Diff format: ';

printDiffSelect($use_java_script);

print "<input type=\"submit\" value=\"Show\" />\n</form>\n";

html_footer();

gzipclose();

exit;

} else {

# Plain diff.

Line 2919 sub printLog($$$;$$)

Line 2783 sub printLog($$$;$$)

$fileurl, $_, $barequery, $_));

}

print ' - ', graph_link('', 'revision graph')

if (!$inlogview && $allow_cvsgraph);

}

print "<br />\n";

Line 3053 sub printLog($$$;$$)

Line 2915 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(<<EOF, $title, $mapname, $cvstree, $title);

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 <map> element contains only the id attribute. Let's

# add the corresponding name attribute to it on the fly.

while (<CVSGRAPH_OUT>) {

s/(<map\s+id="([^"]+)")\s*>/$1 name="$2">/;

print;

}

$h->finish();

print "</div>\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 <CVSGRAPH_OUT>;

}

$h->finish();

}

sub doLog($)

{

my ($fullname) = @_;

Line 3160 sub doLog($)

Line 2939 sub doLog($)

&clickablePath($upwhere, 1), "</b>\n</p>\n";

print "<p>\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);

Line 3264 EOF

Line 3041 EOF

</td>

EOF

printDiffSelect($use_java_script);

printDiffSelect();

print <<EOF;

</td>

Line 3273 EOF

Line 3050 EOF

if (@branchnames) {

printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');

print <<EOF;

<tr>

<label for="only_with_tag" accesskey="B">View only branch:</label>

</td>

EOF

my @tmp = ();

Line 3313 EOF

Line 3090 EOF

</td>

<td>

EOF

printLogSortSelect($use_java_script);

printLogSortSelect();

print <<EOF;

</td>

Line 3539 EOF

Line 3316 EOF

<label for="f">Diff format:<br />

EOF

printDiffSelectStickyVars();

printDiffSelect($use_java_script);

printDiffSelect();

printf(<<EOF, $rev1, $rev2);

</label>

Line 3561 EOF

Line 3338 EOF

}

sub doEnscript($$$;$)

{

my ($filehandle, $highlight, $linenumbers, $lang) = @_;

$lang ||= 'cvsweb';

my @cmd = ($CMD{enscript},

@enscript_options,

'-q', "--language=$lang", '-o', '-', "--highlight=$highlight");

local *ENSCRIPT_OUT;

my ($h, $err) =

startproc(\@cmd, $filehandle, '>pipe', \*ENSCRIPT_OUT);

fatal('500 Internal Error', $err) unless $h;

# We could short-circuit and have enscript output directly to STDOUT above,

# but that doesn't work with mod_perl (at least some 1.99 versions).

if ($linenumbers) {

my $ln = 0;

while (<ENSCRIPT_OUT>) {

printf '<a id="l%d" class="src">%5d: </a>', (++$ln) x 2;

print $_;

}

} else {

local $/ = undef;

print <ENSCRIPT_OUT>;

}

$h->finish();

}

# The passed in $path and $filename should not be URI escaped, and $swhere

# *should* be.

Line 3749 sub chooseCVSRoot()

Line 3496 sub chooseCVSRoot()

if ($input{$k} && $k ne 'cvsroot');

}

printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');

print <<EOF;

<label for="cvsroot" accesskey="C">CVS Root:

EOF

foreach my $k (@CVSROOT) {

Line 3926 sub display_link($$;$$)

Line 3673 sub display_link($$;$$)

return sprintf('<a href="%s" class="display-link">%s</a>',

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('<a href="%s?graph=1%s">%s</a>', $url, $barequery, $text);

}

CVSweb