cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 3.16 and 3.21

version 3.16, 2000/09/03 17:33:22

version 3.21, 2000/09/11 17:11:03

Line 53 use vars qw (

%CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES

%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted

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

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

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

@prcategories $prcategories

$prcgi @prcategories $prcategories $mancgi

$checkoutMagic $doCheckout $scriptname $scriptwhere

$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars

%funcline_regexp $is_mod_perl

Line 82 use vars qw (

sub printDiffSelect($);

sub findLastModifiedSubdirs(@);

sub htmlify($;$);

sub spacedHtmlText($);

sub spacedHtmlText($;$);

sub link($$);

sub revcmp($$);

sub fatal($$);

Line 347 foreach my $k (keys %ICONS) {

do "$config-$cvstree" if (-f "$config-$cvstree");

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

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

$fullname = $cvsroot . '/' . $where;

$mimetype = &getMimeTypeFromSuffix ($fullname);

Line 886 sub findLastModifiedSubdirs(@) {

Line 887 sub findLastModifiedSubdirs(@) {

}

sub htmlify($;$) {

my($string, $pr) = @_;

my($string, $extra) = @_;

# Special Characters; RFC 1866

$string =~ s/&/&/g;

Line 895 sub htmlify($;$) {

Line 896 sub htmlify($;$) {

$string =~ s/>/>/g;

# get URL's as link ..

$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g;

$string =~ s`(http|ftp|https)(://[-a-zA-Z0-9%.~:_/]+)([?&]([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*`<A HREF="$1$2$3">$1$2$3</A>`g; # `

# get e-mails as link

$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g;

$string =~ s`([-a-zA-Z0-9_.]+@([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})`<A HREF="mailto:$1">$1</A>`g; # `

# get #PR as link ..

if ($extra) {

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

# get PR #'s as link ..

1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1<A HREF="$prcgi$2">$2</A>`i;

if (defined($prcgi)) {

$string =~ s`\b${prcategories}/(\d+)\b`<A HREF="$prcgi$1">$&</A>`igo;

1 while $string =~ s`\b(pr[:#]?\s*(?:#?\d+[,\s]\s*)*#?)(\d+)\b`$1 . &link($2, sprintf($prcgi, $2))`ie; # `

$string =~ s`\b${prcategories}/(\d+)\b`&link($&, sprintf($prcgi, $1))`igeo; # `

}

# get manpage specs as link ..

if (defined($mancgi)) {

$string =~ s`\b([a-zA-Z]\w+)$([0-9n])$\B`&link($&, sprintf($mancgi, $2, $1))`ge; # `

}

return $string;

}

sub spacedHtmlText($) {

sub spacedHtmlText($;$) {

local $_ = $_[0];

my $ts = $_[1] || $tabstop;

# Cut trailing spaces

# Cut trailing spaces and tabs

s/\s+\n$//;

s/[ \t]+$//;

# Expand tabs

if (defined($tabstop)) {

s/\t+/' ' x (length($&) * $tabstop - length($`) % $tabstop)/e

# Expand tabs

if (defined($tabstop));

1 while s/\t+/' ' x (length($&) * $ts - length($`) % $ts)/e

}

# replace <tab> and <space> (\001 is to protect us from htmlify)

# gzip can make excellent use of this repeating pattern :-)

s/\001/\001%/g; #protect our & substitute

if ($hr_breakable) {

# make every other space 'breakable'

s/ / \001nbsp; \001nbsp; \001nbsp; \001nbsp;/g; # <tab>

s/ / \001nbsp;/g; # 2 * <space>

# leave single space as it is

}

} else {

else {

s/ /\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;\001nbsp;/g;

s/ /\001nbsp;/g;

}

$_ = htmlify($_);

# unescape

s/\001([^%])/&$1/g;

y/\001/&/;

s/\001%/\001/g;

return $_;

}

Line 1174 sub doAnnotate($$) {

Line 1179 sub doAnnotate($$) {

}

else {

$revprint = $lrev; $oldLusr = "";

$revprint =~ s`^(\S+)`<a href="${scriptwhere}${barequery}#rev$1">$1</A>`; # `

}

if ($lusr eq $oldLusr) {

$usrprint = " ";

Line 2119 EOF

Line 2125 EOF

if (defined($input{$_})

&& ($input{$_} ne $DEFAULTVALUE{$_} && $input{$_} ne ""));

}

print "Diffs between \n";

print "<TABLE><TR>\n";

print "<TD align=right>Diffs between \n";

print "<SELECT NAME=\"r1\">\n";

print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";

print $sel;

print "</SELECT>\n";

$diffrev = $revdisplayorder[$#revdisplayorder];

$diffrev = $input{"r1"} if (defined($input{"r1"}));

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'>\n";

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr1\" VALUE=\"$diffrev\" onChange='document.diff_select.r1.selectedIndex=0'></TD>";

print " and \n";

print "<TD><BR></TD></TR>\n";

print "<TR><TD align=right>and \n";

print "<SELECT NAME=\"r2\">\n";

print "<OPTION VALUE=\"text\" SELECTED>Use Text Field\n";

print $sel;

print "</SELECT>\n";

$diffrev = $revdisplayorder[0];

$diffrev = $input{"r2"} if (defined($input{"r2"}));

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'>\n";

print "<INPUT TYPE=\"TEXT\" SIZE=\"$inputTextSize\" NAME=\"tr2\" VALUE=\"$diffrev\" onChange='document.diff_select.r2.selectedIndex=0'></TD>";

print "<BR>Type of Diff should be a ";

print "<TD><INPUT TYPE=SUBMIT VALUE=\" Get Diffs \"></TD>\n";

printDiffSelect(0);

print "<INPUT TYPE=SUBMIT VALUE=\" Get Diffs \">\n";

print "</FORM>\n";

print "</TR></TABLE>\n";

print "<HR noshade>\n";

print "<TABLE>";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

print "<TR><TD align=right>Preferred Diff type:</TD>";

print "<TD>";

printDiffSelect($use_java_script);

print "</TD><TD></TD></TR>\n";

if (@branchnames) {

print "<TR><TD align=right>View only Branch:</TD>";

print "<TD>";

print "<A name=branch></A>\n";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

foreach (@stickyvars) {

next if ($_ eq "only_with_tag");

next if ($_ eq "logsort");

print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"

if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}

&& $input{$_} ne "");

}

print "View only Branch: \n";

print "<SELECT NAME=\"only_with_tag\"";

print " onchange=\"submit()\"" if ($use_java_script);

print ">\n";

Line 2164 EOF

Line 2170 EOF

&& $input{"only_with_tag"} eq $_);

print ">${_}\n";

}

print "</SELECT>\n";

print "</SELECT></TD><TD></TD></TR>\n";

print "<INPUT TYPE=SUBMIT VALUE=\" View Branch \">\n";

print "</FORM>\n";

}

print "<A name=logsort></A>\n";

print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";

foreach (@stickyvars) {

next if ($_ eq "f");

next if ($_ eq "only_with_tag");

next if ($_ eq "logsort");

print "<INPUT TYPE=HIDDEN NAME=\"$_\" VALUE=\"$input{$_}\">\n"

if (defined($input{$_}) && $input{$_} ne $DEFAULTVALUE{$_}

&& $input{$_} ne "");

}

print "Sort log by: \n";

print "<TR><TD align=right>";

print "<SELECT NAME=\"logsort\"";

print "<A name=logsort></A>\n";

print "Sort log by:</TD>";

print "<TD><SELECT NAME=\"logsort\"";

print " onchange=\"submit()\"" if ($use_java_script);

print ">\n";

print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";

print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";

print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";

print "</SELECT>\n";

print "</SELECT></TD>";

print "<INPUT TYPE=SUBMIT VALUE=\" Sort \">\n";

print "<TD><INPUT TYPE=SUBMIT VALUE=\" Set \"></TD>";

print "</FORM>\n";

print "</TR></TABLE>";

print &html_footer;

print "</BODY></HTML>\n";

}

CVSweb