===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.14
retrieving revision 4.18
diff -u -p -r4.14 -r4.18
--- cvsweb/cvsweb.cgi	2019/11/11 12:46:23	4.14
+++ cvsweb/cvsweb.cgi	2019/11/11 14:37:54	4.18
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: cvsweb.cgi,v 4.14 2019/11/11 12:46:23 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 $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
@@ -103,8 +103,6 @@ use constant CVSWEBMARKUP => qr{^text/(x-cvsweb|vnd\.v
 use constant LOG_FILESEPR => qr/^={77}$/o;
 use constant LOG_REVSEPR  => qr/^-{28}$/o;
 
-use constant HAS_EDIFF    => eval { require String::Ediff;  };
-
 # -----------------------------------------------------------------------------
 
 # All global initialization that can be done in compile time should go to
@@ -121,8 +119,7 @@ BEGIN
 
   $HTML_META = <<EOM;
 <meta name="robots" content="nofollow" />
-<meta name="generator" content="FreeBSD-CVSweb $VERSION" />
-<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta name="generator" content="CVSweb $VERSION" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 EOM
 
@@ -138,10 +135,10 @@ EOM
 
 # -----------------------------------------------------------------------------
 
-sub printDiffSelect($);
+sub printDiffSelect();
 sub printDiffSelectStickyVars();
 sub getDiffLinks($$$);
-sub printLogSortSelect($);
+sub printLogSortSelect();
 sub findLastModifiedSubdirs(@);
 sub htmlify_sub(&$);
 sub htmlify($;$);
@@ -161,8 +158,6 @@ sub openOutputFilter();
 sub doAnnotate($$);
 sub doCheckout($$$);
 sub doEnscript($$$;$);
-sub doGraph();
-sub doGraphView();
 sub cvswebMarkup($$$$$$;$);
 sub viewable($);
 sub doDiff($$$$$$);
@@ -183,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($);
@@ -214,10 +208,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;
 
@@ -376,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)$/)
@@ -1059,12 +1053,11 @@ 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 '&nbsp;', &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      = '';
@@ -1129,10 +1122,10 @@ EOF
                 || $input{$var} ne $DEFAULTVALUE{$var})
             && $var ne 'only_with_tag');
     }
-    printf(<<EOF, ($use_java_script ? ' onchange="this.form.submit()"' : ''));
+    print <<EOF;
 <span class="nowrap">
 <label for="only_with_tag" accesskey="T">Show only files with tag:
-<select id="only_with_tag" name="only_with_tag"%s>
+<select id="only_with_tag" name="only_with_tag">
 <option value="">All tags / default branch</option>
 EOF
     foreach my $tag (reverse sort { lc $a cmp lc $b } keys %tags) {
@@ -1230,7 +1223,7 @@ EOF
 </td>
 <td class="opt-value">
 EOF
-    printLogSortSelect(0);
+    printLogSortSelect();
     print <<EOF;
 </td>
 <td class="opt-label">
@@ -1249,7 +1242,7 @@ EOF
 </td>
 <td>
 EOF
-    printDiffSelect(0);
+    printDiffSelect();
     print <<EOF;
 </td>
 <td colspan="2" class="opt-label">
@@ -1288,16 +1281,6 @@ elsif (-f $fullname . ',v') {
     exit;
   }
 
-  if ($allow_cvsgraph && $input{graph}) {
-    if ($input{makeimage}) {
-      doGraph();
-    } else {
-      doGraphView();
-    }
-    gzipclose();
-    exit;
-  }
-
   &doLog($fullname);
 }
 
@@ -1373,12 +1356,9 @@ 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) {
@@ -1402,12 +1382,9 @@ 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) {
@@ -2348,7 +2325,7 @@ EOF
 EOF
     printDiffSelectStickyVars();
     print 'Diff format: ';
-    printDiffSelect($use_java_script);
+    printDiffSelect();
     print "<input type=\"submit\" value=\"Show\" />\n</form>\n";
     html_footer();
     gzipclose();
@@ -2921,8 +2898,6 @@ sub printLog($$$;$$)
                             $fileurl, $_, $barequery, $_));
       }
     }
-    print ' - ', graph_link('', 'revision graph')
-      if (!$inlogview && $allow_cvsgraph);
   }
   print "<br />\n";
 
@@ -3055,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(<<EOF, $title, $mapname, $cvstree, $title);
-<h3 style="text-align: center">%s</h3>
-<div style="text-align: center"><img border="0" usemap="#%s" src="?cvsroot=%s;graph=1;makeimage=1" alt="%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 <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) = @_;
@@ -3162,8 +3054,6 @@ 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);
@@ -3266,7 +3156,7 @@ EOF
 </td>
 <td class="opt-value">
 EOF
-  printDiffSelect($use_java_script);
+  printDiffSelect();
   print <<EOF;
 </td>
 <td></td>
