lxr-commits Mailing List for LXR Cross Referencer (Page 15)
Brought to you by:
ajlittoz
Menu
▾
▴
lxr-commits — Don't use, CVS commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(11) |
Sep
(13) |
Oct
(11) |
Nov
(19) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(11) |
Feb
(14) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
(10) |
Apr
|
May
(2) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
(26) |
Jul
(83) |
Aug
(4) |
Sep
(4) |
Oct
(9) |
Nov
|
Dec
(17) |
| 2005 |
Jan
(1) |
Feb
(71) |
Mar
(1) |
Apr
(3) |
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(1) |
Nov
(6) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(35) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(30) |
Apr
(55) |
May
(28) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2013 |
Jan
(35) |
Feb
|
Mar
(7) |
Apr
(12) |
May
(1) |
Jun
(2) |
Jul
|
Aug
(1) |
Sep
(32) |
Oct
|
Nov
(45) |
Dec
(18) |
| 2014 |
Jan
(9) |
Feb
|
Mar
(10) |
Apr
(2) |
May
(4) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
(4) |
Dec
|
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:35
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/BitKeeper/log Added Files: cmd_log repo_log repo_id Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:33
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/sourcedir/SCCS Added Files: s.main.c s.cobol.c Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:31
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/SCCS Added Files: s.file1 s.ChangeSet Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:29
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/etc/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/BitKeeper/etc/SCCS Added Files: s.config x.id_cache x.dfile x.cmark Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:22
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/tmp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/BitKeeper/tmp Added Files: csetcache.1250095 Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:10
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/deleted/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/BitKeeper/deleted/SCCS Added Files: s..del-file2~7a40a14b3cb5ac42 s..del-file3~8c122dea36a73acd Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:10
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/BitKeeper/etc Added Files: config ignore Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:06
|
Update of /cvsroot/lxr/lxr/lib/LXR/Files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/lib/LXR/Files Modified Files: CVS.pm Log Message: ectags update for new language types (JBG) Index: CVS.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- CVS.pm 4 May 2005 23:21:09 -0000 1.33 +++ CVS.pm 4 Apr 2006 22:23:47 -0000 1.34 @@ -331,9 +331,9 @@ my $out = ''; for (split('', $in)) { - s/[|&!`;\$%<>[:cntrl:]]// || # drop these in particular + s/[|&!`;\$%<>[:cntrl:]]// || # `drop these in particular /[\w\/,.-_+=]/ || # keep these intact - s/([ '"\x20-\x7E])/\\$1/ || # escape these out + s/([ '"\x20-\x7E])/\\$1/ || # "'escape these out s/.//; # drop everything else $out .= $_; |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:04
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/firstdir/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/firstdir/SCCS Added Files: s.file2 Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:24:02
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS Added Files: s.ruby.c Log Message: ectags update for new language types (JBG) |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:23:58
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/lib/LXR Modified Files: Common.pm Log Message: ectags update for new language types (JBG) Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- Common.pm 2 Nov 2005 23:39:55 -0000 1.54 +++ Common.pm 4 Apr 2006 22:23:43 -0000 1.55 @@ -538,7 +538,7 @@ if(defined $path) { # First suppress anything after a dodgy character - $path =~ s!(^[\w_+\-,.%^/\!]+).*!$1!; + $path =~ s!(^[\w_+\-,\.%\^/\!]+).*!$1!; # Clean out /../ while ($path =~ m!/\.\.?/!) { $path =~ s!/\.\.?/!/!g; |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:23:58
|
Update of /cvsroot/lxr/lxr/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/tests Modified Files: CVSTest.pm Log Message: ectags update for new language types (JBG) Index: CVSTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr/tests/CVSTest.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CVSTest.pm 5 May 2005 22:01:34 -0000 1.2 +++ CVSTest.pm 4 Apr 2006 22:23:44 -0000 1.3 @@ -50,7 +50,7 @@ $self->{'cvs'}->{'path'} = ''; my $t; - my $ret = eval($t = $self->{'cvs'}->getfilehandle('tests/CVSTest.pm','release')); + my $ret = eval($t = $self->{'cvs'}->getfilehandle('INSTALL','release')); $self->assert(!defined($ret) or !defined($t), 'Getfilehandle should die'); } @@ -61,11 +61,12 @@ # Prepare a CVS object sub set_up { my $self = shift; - my $dir = getcwd; - $dir = File::Spec->updir($dir); + + # This test module relies on the CVSROOT env variable pointing to a test CVS repository + $self->assert(defined($ENV{'CVSROOT'}), 'CVSROOT must be defined'); - $self->{'cvs'} = new LXR::Files("cvs:$dir"); - $self->{'config'}->{'dir'} = "$dir/"; + $self->{'cvs'} = new LXR::Files("cvs:$ENV{'CVSROOT'}"); + $self->{'config'}->{'dir'} = "$ENV{'CVSROOT'}/"; } sub tear_down { |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:23:58
|
Update of /cvsroot/lxr/lxr/lib/LXR/Lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr/lib/LXR/Lang Modified Files: Generic.pm Log Message: ectags update for new language types (JBG) Index: Generic.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Generic.pm 10 Aug 2004 16:13:02 -0000 1.18 +++ Generic.pm 4 Apr 2006 22:23:44 -0000 1.19 @@ -108,7 +108,7 @@ chomp; my ($sym, $file, $line, $type, $ext) = split(/\t/, $_); - $line =~ s/;\"$//; + $line =~ s/;\"$//; #" fix fontification $ext =~ /language:(\w+)/; $type = $typemap->{$type}; if (!defined $type) { |
|
From: Malcolm B. <mb...@us...> - 2006-04-04 22:23:55
|
Update of /cvsroot/lxr/lxr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19073/lxr Added Files: RELEASING Log Message: ectags update for new language types (JBG) --- NEW FILE: RELEASING --- Instructions for releasing LXR - Run all the tests & ensure they pass - Tag the release in CVS with a tag of the form release-x-y-z (e.g. release-0-9-4) - Export the tagged files to a new directory lxr-x-y-z - Create the Changelog: can use cvs2cl.pl script - tar up the files - upload to SF servers - upload new changelog - send release notification |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:40:04
|
Update of /cvsroot/lxr/lxr/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203/tests Modified Files: AllTests.pm ConfigTest.pm lxr.conf Added Files: BKTest.pm PlainTest.pm Log Message: Merge of the BK support from bk-dev-branch. This merge closes the bk-dev-branch. Adds support for BK repositories (somewhat incomplete). As BK is no longer free, this is untestable by the maintainer and will therefore not be maintained. It is released here to allow others to take it forward if they want. Also updates and add new testcases. Index: AllTests.pm =================================================================== RCS file: /cvsroot/lxr/lxr/tests/AllTests.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AllTests.pm 4 May 2005 23:21:09 -0000 1.2 +++ AllTests.pm 2 Nov 2005 23:39:55 -0000 1.3 @@ -16,7 +16,8 @@ $suite->add_test(Test::Unit::TestSuite->new("ConfigTest")); $suite->add_test(Test::Unit::TestSuite->new("SecurityTest")); $suite->add_test(Test::Unit::TestSuite->new("CVSTest")); - + $suite->add_test(Test::Unit::TestSuite->new("PlainTest")); +# $suite->add_test(Test::Unit::TestSuite->new("BKTest")); return $suite; } Index: ConfigTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr/tests/ConfigTest.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ConfigTest.pm 10 Sep 2005 00:09:20 -0000 1.3 +++ ConfigTest.pm 2 Nov 2005 23:39:55 -0000 1.4 @@ -49,7 +49,7 @@ my @vars = $self->{config}->allvariables(); $self->assert(grep {$_ eq 'v'} @vars, "allvariables didn't return v"); $self->assert(grep {$_ eq 'a'} @vars, "allvariables didn't return a"); - $self->assert($#vars == 1, "Too many variables returned got " . $self->{config}->allvariables()); + $self->assert($#vars == 1, "Too many variables returned got @vars"); } sub test_config_error { @@ -62,6 +62,25 @@ $self->assert_matches(qr/--url parameter should be a URL \(e\.g\. http:/, $t); } +# Test access to the sourceparams section + +sub test_sourceparams { + my $self = shift; + my $config = $self->{'config'}; + + my $params = $config->sourceparams; + $self->assert_equals($$params{'cachepath'}, '/a/path/to/cache'); + $self->assert_equals($$params{'param2'}, 'secondparam'); +} + +# Test multiple config block with common substrings work +# Bug 525825 +sub test_multi_config { + my $self = shift; + my $test = eval {new LXR::Config("http://test/lxr-wibble", "./lxr.conf");}; + $self->assert(!defined($test), "Should not have matched"); + } + # set_up and tear_down are used to # prepare and release resources need for testing Index: lxr.conf =================================================================== RCS file: /cvsroot/lxr/lxr/tests/lxr.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lxr.conf 4 May 2005 23:21:09 -0000 1.2 +++ lxr.conf 2 Nov 2005 23:39:55 -0000 1.3 @@ -95,7 +95,7 @@ # The name to display for this source tree 'sourcerootname' => 'Example', - + 'sourceparams' => {'cachepath' => '/a/path/to/cache', 'param2' => 'secondparam'}, # The DBI identifier for the database to use # For mysql, the format is dbi:mysql:dbname=<name> # for Postgres, it is dbi:Pg:dbname=<name> @@ -177,7 +177,8 @@ # ['tcl', '(?i)\.tcl$|\.wish$' #' # , 'LXR::Lang::Generic'], }, - + + 'ignoredirs' => [], # Maps interpreter names to languages. The format is: # regexp => langname # regexp is matched against the part after #! on the first line of a file |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:40:03
|
Update of /cvsroot/lxr/lxr/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203/templates Modified Files: lxr.conf Log Message: Merge of the BK support from bk-dev-branch. This merge closes the bk-dev-branch. Adds support for BK repositories (somewhat incomplete). As BK is no longer free, this is untestable by the maintainer and will therefore not be maintained. It is released here to allow others to take it forward if they want. Also updates and add new testcases. Index: lxr.conf =================================================================== RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- lxr.conf 30 Apr 2005 21:30:07 -0000 1.25 +++ lxr.conf 2 Nov 2005 23:39:55 -0000 1.26 @@ -108,8 +108,17 @@ # server access does NOT work. # 'sourceroot' => 'cvs:/hom/karsk/a/CVSROOT/linux', + # For a BitKeeper repository, specify bk: followed by the path to the + # repository. For BK it is also necessary to specify a 'cachepath' parameter in + # the 'sourceparams' value below. This should point to a directory where the + # code can write and read files. + # 'sourceroot' => 'bk:/some/repository/here', + # The name to display for this source tree 'sourcerootname' => 'Example', + + # Any parameters to the source access method should be specified below + 'sourceparams' => {'cachepath' => '/a/path/here'}, # The DBI identifier for the database to use # For mysql, the format is dbi:mysql:dbname=<name> |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:40:03
|
Update of /cvsroot/lxr/lxr/lib/LXR/Files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203/lib/LXR/Files Modified Files: Plain.pm Added Files: BK.pm Log Message: Merge of the BK support from bk-dev-branch. This merge closes the bk-dev-branch. Adds support for BK repositories (somewhat incomplete). As BK is no longer free, this is untestable by the maintainer and will therefore not be maintained. It is released here to allow others to take it forward if they want. Also updates and add new testcases. Index: Plain.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Plain.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Plain.pm 21 Jul 2004 20:44:31 -0000 1.24 +++ Plain.pm 2 Nov 2005 23:39:55 -0000 1.25 @@ -100,6 +100,10 @@ my ($self, $pathname, $release) = @_; my ($dir, $node, @dirs, @files); + if($pathname !~ m!/$!) { + $pathname = $pathname . '/'; + } + $dir = $self->toreal($pathname, $release); opendir(DIR, $dir) || return (); FILE: while (defined($node = readdir(DIR))) { @@ -164,14 +168,4 @@ return %index; } -sub allreleases { - my ($self, $filename) = @_; - - opendir(SRCDIR, $self->{'rootpath'}); - my @dirs = readdir(SRCDIR); - closedir(SRCDIR); - - return grep { /^[^\.]/ && -r $self->toreal($filename, $_) } @dirs; -} - 1; |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:40:03
|
Update of /cvsroot/lxr/lxr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203 Modified Files: .cvsignore INSTALL diff genxref source Removed Files: fixhashbang genjavaclasses Log Message: Merge of the BK support from bk-dev-branch. This merge closes the bk-dev-branch. Adds support for BK repositories (somewhat incomplete). As BK is no longer free, this is untestable by the maintainer and will therefore not be maintained. It is released here to allow others to take it forward if they want. Also updates and add new testcases. Index: .cvsignore =================================================================== RCS file: /cvsroot/lxr/lxr/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 14 Jul 2004 14:50:14 -0000 1.3 +++ .cvsignore 2 Nov 2005 23:39:55 -0000 1.4 @@ -7,4 +7,6 @@ html-search-swish.html html-tail.html lxr.conf -lxr.css \ No newline at end of file +lxr.css +.includepath +.project Index: INSTALL =================================================================== RCS file: /cvsroot/lxr/lxr/INSTALL,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- INSTALL 5 Jan 2005 17:13:20 -0000 1.20 +++ INSTALL 2 Nov 2005 23:39:55 -0000 1.21 @@ -26,6 +26,10 @@ 7) If using the CVS support, you will need rcs installed as well. +8) If you are using the BitKeeper support, you will need: + BitKeeper (bk) installed + Digest::SHA module (available from CPAN) + Installing the database ----------------------- You will need to create a database for lxr, and possibly create a user Index: diff =================================================================== RCS file: /cvsroot/lxr/lxr/diff,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- diff 26 Oct 2004 17:08:07 -0000 1.15 +++ diff 2 Nov 2005 23:39:55 -0000 1.16 @@ -31,6 +31,7 @@ use LXR::Common qw(:html); use Local; +use FileHandle; sub htmlsub { my ($s, $l) = @_; Index: genxref =================================================================== RCS file: /cvsroot/lxr/lxr/genxref,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- genxref 21 Jul 2004 20:44:30 -0000 1.36 +++ genxref 2 Nov 2005 23:39:55 -0000 1.37 @@ -51,6 +51,7 @@ --version=VERSION Generate tokens for the given version of the code. --allversions Generate tokens for all versions of the code (default). --reindexall Purges existing index data + Report bugs at http://sourceforge.net/projects/lxr/. END_HELP exit 0; @@ -67,7 +68,7 @@ die("No matching configuration") unless $config->sourceroot; -$files = new LXR::Files($config->sourceroot); +$files = new LXR::Files($config->sourceroot, $config->sourceparams); die "Can't create file access object " . $config->sourceroot if !defined($files); $index = new LXR::Index($config->dbname, O_RDWR | O_CREAT); Index: source =================================================================== RCS file: /cvsroot/lxr/lxr/source,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- source 2 Sep 2004 15:26:42 -0000 1.44 +++ source 2 Nov 2005 23:39:55 -0000 1.45 @@ -27,8 +27,8 @@ $CVSID = '$Id$ '; use strict; -use lib '.'; # for Local.pm -use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib +use lib '.'; # for Local.pm +use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib use LXR::Common qw(:html); use Local; @@ -43,8 +43,9 @@ $img = "/icons/folder.gif"; } - return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", "", - $dir . $node); + return fileref( + "<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", + "", $dir . $node); } sub dirname { @@ -76,7 +77,8 @@ } else { $img = "/icons/generic.gif"; } - return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">", "", $dir . $node); + return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">", + "", $dir . $node); } sub filename { @@ -121,8 +123,11 @@ my @t = gmtime($file_time); my ($sec, $min, $hour, $mday, $mon, $year) = @t; - return - sprintf("%04d-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec); + return sprintf( + "%04d-%02d-%02d %02d:%02d:%02d", + $year + 1900, + $mon + 1, $mday, $hour, $min, $sec + ); } sub bgcolor { @@ -145,8 +150,7 @@ @nodes = $files->getdir($dir, $release); unless (@nodes) { - print( "<p align=\"center\">\n<i>The directory " - . $files->toreal($dir, $release) + print( "<p align=\"center\">\n<i>The directory " . $dir . " does not exist.</i>\n"); print( "\<p align=\"center\">\n<i>This directory might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" @@ -154,12 +158,6 @@ if $files->isa("LXR::Files::CVS") and !$HTTP->{'param'}->{'showattic'}; - #FIXME what does this do? - if ($files->toreal($dir, $release) =~ m#(.+[^/])[/]*$#) { - if (-e $1) { - warning("Unable to open " . $files->toreal($dir, $release)); - } - } return; } @@ -175,9 +173,10 @@ 'namelink' => sub { dirname(@_, $node, $dir) }, 'filesize' => sub { '-' }, 'modtime' => sub { modtime(@_, $node, $dir) }, - 'bgcolor' => sub { bgcolor(@_, $line++) }, - 'css' => sub { rowclass(@_, $line++) }, - 'description' => sub { descexpand(@_, $node, $dir, $release) } + 'bgcolor' => sub { bgcolor(@_, $line++) }, + 'css' => sub { rowclass(@_, $line++) }, + 'description' => + sub { descexpand(@_, $node, $dir, $release) } ) ); } else { @@ -193,7 +192,9 @@ 'css' => sub { rowclass(@_, $line++) }, 'description' => sub { ( - $files->toreal($dir . $node, $release) =~ m|/Attic/| + $files->isa('LXR::Files::CVS') + && $files->toreal($dir . $node, $release) =~ + m|/Attic/| ? "<i>In Attic</i> " : "" ) @@ -269,7 +270,9 @@ } $b = $a; - $a .= ' ' x (6 - length($a)) . $files->getauthor($pathname, $a); + $a .= + ' ' x (6 - length($a)) + . $files->getauthor($pathname, $a); $a .= ' ' x (16 - length($a)); } } @@ -286,15 +289,14 @@ } } else { - print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n"); + print( + "\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n" + ); print( "\<p align=\"center\">\n<i>This file might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" ) if $files->isa("LXR::Files::CVS") and !$HTTP->{'param'}->{'showattic'}; - if (-f $files->toreal($pathname, $release)) { - warning("Unable to open " . $files->toreal($pathname, $release)); - } } } } --- fixhashbang DELETED --- --- genjavaclasses DELETED --- |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:40:03
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203/lib/LXR Modified Files: Common.pm Files.pm Log Message: Merge of the BK support from bk-dev-branch. This merge closes the bk-dev-branch. Adds support for BK repositories (somewhat incomplete). As BK is no longer free, this is untestable by the maintainer and will therefore not be maintained. It is released here to allow others to take it forward if they want. Also updates and add new testcases. Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Common.pm 9 Sep 2005 22:06:18 -0000 1.53 +++ Common.pm 2 Nov 2005 23:39:55 -0000 1.54 @@ -493,7 +493,7 @@ $config = new LXR::Config($HTTP->{'this_url'}); die "Can't find config for " . $HTTP->{'this_url'} if !defined($config); - $files = new LXR::Files($config->sourceroot); + $files = new LXR::Files($config->sourceroot, $config->sourceparams); die "Can't create Files for " . $config->sourceroot if !defined($files); $index = new LXR::Index($config->dbname); die "Can't create Index for " . $config->dbname if !defined($index); Index: Files.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Files.pm 21 Jul 2004 20:44:30 -0000 1.8 +++ Files.pm 2 Nov 2005 23:39:55 -0000 1.9 @@ -23,18 +23,88 @@ use strict; sub new { - my ($self, $srcroot) = @_; + my ( $self, $srcroot, $params ) = @_; my $files; - if ($srcroot =~ /^CVS:(.*)/i) { + if ( $srcroot =~ /^CVS:(.*)/i ) { require LXR::Files::CVS; $srcroot = $1; $files = new LXR::Files::CVS($srcroot); - } else { + } + elsif ( $srcroot =~ /^bk:(.*)/i ) { + require LXR::Files::BK; + $srcroot = $1; + $files = new LXR::Files::BK($srcroot, $params); + } + else { require LXR::Files::Plain; $files = new LXR::Files::Plain($srcroot); } return $files; } +# Stub implementations of the Files interface + +sub getdir { + my $self = shift; + warn "::getdir not implemented. Parameters @_"; +} + +sub getfile { + my $self = shift; + warn "::getfile not implemented. Parameters @_"; +} + +sub getannotations { + my $self = shift; + warn "::getannotations not implemented. Parameters @_"; +} + +sub getauthor { + my $self = shift; + warn "::getauthor not implemented. Parameters @_"; +} + +sub filerev { + my $self = shift; + warn "::filerev not implemented. Parameters @_"; +} + +sub getfilehandle { + my $self = shift; + warn "::getfilehandle not implemented. Parameters @_"; +} + +sub getfilesize { + my $self = shift; + warn "::getfilesize not implemented. Parameters @_"; +} + +sub getfiletime { + my $self = shift; + warn "::getfiletime not implemented. Parameters @_"; +} + +sub getindex { + my $self = shift; + warn "::getindex not implemented. Parameters @_"; +} + +sub isdir { + my $self = shift; + warn "::isdir not implemented. Parameters: @_"; +} + +sub isfile { + my $self = shift; + warn "::isfile not implemented. Parameters: @_"; +} + +sub toreal { + # FIXME: this function should probably not exist, since it doesn't make sense for + # all file access methods + warn "toreal called - obsolete"; + return undef; +} + 1; |
|
From: Malcolm B. <mb...@us...> - 2005-11-02 23:11:54
|
Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9448/tests/bk-test-repository/BitKeeper/log Modified Files: Tag: bk-dev-branch cmd_log repo_log Log Message: Final submission of BitKeeper support. This version is basically working, but doesn't have support for symbolic identifiers, using changeset numbers instead. Index: cmd_log =================================================================== RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log/Attic/cmd_log,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- cmd_log 13 Feb 2005 23:07:06 -0000 1.1.2.2 +++ cmd_log 2 Nov 2005 23:11:45 -0000 1.1.2.3 @@ -1284,3 +1284,2147 @@ !malcolmbox 1108334979 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0 !malcolmbox 1108334979 bk-3.2.3: get -p -r1.1 file1 = 0 !malcolmbox 1108334979 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0 +!malcolmbox 1108338492 bk-3.2.3: rset -h -l@1.2 = 0 +!malcolmbox 1108338492 bk-3.2.3: rset -h -l@1.6 = 0 +!malcolmbox 1108338492 bk-3.2.3: rset -h -l@1.8 = 0 +!malcolmbox 1108338492 bk-3.2.3: rset -h -l@1.3 = 0 +!malcolmbox 1108338492 bk-3.2.3: rset -h -l@1.1 = 0 +!malcolmbox 1108338492 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0 +!malcolmbox 1108338492 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0 +!malcolmbox 1108338493 bk-3.2.3: get -p -r1.1 file1 = 0 [...2116 lines suppressed...] +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.10 = 0 +!malcolmbox 1114808089 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0 +!malcolmbox 1114808089 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@131 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1345 = 0 +!malcolmbox 1114808089 bk-3.2.3: prs -r1.1 -h -d:USER: file1 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.13 = 0 +!malcolmbox 1114808089 bk-3.2.3: prs -r1.1 -h -d:USER: sourcedir/cobol.c = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.5 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.7 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.10 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.3 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.3 = 0 +!malcolmbox 1114808089 bk-3.2.3: rset -h -l@1.12 = 0 +!malcolmbox 1114808090 bk-3.2.3: rset -h -l@1.5 = 0 +!malcolmbox 1114808090 bk-3.2.3: rset -h -l@1.9 = 0 +!malcolmbox 1114808090 bk-3.2.3: prs -r1.1 -h -d:UTC: file1 = 0 +!malcolmbox 1114808090 bk-3.2.3: rset -h -l@1.11 = 0 +!malcolmbox 1114808090 bk-3.2.3: prs -r1.1 -h -d:UTC: file1 = 0 +!malcolmbox 1114808090 bk-3.2.3: rset -h -l@1.13 = 0 Index: repo_log =================================================================== RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log/Attic/repo_log,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- repo_log 13 Feb 2005 23:07:06 -0000 1.1.2.2 +++ repo_log 2 Nov 2005 23:11:45 -0000 1.1.2.3 @@ -24,3 +24,5 @@ !malcolm/malcolmbox 1108331352 bk-3.2.3: commit = 0 !malcolmbox 1108334521 bk-3.2.3: check -c - = 0 !malcolm/malcolmbox 1108334524 bk-3.2.3: commit = 0 +!malcolmbox 1108849572 bk-3.2.3: check -c - = 0 +!malcolm/malcolmbox 1108849576 bk-3.2.3: commit = 0 |
|
From: Dave B. <bro...@us...> - 2005-10-07 21:38:18
|
Update of /cvsroot/lxr/lxr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2686 Modified Files: search Log Message: fix bug 1316021; untested since i no longer have a working setup, but I figured I should fix my old bad mistake Index: search =================================================================== RCS file: /cvsroot/lxr/lxr/search,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- search 18 Oct 2004 20:22:57 -0000 1.28 +++ search 7 Oct 2005 21:38:06 -0000 1.29 @@ -162,7 +162,7 @@ if ($retval == 0) { my $numlines = 0; foreach my $hit (@result) { - print $hit, "<br>\n" if $hit =~ $hit =~ /No such file or directory/; # feeble attempt to print possible errors (e.g. incomplete LD_LIBRARY_PATH causes linking errors) + print $hit, "<br>\n" if $hit =~ /No such file or directory/; # feeble attempt to print possible errors (e.g. incomplete LD_LIBRARY_PATH causes linking errors) next if $hit =~ /^err:/; # skip; only 'no results' errors happen with return value 0 my ($score, $file) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/; |
|
From: Malcolm B. <mb...@us...> - 2005-09-10 00:09:31
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/lxr/lib/LXR Modified Files: Config.pm Log Message: Fix for [ 1277254 ] --url option needs better help Produce better error messages if we can't find a configuration. Index: Config.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Config.pm 21 Jul 2004 20:44:30 -0000 1.32 +++ Config.pm 10 Sep 2005 00:09:20 -0000 1.33 @@ -106,8 +106,16 @@ } } } - - die "Can't find config for $url\n" if !defined $$self{baseurl}; + + if(!defined $$self{baseurl}) { + if($url =~ m!http://.+\.!) { + die "Can't find config for $url: make sure there is a 'baseurl' line that matches in lxr.conf\n"; + } else { + # wasn't a url, so probably genxref with a bad --url parameter + die "Can't find config for $url: " . + "the --url parameter should be a URL (e.g. http://example.com/lxr) and must match a baseurl line in lxr.conf\n"; + } + } } sub allvariables { |
|
From: Malcolm B. <mb...@us...> - 2005-09-10 00:09:31
|
Update of /cvsroot/lxr/lxr/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/lxr/tests Modified Files: ConfigTest.pm Log Message: Fix for [ 1277254 ] --url option needs better help Produce better error messages if we can't find a configuration. Index: ConfigTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr/tests/ConfigTest.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ConfigTest.pm 6 Sep 2004 21:54:45 -0000 1.2 +++ ConfigTest.pm 10 Sep 2005 00:09:20 -0000 1.3 @@ -52,6 +52,15 @@ $self->assert($#vars == 1, "Too many variables returned got " . $self->{config}->allvariables()); } +sub test_config_error { + my $self = shift; + my $t; + + eval {new LXR::Config("/a/path", "./lxr.conf")}; + $t = $@; + $self->assert(defined($t), "Didn't fail to find config"); + $self->assert_matches(qr/--url parameter should be a URL \(e\.g\. http:/, $t); +} # set_up and tear_down are used to # prepare and release resources need for testing |
|
From: Malcolm B. <mb...@us...> - 2005-09-09 22:06:26
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/lxr/lib/LXR Modified Files: Common.pm Log Message: Fix Bug 1230443: Two letter directories fail. Fix the various regexps in Common.pm Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- Common.pm 15 May 2005 22:59:31 -0000 1.52 +++ Common.pm 9 Sep 2005 22:06:18 -0000 1.53 @@ -538,7 +538,7 @@ if(defined $path) { # First suppress anything after a dodgy character - $path =~ s!(^[\w_+-,.%^/\!]+).*!$1!; + $path =~ s!(^[\w_+\-,.%^/\!]+).*!$1!; # Clean out /../ while ($path =~ m!/\.\.?/!) { $path =~ s!/\.\.?/!/!g; |
|
From: Malcolm B. <mb...@us...> - 2005-09-09 22:06:26
|
Update of /cvsroot/lxr/lxr/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/lxr/tests Modified Files: SecurityTest.pm Log Message: Fix Bug 1230443: Two letter directories fail. Fix the various regexps in Common.pm Index: SecurityTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr/tests/SecurityTest.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SecurityTest.pm 15 May 2005 22:55:23 -0000 1.3 +++ SecurityTest.pm 9 Sep 2005 22:06:18 -0000 1.4 @@ -143,6 +143,14 @@ $SIG{'__WARN__'} = $warn; $self->assert($pathname eq '/a/test/path+!/some/%chars,v', "pathname not washed, got $pathname"); + $ENV{'PATH_INFO'} = '/ab/-/path+!/some/%chars,v'; + $ENV{'QUERY_STRING'} = ''; + $die = $SIG{'__DIE__'}; + $warn = $SIG{'__WARN__'}; + httpinit; + $SIG{'__DIE__'} = $die; + $SIG{'__WARN__'} = $warn; + $self->assert($pathname eq '/ab/-/path+!/some/%chars,v', "pathname not washed, got $pathname"); } sub test_filename_compat { |