@@ -3275,14 +3165,14 @@ EOF
 
   if (@branchnames) {
 
-    printf(<<EOF, $use_java_script ? ' onchange="this.form.submit()"' : '');
+    print <<EOF;
 <tr>
 <td class="opt-label">
 <label for="only_with_tag" accesskey="B">View only branch:</label>
 </td>
 <td class="opt-value">
 <a name="branch">
-<select id="only_with_tag" name="only_with_tag"%s>
+<select id="only_with_tag" name="only_with_tag">
 EOF
 
     my @tmp = ();
@@ -3315,7 +3205,7 @@ EOF
 </td>
 <td>
 EOF
-  printLogSortSelect($use_java_script);
+  printLogSortSelect();
   print <<EOF;
 </td>
 <td><input type="submit" value="Set" accesskey="S" /></td>
@@ -3353,214 +3243,6 @@ EOF
     }
   } elsif ($state eq "PreChange") {     # state eq "PreChange"
                                         # we got removes with subsequent adds
-    if (HAS_EDIFF) {
-      # construct the suffix tree
-      my $left_diff = join("\n", @$leftColRef[0..$leftRow-1]);
-      my $right_diff = join("\n", @$rightColRef[0..$rightRow-1]);
-      my $diff_str = String::Ediff::ediff($left_diff, $right_diff);
-
-      my @diff_str = split(/ /, $diff_str);
-      my $INFINITY = 10000000;
-      push(@diff_str, ($INFINITY) x 8);
-      my ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-        (0, @diff_str[0..7]);
-      my ($l_cul, $r_cul) = (0, 0);
-      my ($ldx, $rdx) = (0, 0);
-      my (@left_html, @right_html);
-      for (my $j = 0; $j < $leftRow; $j++) {
-        my $line_len = length(@$leftColRef[$j]);
-        my $line = @$leftColRef[$j];
-        $l_cul += length($line) + 1; # includes "\n"
-        my $l_culx = $l_cul - 1; # not includes "\n"
-        if ($j < $lb1) {
-          $line = spacedHtmlText($line);
-          push(@left_html, "<td class=\"diff diff-changed\">$line</td>");
-        } elsif ($lb1 == $j) {
-          my $html_line;
-          while ($lb1 == $j) {
-            my $begin_char = $l_culx - $b1;
-
-            $line =~ /^(.*)(.{$begin_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-unchanged">';
-            $line = $2;
-            last if ($j != $le1);
-
-            my $end_char = $l_culx - $e1;
-            $line =~ /^(.*)(.{$end_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-changed">';
-            $line = $2;
-
-            $idx++;
-            my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
-              ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
-            ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-              @diff_str[$idx*8..($idx+1)*8-1];
-            $lb1 = $INFINITY if ($lb1 < 0);
-            $lb2 = $INFINITY if ($lb2 < 0);
-            $le1 = $INFINITY if ($le1 < 0);
-            $le2 = $INFINITY if ($le2 < 0);
-            if ($te1 > $b1) {
-              ($b1, $lb1) = ($te1, $tle1);
-            }
-            if ($te2 > $b2) {
-              ($b2, $lb2) = ($te2, $tle2);
-            }
-          }
-          push(@left_html,
-               sprintf('<td><span class="diff diff-changed">%s%s</span></td>',
-                       $html_line, spacedHtmlText($line)));
-        } elsif ($le1 == $j) {
-          my $html_line;
-          while ($le1 == $j) {
-            my $end_char = $l_culx - $e1;
-            $line =~ /^(.*)(.{$end_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-changed">';
-            $line = $2;
-
-            $idx++;
-            my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
-              ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
-            ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-              @diff_str[$idx*8..($idx+1)*8-1];
-            $lb1 = $INFINITY if ($lb1 < 0);
-            $lb2 = $INFINITY if ($lb2 < 0);
-            $le1 = $INFINITY if ($le1 < 0);
-            $le2 = $INFINITY if ($le2 < 0);
-            if ($te1 > $b1) {
-              ($b1, $lb1) = ($te1, $tle1);
-            }
-            if ($te2 > $b2) {
-              ($b2, $lb2) = ($te2, $tle2);
-            }
-
-            last if ($lb1 != $j);
-
-            my $begin_char = $l_culx - $b1;
-
-            $line =~ /^(.*)(.{$begin_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-unchanged">';
-            $line = $2;
-          }
-          push(@left_html,
-              sprintf('<td><span class="diff diff-unchanged">%s%s</span></td>',
-                      $html_line, spacedHtmlText($line)));
-        } else {
-          $line = spacedHtmlText($line);
-          push(@left_html, "<td class=\"diff diff-unchanged\">$line</td>");
-        }
-      }
-      ($idx, $b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-        (0, @diff_str[0..7]);
-      $lb1 = $INFINITY if ($lb1 < 0);
-      $lb2 = $INFINITY if ($lb2 < 0);
-      $le1 = $INFINITY if ($le1 < 0);
-      $le2 = $INFINITY if ($le2 < 0);
-      for (my $j = 0; $j < $rightRow; $j++) {
-        my $line_len = length(@$rightColRef[$j]);
-        my $line = @$rightColRef[$j];
-        $r_cul += length($line) + 1; # includes "\n"
-        my $r_culx = $r_cul - 1; # not includes "\n"
-        if ($j < $lb2) {
-          $line = spacedHtmlText($line);
-          push(@right_html, "<td class=\"diff diff-changed\">$line</td>");
-        } elsif ($lb2 == $j) {
-          my $html_line;
-          while ($lb2 == $j) {
-            my $begin_char = $r_culx - $b2;
-
-            $line =~ /^(.*)(.{$begin_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-unchanged">';
-            $line = $2;
-
-            last if ($j != $le2);
-
-            my $end_char = $r_culx - $e2;
-            $line =~ /^(.*)(.{$end_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-changed">';
-            $line = $2;
-
-            $idx++;
-            my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
-              ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
-            ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-              @diff_str[$idx*8..($idx+1)*8-1];
-            $lb1 = $INFINITY if ($lb1 < 0);
-            $lb2 = $INFINITY if ($lb2 < 0);
-            $le1 = $INFINITY if ($le1 < 0);
-            $le2 = $INFINITY if ($le2 < 0);
-            if ($te1 > $b1) {
-              ($b1, $lb1) = ($te1, $tle1);
-            }
-            if ($te2 > $b2) {
-              ($b2, $lb2) = ($te2, $tle2);
-            }
-          }
-          push(@right_html,
-               sprintf('<td><span class="diff diff-changed">%s%s</span></td>',
-                       $html_line, spacedHtmlText($line)));
-        } elsif ($le2 == $j) {
-          my $html_line;
-          while ($le2 == $j) {
-            my $end_char = $r_culx - $e2;
-            $line =~ /^(.*)(.{$end_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-changed">';
-            $line = $2;
-
-            $idx++;
-            my ($tb1, $te1, $tlb1, $tle1, $tb2, $te2, $tlb2, $tle2) =
-              ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2);
-            ($b1, $e1, $lb1, $le1, $b2, $e2, $lb2, $le2) =
-              @diff_str[$idx*8..($idx+1)*8-1];
-            $lb1 = $INFINITY if ($lb1 < 0);
-            $lb2 = $INFINITY if ($lb2 < 0);
-            $le1 = $INFINITY if ($le1 < 0);
-            $le2 = $INFINITY if ($le2 < 0);
-            if ($te1 > $b1) {
-              ($b1, $lb1) = ($te1, $tle1);
-            }
-            if ($te2 > $b2) {
-              ($b2, $lb2) = ($te2, $tle2);
-            }
-
-            last if ($lb2 != $j);
-
-            my $begin_char = $r_culx - $b2;
-            $line =~ /^(.*)(.{$begin_char})$/;
-            $html_line .= spacedHtmlText($1) .
-              '</span><span class="diff diff-unchanged">';
-            $line = $2;
-          }
-          push(@right_html,
-               sprintf('<td nowrap="nowrap"><span class="diff diff-unchanged"'.
-                       '>%s%s</span></td>',
-                       $html_line, spacedHtmlText($line)));
-        } else {
-          $line = spacedHtmlText ($line);
-          push @right_html, "<td class=\"diff diff-unchanged\">$line</td>";
-        }
-      }
-      for (my $j = 0; $j < $leftRow || $j < $rightRow ; $j++) { # dump out both cols
-        print  '<tr>';
-        if ($j < $leftRow) {
-          print $left_html[$j];
-        } else {
-          print '<td class="diff diff-changed-missing">&nbsp;</td>';
-        }
-        if ($j < $rightRow) {
-          print $right_html[$j];
-        } else {
-          print '<td class="diff diff-changed-missing">&nbsp;</td>';
-        }
-        print "</tr>\n";
-      }
-    } else {
       for (my $j = 0; $j < $leftRow || $j < $rightRow; $j++) { # dump both cols
         print "<tr>\n";
         if ($j < $leftRow) {
@@ -3579,7 +3261,6 @@ EOF
         }
         print "\n</tr>\n";
       }
-    }
   }
 }
 
@@ -3750,7 +3431,7 @@ EOF
 <label for="f">Diff format:<br />
 EOF
   printDiffSelectStickyVars();
-  printDiffSelect($use_java_script);
+  printDiffSelect();
   printf(<<EOF, $rev1, $rev2);
 </label>
 <input type="submit" value="Show" />
@@ -3960,9 +3641,9 @@ 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:
-<select id="cvsroot" name="cvsroot"%s>
+<select id="cvsroot" name="cvsroot">
 EOF
 
     foreach my $k (@CVSROOT) {
@@ -4137,17 +3818,6 @@ 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);
 }
 
 #