lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.8,1.1.2.9

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12468/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
Tests for getauthor, getannotations

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- BKTest.pm	14 Feb 2005 22:40:49 -0000	1.1.2.8
+++ BKTest.pm	19 Feb 2005 22:22:44 -0000	1.1.2.9
@@ -363,6 +363,28 @@
 	$self->assert(!defined($bk->getfilesize('/sourcedir/main.c', '@1.9')));
 }
 
+# Test getauthor
+
+sub test_getauthor {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+
+	$self->assert_equals('malcolm', $bk->getauthor('/file1', '@1.3'));
+	$self->assert_equals('malcolm', $bk->getauthor('/sourcedir/cobol.c', '@1.13'));
+	$self->assert_null($bk->getauthor('/sourcedir/cobol.c', '@1.3'));
+}
+
+# Test getannotations
+#  Only problem is that I don't have a clue what this function should return - so
+#  for now we're stubbing it out a la Plain.pm
+
+sub test_getannotations {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+
+	$self->assert_deep_equals([], [ $bk->getannotations('/file1', '@1.3') ]);
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.8,1.1.2.9

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12368/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
Complete getauthor and getannotations functions.  Getannotations is a 
stub for now, since it's not clear what this should return.

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- BK.pm	14 Feb 2005 22:39:57 -0000	1.1.2.8
+++ BK.pm	19 Feb 2005 22:22:09 -0000	1.1.2.9
@@ -23,6 +23,7 @@
 use strict;
 use File::Spec;
 use Cwd;
+use IO::File;
 use Digest::SHA qw(sha1_hex);
 use Time::Local;
 use LXR::Common;
@@ -69,16 +70,12 @@
 	my ($self, $pathname, $release) = @_;
 	$pathname = canonise($pathname);
 	my $fileh = undef;
-	my $dir   = getcwd();
-	chdir($self->{'rootpath'});
 	if ($self->file_exists($pathname, $release)) {
-		my $info = $self->getfileinfo($pathname, $release);
-		my $ver = $info->{'revision'};
+		my $info  = $self->getfileinfo($pathname, $release);
+		my $ver   = $info->{'revision'};
 		my $where = $info->{'curpath'};
-		open($fileh, "bk get -p -r$ver $where 2>/dev/null |")
-		  or die "Error executing bk get";
+		$fileh = $self->openbkcommand("bk get -p -r$ver $where 2>/dev/null |");
 	}
-	chdir($dir);
 	return $fileh;
 }
 
@@ -86,40 +83,72 @@
 	my ($self, $filename, $release) = @_;
 
 	my $info = $self->getfileinfo($filename, $release);
-	return sha1_hex($info->{'curpath'}.'-'.$info->{'revision'});	
+	return sha1_hex($info->{'curpath'} . '-' . $info->{'revision'});
 }
 
 sub getfiletime {
 	my ($self, $pathname, $release) = @_;
-	
+
 	my $info = $self->getfileinfo($pathname, $release);
 	return undef if !defined $info;
-	
-	if(!defined($info->{'filetime'})) {
-		my $dir = getcwd();
-		chdir($self->{'rootpath'});
-		open (X, "bk prs -r$info->{'revision'} -h -d:UTC: $info->{'curpath'} |");
-		my $time = <X>; # Should be a YYYYMMDDHHMMSS string
-		close X;
-		chdir($dir);
+
+	if (!defined($info->{'filetime'})) {
+		my $fileh = $self->openbkcommand("bk prs -r$info->{'revision'} -h -d:UTC: $info->{'curpath'} |");
+		my $time = <$fileh>;    # Should be a YYYYMMDDHHMMSS string
+		close $fileh;
 		chomp $time;
-		my ($yr, $mth, $day, $hr, $min, $sec ) = $time =~ m/(....)(..)(..)(..)(..)(..)/;
+		my ($yr, $mth, $day, $hr, $min, $sec) =
+		  $time =~ m/(....)(..)(..)(..)(..)(..)/;
 		$info->{'filetime'} = timegm($sec, $min, $hr, $day, $mth, $yr);
 	}
 
-	return $info->{'filetime'};	
+	return $info->{'filetime'};
 }
 
 sub getfilesize {
 	my ($self, $pathname, $release) = @_;
-	
+
 	my $info = $self->getfileinfo($pathname, $release);
 	return undef if !defined($info);
 
-	if(!defined($info->{'filesize'})) {
+	if (!defined($info->{'filesize'})) {
 		$info->{'filesize'} = length($self->getfile($pathname, $release));
 	}
-	return $info->{'filesize'}
+	return $info->{'filesize'};
+}
+
+
+sub getauthor {
+	my ($self, $pathname, $release) = @_;
+
+	my $info = $self->getfileinfo($pathname, $release);
+	return undef if !defined $info;
+
+	if (!defined($info->{'author'})) {
+		my $fileh = $self->openbkcommand("bk prs -r$info->{'revision'} -h -d:USER: $info->{'curpath'} |");
+		my $user = <$fileh>;
+		close $fileh;
+		chomp $user;
+		$info->{'author'} = $user;
+	}
+
+	return $info->{'author'};
+}
+
+sub getannotations {
+	# No idea what this function should return - Plain.pm returns (), so do that
+	return ();
+}
+
+sub openbkcommand {
+	my ($self, $command) = @_;
+
+	my $dir = getcwd();	
+	chdir($self->{'rootpath'});
+	my $fileh = new IO::File;
+	$fileh->open($command) or die "Can't execute $command";
+	chdir($dir);
+	return $fileh;
 }
 
 sub isdir {
@@ -131,11 +160,11 @@
 }
 
 sub isfile {
-my ($self, $pathname, $release) = @_;
+	my ($self, $pathname, $release) = @_;
 	my $info = $self->getfileinfo($pathname, $release);
 	return (defined($info));
 }
-	
+
 sub tmpfile {
 	my ($self, $filename, $release) = @_;
 	my ($tmp,  $buf);
@@ -156,7 +185,6 @@
 	return $tmp;
 }
 
-
 #
 # Private interface
 #
@@ -169,9 +197,9 @@
 
 sub fill_cache {
 	my ($self, $release) = @_;
-	
+
 	return if (defined $tree_cache{$release});
-	 
+
 	# Not in cache, so need to build
 	my @all_entries = $self->get_tree($release);
 
@@ -185,11 +213,12 @@
 		($vol, $path, $file) = File::Spec->splitpath($histfile);
 		insert_entry(\%newtree, $path, $file, $curfile, $rev);
 		while ($path ne File::Spec->rootdir() && $path ne '') {
+
 			# Insert any directories in path into hash
 			($vol, $path, $file) =
 			  File::Spec->splitpath(
 				File::Spec->catdir(File::Spec->splitdir($path)));
-			insert_entry(\%newtree, $path, $file.'/');
+			insert_entry(\%newtree, $path, $file . '/');
 		}
 	}
 
@@ -203,15 +232,10 @@
 sub get_tree {
 	my ($self, $release) = @_;
 
-	my $real = $self->{'rootpath'};
-	my $dir  = getcwd();
-	chdir($self->{'rootpath'});
-
-# This command provide 3 part output - the current filename, the historical filename & the revision
-	open(X, "bk rset -h -l$release 2>/dev/null |") or die "Can't exec bk rset";
-	chdir($dir);
-	my $line_to_junk = <X>;    # Remove the Changelist|Changelist line at start
-	my @files        = <X>;
+	# This command provide 3 part output - the current filename, the historical filename & the revision
+	my $fileh = $self->openbkcommand("bk rset -h -l$release 2>/dev/null |");
+	my $line_to_junk = <$fileh>;    # Remove the Changelist|Changelist line at start
+	my @files        = <$fileh>;
 	close X;
 	chomp @files;
 
@@ -237,13 +261,12 @@
 
 sub getfileinfo {
 	my ($self, $pathname, $release) = @_;
-	$self->fill_cache($release); # Normally expect this to be present anyway
+	$self->fill_cache($release);    # Normally expect this to be present anyway
 	$pathname = canonise($pathname);
-	
+
 	my ($vol, $path, $file) = File::Spec->splitpath($pathname);
 	$path = File::Spec->rootdir() if $path eq '';
-	
+
 	return $tree_cache{$release}{$path}{$file};
 }
-	
 

[Lxr-commits] CVS: lxr source,1.44.2.1,1.44.2.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7829

Modified Files:
      Tag: bk-dev-branch
	source 
Log Message:


Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -d -r1.44.2.1 -r1.44.2.2
--- source	14 Feb 2005 22:58:20 -0000	1.44.2.1
+++ source	14 Feb 2005 23:04:02 -0000	1.44.2.2
@@ -300,26 +300,25 @@
 		}
 	}
 }
-}
 
 httpinit;
 
 if ($config->filter && $pathname !~ $config->filter) {
-  makeheader('source');
-  print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n");
-  makefooter('source');
-  exit;
+	makeheader('source');
+	print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n");
+	makefooter('source');
+	exit;
 }
 
 # If the file is html then simply pump it out.
 if ($pathname =~ /\.(html)$/ || $HTTP->{'param'}->{'raw'}) {
-  printfile(1);
+	printfile(1);
 } else {
-  my $type = ($pathname !~ m|/$| ? 'source' : 'sourcedir');
+	my $type = ($pathname !~ m|/$| ? 'source' : 'sourcedir');
 
-  makeheader($type);
-  printfile(0);
-  makefooter($type);
+	makeheader($type);
+	printfile(0);
+	makefooter($type);
 }
 
 httpclean;

[Lxr-commits] CVS: lxr source,1.44,1.44.2.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5377

Modified Files:
      Tag: bk-dev-branch
	source 
Log Message:
Remove uses of toreal() except for with CVS module.
These should probably be removed as well...

Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- source	2 Sep 2004 15:26:42 -0000	1.44
+++ source	14 Feb 2005 22:58:20 -0000	1.44.2.1
@@ -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,37 +289,37 @@
 			}
 
 		} 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));
-			}
 		}
 	}
 }
+}
 
 httpinit;
 
 if ($config->filter && $pathname !~ $config->filter) {
-	makeheader('source');
-	print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n");
-	makefooter('source');
-	exit;
+  makeheader('source');
+  print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n");
+  makefooter('source');
+  exit;
 }
 
 # If the file is html then simply pump it out.
 if ($pathname =~ /\.(html)$/ || $HTTP->{'param'}->{'raw'}) {
-	printfile(1);
+  printfile(1);
 } else {
-	my $type = ($pathname !~ m|/$| ? 'source' : 'sourcedir');
+  my $type = ($pathname !~ m|/$| ? 'source' : 'sourcedir');
 
-	makeheader($type);
-	printfile(0);
-	makefooter($type);
+  makeheader($type);
+  printfile(0);
+  makefooter($type);
 }
 
 httpclean;

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.7,1.1.2.8

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29788/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
Implement getfilesize

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- BKTest.pm	14 Feb 2005 00:55:23 -0000	1.1.2.7
+++ BKTest.pm	14 Feb 2005 22:40:49 -0000	1.1.2.8
@@ -353,6 +353,16 @@
 	$self->assert(!defined($bk->getfiletime('/sourcedir/', '@1.12')));
 }
 
+# Test the getfilesize
+sub test_getfilesize {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	$self->assert_equals($bk->getfilesize('/file1', '@1.3'), 60);
+	$self->assert_equals($bk->getfilesize('/file1', '@1.3'), $bk->getfilesize('file1', '@1.11'));
+	$self->assert(!defined($bk->getfilesize('/sourcedir/main.c', '@1.9')));
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.7,1.1.2.8

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29339/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
Implement getfilesize

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- BK.pm	14 Feb 2005 00:55:23 -0000	1.1.2.7
+++ BK.pm	14 Feb 2005 22:39:57 -0000	1.1.2.8
@@ -109,6 +109,19 @@
 
 	return $info->{'filetime'};	
 }
+
+sub getfilesize {
+	my ($self, $pathname, $release) = @_;
+	
+	my $info = $self->getfileinfo($pathname, $release);
+	return undef if !defined($info);
+
+	if(!defined($info->{'filesize'})) {
+		$info->{'filesize'} = length($self->getfile($pathname, $release));
+	}
+	return $info->{'filesize'}
+}
+
 sub isdir {
 	my ($self, $pathname, $release) = @_;
 	$self->fill_cache($release);

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.6,1.1.2.7

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20826/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
Implement isfile()

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- BKTest.pm	14 Feb 2005 00:45:22 -0000	1.1.2.6
+++ BKTest.pm	14 Feb 2005 00:55:23 -0000	1.1.2.7
@@ -332,6 +332,16 @@
 	$self->assert(!$bk->isdir('/sourcedir/', '@1.10')); 
 }
 
+sub test_isfile {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	$self->assert($bk->isfile('/file1', '@1.12'));
+	$self->assert($bk->isfile('/sourcedir/main.c', '@1.12'));
+	$self->assert(!$bk->isfile('/sourcedir/main.c', '@1.9'));
+	$self->assert(!$bk->isfile('/seconddir/thirddir/', '@1.9'));
+}
+
 # Test the getfiletime function
 #  tests are assuming that undef is OK for a directory
 sub test_getfiletime {

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.6,1.1.2.7

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20826/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
Implement isfile()

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- BK.pm	14 Feb 2005 00:45:22 -0000	1.1.2.6
+++ BK.pm	14 Feb 2005 00:55:23 -0000	1.1.2.7
@@ -117,6 +117,12 @@
 	return (defined($info));
 }
 
+sub isfile {
+my ($self, $pathname, $release) = @_;
+	my $info = $self->getfileinfo($pathname, $release);
+	return (defined($info));
+}
+	
 sub tmpfile {
 	my ($self, $filename, $release) = @_;
 	my ($tmp,  $buf);

[Lxr-commits] CVS: lxr/lib/LXR Files.pm,1.8.2.3,1.8.2.4

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18633/lib/LXR

Modified Files:
      Tag: bk-dev-branch
	Files.pm 
Log Message:
Change to warn instead of die-ing when unimplement function is called

Index: Files.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- Files.pm	13 Feb 2005 23:37:59 -0000	1.8.2.3
+++ Files.pm	14 Feb 2005 00:50:25 -0000	1.8.2.4
@@ -47,62 +47,63 @@
 
 sub getdir {
 	my $self = shift;
-	die  '::getdir not implemented';
+	warn  "::getdir not implemented. Parameters @_";
 }
 
 sub getfile {
 	my $self = shift;
-	die  '::getfile not implemented';
+	warn  "::getfile not implemented. Parameters @_";
 }
 
 sub getannotations {
 	my $self = shift;
-	die  '::getannotations not implemented';
+	warn  "::getannotations not implemented. Parameters @_";
 }
 
 sub getauthor {
 	my $self = shift;
-	die  '::getauthor not implemented';
+	warn  "::getauthor not implemented. Parameters @_";
 }
 
 sub filerev {
 	my $self = shift;
-	die  '::filerev not implemented';
+	warn  "::filerev not implemented. Parameters @_";
 }
 
 sub getfilehandle {
 	my $self = shift;
-	die  '::getfilehandle not implemented';
+	warn  "::getfilehandle not implemented. Parameters @_";
 }
 
 sub getfilesize {
 	my $self = shift;
-	die  '::getfilesize not implemented';
+	warn  "::getfilesize not implemented. Parameters @_";
 }
 
 sub getfiletime {
 	my $self = shift;
-	die  '::getfiletime not implemented';
+	warn  "::getfiletime not implemented. Parameters @_";
 }
 
 sub getindex {
 	my $self = shift;
-	die  "::getindex not implemented. Parameters @_";
+	warn  "::getindex not implemented. Parameters @_";
 }
 
 sub isdir {
 	my $self = shift;
-	die  "::isdir not implemented. Parameters: @_";
+	warn  "::isdir not implemented. Parameters: @_";
 }
 
 sub isfile {
 	my $self = shift;
-	die  "::isfile not implemented. Parameters: @_";
+	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;
 }
 

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.5,1.1.2.6

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16428/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
Implement getfiletime() function.

Does not implement it for directories yet

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- BK.pm	13 Feb 2005 23:55:36 -0000	1.1.2.5
+++ BK.pm	14 Feb 2005 00:45:22 -0000	1.1.2.6
@@ -82,8 +82,6 @@
 	return $fileh;
 }
 
-
-
 sub filerev {
 	my ($self, $filename, $release) = @_;
 
@@ -91,6 +89,26 @@
 	return sha1_hex($info->{'curpath'}.'-'.$info->{'revision'});	
 }
 
+sub getfiletime {
+	my ($self, $pathname, $release) = @_;
+	
+	my $info = $self->getfileinfo($pathname, $release);
+	return undef if !defined $info;
+	
+	if(!defined($info->{'filetime'})) {
+		my $dir = getcwd();
+		chdir($self->{'rootpath'});
+		open (X, "bk prs -r$info->{'revision'} -h -d:UTC: $info->{'curpath'} |");
+		my $time = <X>; # Should be a YYYYMMDDHHMMSS string
+		close X;
+		chdir($dir);
+		chomp $time;
+		my ($yr, $mth, $day, $hr, $min, $sec ) = $time =~ m/(....)(..)(..)(..)(..)(..)/;
+		$info->{'filetime'} = timegm($sec, $min, $hr, $day, $mth, $yr);
+	}
+
+	return $info->{'filetime'};	
+}
 sub isdir {
 	my ($self, $pathname, $release) = @_;
 	$self->fill_cache($release);

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.5,1.1.2.6

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16428/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
Implement getfiletime() function.

Does not implement it for directories yet

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- BKTest.pm	13 Feb 2005 23:56:12 -0000	1.1.2.5
+++ BKTest.pm	14 Feb 2005 00:45:22 -0000	1.1.2.6
@@ -6,6 +6,7 @@
 
 use Test::Unit;
 use Cwd;
+use Time::Local;
 use lib "..";
 use lib "../lib";
 
@@ -331,6 +332,17 @@
 	$self->assert(!$bk->isdir('/sourcedir/', '@1.10')); 
 }
 
+# Test the getfiletime function
+#  tests are assuming that undef is OK for a directory
+sub test_getfiletime {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	$self->assert_equals($bk->getfiletime('/file1', '@1.3'), timegm(30,20,14,13,02,2005));
+	$self->assert_equals($bk->getfiletime('/file1', '@1.3'), $bk->getfiletime('file1', '@1.11'));
+	$self->assert(!defined($bk->getfiletime('/sourcedir/', '@1.12')));
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.4,1.1.2.5

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29097/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
Implement isdir() function

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- BKTest.pm	13 Feb 2005 23:07:05 -0000	1.1.2.4
+++ BKTest.pm	13 Feb 2005 23:56:12 -0000	1.1.2.5
@@ -315,6 +315,22 @@
 	$self->assert_not_equals($rev, $bk->filerev('/firstdir/file2', '@1.9'));
 }
 
+# Test isdir
+#  Assuming that pathname will always end in / if it's a dir
+#  - this may not be correct!
+sub test_isdir {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	$self->assert($bk->isdir('/firstdir/', '@1.3'));
+	$self->assert($bk->isdir('/seconddir/thirddir/','@1.6'));
+	$self->assert(!$bk->isdir('/not/a/dir/', '@1.3'));
+	$self->assert(!$bk->isdir('/seconddir/file2/', '@1.4'));
+	$self->assert(!$bk->isdir('/file1','@1.11'));
+	$self->assert(!$bk->isdir('/sourcedir/main.c', '@1.12'));
+	$self->assert(!$bk->isdir('/sourcedir/', '@1.10')); 
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.4,1.1.2.5

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28812/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
Implement isdir() function

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- BK.pm	13 Feb 2005 23:07:06 -0000	1.1.2.4
+++ BK.pm	13 Feb 2005 23:55:36 -0000	1.1.2.5
@@ -91,6 +91,14 @@
 	return sha1_hex($info->{'curpath'}.'-'.$info->{'revision'});	
 }
 
+sub isdir {
+	my ($self, $pathname, $release) = @_;
+	$self->fill_cache($release);
+	$pathname = canonise($pathname);
+	my $info = $tree_cache{$release}{$pathname};
+	return (defined($info));
+}
+
 sub tmpfile {
 	my ($self, $filename, $release) = @_;
 	my ($tmp,  $buf);

[Lxr-commits] CVS: lxr/lib/LXR Files.pm,1.8.2.2,1.8.2.3

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22275/lib/LXR

Modified Files:
      Tag: bk-dev-branch
	Files.pm 
Log Message:
Log parameters for unimplemented functions

Index: Files.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- Files.pm	13 Feb 2005 19:35:05 -0000	1.8.2.2
+++ Files.pm	13 Feb 2005 23:37:59 -0000	1.8.2.3
@@ -87,17 +87,17 @@
 
 sub getindex {
 	my $self = shift;
-	die  '::getindex not implemented';
+	die  "::getindex not implemented. Parameters @_";
 }
 
 sub isdir {
 	my $self = shift;
-	die  '::isdir not implemented';
+	die  "::isdir not implemented. Parameters: @_";
 }
 
 sub isfile {
 	my $self = shift;
-	die  '::isfile not implemented';
+	die  "::isfile not implemented. Parameters: @_";
 }
 
 sub toreal {

[Lxr-commits] CVS: lxr/tests/bk-test-repository/BitKeeper/log cmd_log,1.1.2.1,1.1.2.2 repo_log,1.1.2.1,1.1.2.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/BitKeeper/log

Modified Files:
      Tag: bk-dev-branch
	cmd_log repo_log 
Log Message:
genxref now works against the test BK repository.

Index: cmd_log
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log/Attic/cmd_log,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cmd_log	13 Feb 2005 19:35:06 -0000	1.1.2.1
+++ cmd_log	13 Feb 2005 23:07:06 -0000	1.1.2.2
@@ -848,3 +848,439 @@
 !malcolmbox 1108322623 bk-3.2.3: rset -h -l@1.1449 = 1
 !malcolmbox 1108322623 bk-3.2.3: rset -h -l1.1 = 0
 !malcolmbox 1108322623 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108330357 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108330485 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331040 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331040 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331040 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331040 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108331040 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108331040 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108331040 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331041 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331041 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331042 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331042 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331042 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108331042 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108331042 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108331042 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108331042 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331044 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331044 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108331044 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331045 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108331045 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108331045 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108331045 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108331046 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331081 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108331081 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331082 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108331082 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331082 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331082 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108331082 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331082 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331083 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108331083 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331083 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108331083 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108331084 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108331084 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108331084 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108331100 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331161 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331161 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331161 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331187 bk-3.2.3: rset -l@1.3 -h = 0
+!malcolm/malcolmbox 1108331274 bk-3.2.3: add cobol.c = 0
+!malcolm/malcolmbox 1108331290 bk-3.2.3: add main.c = 0
+!malcolm/malcolmbox 1108331316 bk-3.2.3: add ruby.c = 0
+!malcolmbox 1108331319 bk-3.2.3: obtain write lock (5273)
+!malcolmbox 1108331319 bk-3.2.3: sfind -s,,p -C = 0
+!malcolmbox 1108331320 bk-3.2.3: sccscat -h ChangeSet = 0
+!malcolmbox 1108331320 bk-3.2.3: _sort = 0
+!malcolmbox 1108331320 bk-3.2.3: sane = 0
+!malcolmbox 1108331320 bk-3.2.3: check -c - = 0
+!malcolmbox 1108331320 bk-3.2.3: cat BitKeeper/templates/commit = 0
+!malcolmbox 1108331320 bk-3.2.3: _sort -u = 0
+!malcolmbox 1108331320 bk-3.2.3: sccslog -DA - = 0
+!malcolmbox 1108331352 bk-3.2.3: gethelp bkl = 0
+!malcolm/malcolmbox 1108331352 bk-3.2.3: _lconfig = 1
+!malcolm/malcolmbox 1108331352 bk-3.2.3: commit = 0
+!malcolm/malcolmbox 1108331352 bk-3.2.3: write unlock (5273)
+!malcolmbox 1108331439 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331825 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108331826 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331826 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331826 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108331826 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331827 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108331827 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108331827 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108331827 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108331827 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108331827 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108331828 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331828 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331828 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331828 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331828 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108331828 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108331828 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331828 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331828 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108331828 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108331872 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108331872 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331872 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331872 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108331872 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108331873 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108331873 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331873 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108331873 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108331874 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331874 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108331874 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108331874 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108331874 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108331874 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108331875 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108331875 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108331875 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108331875 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108331875 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108331875 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108331875 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108331876 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108331876 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108331876 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108331876 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108332016 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332016 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108332016 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332016 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332017 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332017 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332017 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332017 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332017 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108332017 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108332017 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108332017 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332018 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332018 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108332018 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332018 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108332018 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108332019 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108332019 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108332019 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108332019 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108332019 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332050 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108332050 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332050 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332050 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108332050 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108332050 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332050 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332051 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332051 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108332051 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332052 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332052 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108332052 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332052 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108332052 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108332053 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108332053 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108332053 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108332053 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108332053 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332053 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332053 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108332054 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108332106 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108332106 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332107 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332107 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108332107 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332107 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332107 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108332108 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332108 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108332108 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108332108 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108332108 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108332108 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108332108 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108332108 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108332109 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332109 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108332109 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108332109 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332109 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108332109 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108332110 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108332110 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108332110 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108332110 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108332110 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108332126 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108332142 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108332164 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108332376 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108332753 bk-3.2.3: gethelp -s rset /usr/local/bitkeeper = 0
+!malcolmbox 1108332753 bk-3.2.3: help -s rset = 0
+!malcolmbox 1108332753 bk-3.2.3: rset -l -h = 1
+!malcolmbox 1108332759 bk-3.2.3: rset -l@1.11 -h = 0
+!malcolmbox 1108332969 bk-3.2.3: rset -l@1.10 -h = 0
+!malcolmbox 1108332980 bk-3.2.3: rset -l@1.9 -h = 0
+!malcolmbox 1108334103 bk-3.2.3: changes = 0
+!malcolmbox 1108334126 bk-3.2.3: prs -r@1.5 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334312 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108334313 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334313 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334314 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334314 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334315 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334315 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334316 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108334316 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108334316 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108334316 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334317 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334317 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334317 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334317 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334317 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334318 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334318 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334318 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108334318 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108334318 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334318 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334318 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108334318 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108334362 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108334362 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334364 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334364 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334365 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334365 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334366 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334367 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108334367 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108334367 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108334367 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334368 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334368 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334368 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108334368 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108334369 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334369 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334369 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334369 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334369 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108334369 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108334369 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334369 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334370 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334370 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334370 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334404 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108334404 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334404 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334405 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334407 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334408 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334408 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334408 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108334408 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334408 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108334408 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108334408 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334409 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108334409 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334409 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108334409 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108334409 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334410 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334410 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334411 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334412 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334413 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334413 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108334414 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108334414 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334452 bk-3.2.3: rset -l@1.3 -h = 0
+!malcolmbox 1108334461 bk-3.2.3: rset -l@1.11 -h = 0
+!malcolmbox 1108334489 bk-3.2.3: edit file1 = 1
+!malcolm/malcolmbox 1108334517 bk-3.2.3: ci file1 = 0
+!malcolmbox 1108334521 bk-3.2.3: obtain write lock (6113)
+!malcolmbox 1108334521 bk-3.2.3: sfind -s,,p -C = 0
+!malcolmbox 1108334521 bk-3.2.3: sccscat -h ChangeSet = 0
+!malcolmbox 1108334521 bk-3.2.3: _sort = 0
+!malcolmbox 1108334521 bk-3.2.3: sane = 0
+!malcolmbox 1108334521 bk-3.2.3: check -c - = 0
+!malcolmbox 1108334521 bk-3.2.3: cat BitKeeper/templates/commit = 0
+!malcolmbox 1108334521 bk-3.2.3: _sort -u = 0
+!malcolmbox 1108334521 bk-3.2.3: sccslog -DA - = 0
+!malcolmbox 1108334524 bk-3.2.3: gethelp bkl = 0
+!malcolm/malcolmbox 1108334524 bk-3.2.3: _lconfig = 1
+!malcolm/malcolmbox 1108334524 bk-3.2.3: commit = 0
+!malcolm/malcolmbox 1108334524 bk-3.2.3: write unlock (6113)
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334537 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334537 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@131 = 0
+!malcolmbox 1108334537 bk-3.2.3: rset -h -l@1345 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.2 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.1 = 0
+!malcolmbox 1108334538 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334538 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334538 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.1449 = 1
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l1.1 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.10 = 0
+!malcolmbox 1108334538 bk-3.2.3: rset -h -l@1.5 = 0
+!malcolmbox 1108334539 bk-3.2.3: rset -h -l@1.12 = 0
+!malcolmbox 1108334539 bk-3.2.3: rset -h -l@1.9 = 0
+!malcolmbox 1108334540 bk-3.2.3: rset -h -l@1.4 = 0
+!malcolmbox 1108334540 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334540 bk-3.2.3: rset -h -l@1.7 = 0
+!malcolmbox 1108334540 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334540 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334540 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334541 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334541 bk-3.2.3: get -p -r1.3 seconddir/file7 = 0
+!malcolmbox 1108334541 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334619 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334620 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334622 bk-3.2.3: get -p -r1.1 sourcedir/cobol.c = 0
+!malcolmbox 1108334741 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334743 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334744 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334746 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334747 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334749 bk-3.2.3: get -p -r1.1 sourcedir/cobol.c = 0
+!malcolmbox 1108334923 bk-3.2.3: get -p -r1.1 sourcedir/subdir1/ruby.c = 0
+!malcolmbox 1108334942 bk-3.2.3: get -p -r1.1 sourcedir/main.c = 0
+!malcolmbox 1108334942 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334942 bk-3.2.3: get -p -r1.4 seconddir/file7 = 0
+!malcolmbox 1108334943 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334943 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334943 bk-3.2.3: get -p -r1.1 sourcedir/cobol.c = 0
+!malcolmbox 1108334943 bk-3.2.3: get -p -r1.1 sourcedir/subdir1/ruby.c = 0
+!malcolmbox 1108334944 bk-3.2.3: get -p -r1.1 sourcedir/main.c = 0
+!malcolmbox 1108334976 bk-3.2.3: rset -h -l@1.3 = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file3~8c122dea36a73acd = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file3~8c122dea36a73acd = 0
+!malcolmbox 1108334976 bk-3.2.3: get -p -r1.1 BitKeeper/deleted/.del-file2~7a40a14b3cb5ac42 = 0
+!malcolmbox 1108334977 bk-3.2.3: rset -h -l@1.6 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.1 seconddir/file4 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334977 bk-3.2.3: rset -h -l@1.8 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334977 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.2 seconddir/file7 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.1 file1 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.1 firstdir/file2 = 0
+!malcolmbox 1108334978 bk-3.2.3: rset -h -l@1.11 = 0
+!malcolmbox 1108334978 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!malcolmbox 1108334978 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 1108334979 bk-3.2.3: get -p -r1.2 seconddir/file4 = 0
+!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

Index: repo_log
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/log/Attic/repo_log,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- repo_log	13 Feb 2005 19:35:06 -0000	1.1.2.1
+++ repo_log	13 Feb 2005 23:07:06 -0000	1.1.2.2
@@ -20,3 +20,7 @@
 !malcolm/malcolmbox 1108319780 bk-3.2.3: commit = 0
 !malcolmbox 1108319993 bk-3.2.3: check -c - = 0
 !malcolm/malcolmbox 1108319995 bk-3.2.3: commit = 0
+!malcolmbox 1108331320 bk-3.2.3: check -c - = 0
+!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

[Lxr-commits] CVS: lxr/tests/bk-test-repository/BitKeeper/etc/SCCS x.cmark,1.1.2.1,1.1.2.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/etc/SCCS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/BitKeeper/etc/SCCS

Modified Files:
      Tag: bk-dev-branch
	x.cmark 
Log Message:
genxref now works against the test BK repository.

Index: x.cmark
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/etc/SCCS/Attic/x.cmark,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- x.cmark	13 Feb 2005 21:08:44 -0000	1.1.2.1
+++ x.cmark	13 Feb 2005 23:07:06 -0000	1.1.2.2
@@ -1 +1 @@
-malcolm@serenity|ChangeSet|20050213183955|10972
+malcolm@serenity|ChangeSet|20050213224204|44268

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.3,1.1.2.4

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
genxref now works against the test BK repository.

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- BKTest.pm	13 Feb 2005 19:35:04 -0000	1.1.2.3
+++ BKTest.pm	13 Feb 2005 23:07:05 -0000	1.1.2.4
@@ -88,15 +88,15 @@
 
 	my @files =
 	  sort($bk->getdir("/", 'test1'));  # use different releases to disambiguate
-	$self->assert_deep_equals(\@files, [ sort "README", "src" ]);
+	$self->assert_deep_equals(\@files, [ sort "README", "src/" ]);
 	@files = sort ($bk->getdir("", 'test1'));  # Check that interprets "" as "/"
-	$self->assert_deep_equals(\@files, [ sort "README", "src" ]);
+	$self->assert_deep_equals(\@files, [ sort "README", "src/" ]);
 	@files = sort($bk->getdir("src/", 'test1'));
-	$self->assert_deep_equals(\@files, [ sort "file1", "file2", "tests" ]);
+	$self->assert_deep_equals(\@files, [ sort "file1", "file2", "tests/" ]);
 	@files = sort($bk->getdir("src/tests/newtest/", 'test1'));
 	$self->assert_deep_equals(\@files, [ sort "test1" ]);
 	@files = sort($bk->getdir("src/tests/", 'test1'));
-	$self->assert_deep_equals(\@files, [ sort "newtest" ]);
+	$self->assert_deep_equals(\@files, [ sort "newtest/" ]);
 	@files = sort($bk->getdir("src/tests/newtest/", 'test1'));
 	$self->assert_deep_equals(\@files, [ sort "test1" ]);
 
@@ -118,15 +118,13 @@
 	@files =
 	  sort($bk->getdir("src/tests/", 'test2'))
 	  ;    # Should still only see one copy of dir
-	$self->assert_deep_equals(\@files, ["newtest"]);
+	$self->assert_deep_equals(\@files, ["newtest/"]);
 	@files =
 	  sort($bk->getdir("src/tests/newtest/", 'test1'))
 	  ;    # Check cache is still ok
 	$self->assert_deep_equals(\@files, ["test1"]);
 
 	# Now tests with invalid paths on entry
-	@files = sort($bk->getdir("/src/tests/", 'test1'));
-	$self->assert($#files == -1);
 	@files = sort($bk->getdir("src/tests", 'test2'));
 	$self->assert($#files == -1);
 }
@@ -154,17 +152,23 @@
 	my $bk   = $self->{'bk'};
 
 	# A revision with no deletions
-	my @entries = sort $bk->getdir('firstdir/', '@1.3');
+	my @entries = sort $bk->getdir('/firstdir/', '@1.3');
 	$self->assert(scalar(@entries) == 2, "entries is $#entries");
 	$self->assert_deep_equals(\@entries, [ sort ("file2", "file3") ]);
-	@entries = sort($bk->getdir('seconddir/', '@1.6'));
-	$self->assert_deep_equals(\@entries, [ sort ("file4", "thirddir") ]);
+	@entries = sort($bk->getdir('/seconddir/', '@1.6'));
+	$self->assert_deep_equals(\@entries, [ sort ("file4", "thirddir/") ]);
 
+	# Check the full recursive tree
+	@entries = sort $bk->getdir('/', '@1.11');
+	$self->assert_deep_equals(\@entries, [sort ("file1", "firstdir/", "seconddir/", "sourcedir/")]);
+	@entries = sort $bk->getdir('/sourcedir/', '@1.11');
+	$self->assert_deep_equals(\@entries, [sort ("cobol.c", "main.c", "subdir1/")]);
+	
 	# Now a revision after some files have been deleted
 	@entries = sort $bk->getdir('firstdir/', '@1.6');
 	$self->assert(scalar(@entries) == 0);
 	@entries = sort $bk->getdir('seconddir/', '@1.6');
-	$self->assert_deep_equals(\@entries, [ sort ('thirddir', 'file4') ]);
+	$self->assert_deep_equals(\@entries, [ sort ('thirddir/', 'file4') ]);
 	@entries = sort $bk->getdir('seconddir/thirddir/', '@1.6');
 	$self->assert_deep_equals(\@entries, [ sort ('file5') ]);
 
@@ -289,6 +293,28 @@
 	$self->assert(!defined($bk->getfilehandle("/seconddir/thirddir/file5", '@1.10')));
 }
 
+# Test filerev
+#  Need to ensure that the filerevs are < 255 chars & sensible!
+#  Oh, and they change when the file changes!
+sub test_filerev {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	# A file that has changed contents
+	my $rev = $bk->filerev('/file1', '@1.3');
+	$self->assert($rev);
+	$self->assert_not_equals($rev, $bk->filerev('/file1', '@1.12'));
+	
+	# A file that hasn't changed
+	$rev = $bk->filerev('/firstdir/file2', '@1.3');
+	$self->assert_equals($rev, $bk->filerev('/firstdir/file2', '@1.5'));
+	$self->assert(length($rev) < 255);
+	
+	# A file that has been deleted & recreated
+	$rev = $bk->filerev('/firstdir/file2', '@1.5');
+	$self->assert_not_equals($rev, $bk->filerev('/firstdir/file2', '@1.9'));
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;

[Lxr-commits] CVS: lxr/tests/bk-test-repository/SCCS s.ChangeSet,1.1.2.1,1.1.2.2 s.file1,1.1.2.1,1.1.2.2 p.file1,1.1.2.1,NONE

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/SCCS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/SCCS

Modified Files:
      Tag: bk-dev-branch
	s.ChangeSet s.file1 
Removed Files:
      Tag: bk-dev-branch
	p.file1 
Log Message:
genxref now works against the test BK repository.

Index: s.ChangeSet
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/SCCS/Attic/s.ChangeSet,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- s.ChangeSet	13 Feb 2005 21:08:45 -0000	1.1.2.1
+++ s.ChangeSet	13 Feb 2005 23:07:07 -0000	1.1.2.2
@@ -1,4 +1,19 @@
-
H46002
+
H38752
+
s 00001/00000/00001
+
d D 1.12 05/02/13 22:42:04 malcolm 13 12
+
c 
+
cC
+
cK44268
+
e
+
s 00003/00000/00001
+
d D 1.11 05/02/13 21:49:12 malcolm 12 11
+
c Added C code for testing (from Exuberant Ctags)
+
c 
+
c ruby.c, main.c, cobol.c:
+
c   new file
+
cC
+
cK44255
+
e
 
s 00001/00000/00001
 
d D 1.10 05/02/13 18:39:55 malcolm 11 10
 
c file7:
@@ -86,6 +101,14 @@
 
f x 0x1161
 
t
 
T
+
I 13
+malcolm@serenity|file1|20050213142029|09970|bd06fd0928163df malcolm@serenity|file1|20050213224155|11818
+
E 13
+
I 12
+malcolm@serenity|sourcedir/cobol.c|20050213214754|08846|97ec8a55cf04e8a6 malcolm@serenity|sourcedir/cobol.c|20050213214755|53974
+malcolm@serenity|sourcedir/main.c|20050213214810|19862|39b04783548e3a17 malcolm@serenity|sourcedir/main.c|20050213214811|29312
+malcolm@serenity|sourcedir/subdir1/ruby.c|20050213214836|20370|375ab20a34c75bfc malcolm@serenity|sourcedir/subdir1/ruby.c|20050213214837|37571
+
E 12
 
I 11
 malcolm@serenity|seconddir/thirddir/file5|20050213144015|06787|beceb40ac20f17c5 malcolm@serenity|seconddir/file7|20050213183950|24905
 
E 11

Index: s.file1
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/bk-test-repository/SCCS/Attic/s.file1,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- s.file1	13 Feb 2005 21:08:45 -0000	1.1.2.1
+++ s.file1	13 Feb 2005 23:07:07 -0000	1.1.2.2
@@ -1,4 +1,9 @@
-
H36767
+
H48546
+
s 00005/00000/00004
+
d D 1.2 05/02/13 22:41:55 malcolm 3 2
+
cC
+
cK11818
+
e
 
s 00004/00000/00000
 
d D 1.1 05/02/13 14:20:29 malcolm 2 1
 
cC
@@ -24,5 +29,5 @@
 
f x 0x921
 
t
 
T
-x^ŒA
-À ñšWììzð±±D6Åï7…9Ì\&äÚ®
µ^Ä&`›‘£[£©ØÊƞ&mÝï[CˆÒƒTËô
‰
\ No newline at end of file
+x^EŒK
+Ã0ñV§x'ؽ@»è"ëž@‰•Ú`dpTrýÊ«€OŸ™°"‘•zÂˊ`ÛvbÍ`í>´ªB½à*l`\]³Œã×<–‰ÂŠq9̉i©Z­rƒ¢ÕÖ {aýÊ)FôšˆÿÝ;<ã…·½¥©Ž3Eú€Ô2
\ No newline at end of file

--- p.file1 DELETED ---

[Lxr-commits] CVS: lxr/tests/bk-test-repository/BitKeeper/tmp csetcache.1270097,1.1.2.1,NONE

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/BitKeeper/tmp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/BitKeeper/tmp

Removed Files:
      Tag: bk-dev-branch
	csetcache.1270097 
Log Message:
genxref now works against the test BK repository.

--- csetcache.1270097 DELETED ---

[Lxr-commits] CVS: lxr INSTALL,1.19,1.19.2.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408

Modified Files:
      Tag: bk-dev-branch
	INSTALL 
Log Message:
genxref now works against the test BK repository.

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- INSTALL	11 Oct 2004 19:39:26 -0000	1.19
+++ INSTALL	13 Feb 2005 23:07:07 -0000	1.19.2.1
@@ -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

[Lxr-commits] CVS: lxr/tests/bk-test-repository file1,1.1.2.1,NONE

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository

Removed Files:
      Tag: bk-dev-branch
	file1 
Log Message:
genxref now works against the test BK repository.

--- file1 DELETED ---

[Lxr-commits] CVS: lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS s.ruby.c,NONE,1.1.2.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/sourcedir/subdir1/SCCS

Added Files:
      Tag: bk-dev-branch
	s.ruby.c 
Log Message:
genxref now works against the test BK repository.

--- NEW FILE: s.ruby.c ---

H23700

s 00175/00000/00000

d D 1.1 05/02/13 21:48:36 malcolm 2 1

cC

cF1

cK37571

cO-rw-rw-r--

e

s 00000/00000/00000

d D 1.0 05/02/13 21:48:36 malcolm 1 0

c BitKeeper file /Users/malcolmbox/dev/eclipse/lxr-dev/lxr-dev/tests/bk-test-repository/sourcedir/subdir1/ruby.c

cBmalcolm@serenity|ChangeSet|20050213141438|39042|47592d0dd15d5f58

cHserenity

cK20370

cPsourcedir/subdir1/ruby.c

cR375ab20a34c75bfc

cV4

cX0x921

cZ+00:00

e

u

U

f e 4

f x 0x921

t

T
x^åWmoÚHV?â_1¥U”’\Z]SÒF@zV)©
9t=¡Å^ð6f¼k®å¿ßÌ®m$i¯ê}ºDÂÞÝyyæuÇ\8tökN


˜w~Ùo“׶˜Y¾ˆ¦*ÚKv)c*´Uu¬á‹	Ô$ÃP·²uŸ_C¥zbH01þ‰Tb*1í½€ÅP…äöxEX„|Ÿ„ZÐA*³çg½AÁÝu€9	•
àeèG̎-+Õ*<lAÿ²×«Z˜ß;µ{s”°†°
CÖ®ÝD@)
’€
÷>5÷ªNé‹S¢31
f§ôfsÄi“¾Z¼9†â“ùÇXT”ø›tŽªÐjA³jùQL	å>mÁÑ	¾ÞæJ
ÍÝ9>±RVöA•È®8¨$氌È*ˆZÖåŒK­¨*¿z«5æS“G9öw`ñ“°ÇW*—>õ@–aþ‘µøxðŒuÀ3kŽ7‘‘Ò].øú”š32THԆREU¥§O½y*ƒ‡Š	&ÿ0{Qò”ÆØ䮶Iî³Ì6ø¢iÏwL³èŸ›XæÛÁ%q¤Y}UfÃ&)©µH­2ÛFƶN)í¼J©UÔɏ)#‰ÞбJŸ)Ó/B!™æ–ÕÐÓ1å÷@Ìæ!Ǿ”‰ÍÛsÞÐsúT\“0.ˆJC›>¾+Yƒ¿'·Öéó€¹qÿƒ
ópZS8ö„Ñ5Þ2BbÃZ°X°1Ê%CILöó¸ÒÛTÐíwp !º‡x¯3©R>c½œreôš1\Rëñ™f€žJ<Mç!šÐ°|gwŠmÅ£8fmɦDËs‡ÇÌ܋
8ÏgHDI背4ªe8?_•Ú¸v‡±¿íã[ó–H×[ÙÝ
OžÐ
è˜2åÑÃ×

üš7»ö7’cdJ4€¡k˜çq%È‘—°ÌÒ 7Ðéø$Â¤4ŽtïDãÏÜÓ9MÎؾ˜L0Ž¸

~
èhÍ;Fù‰¦ËÁ7ö›]òÉì8¦8MþŠ­©ƒ8S”tvOîTUáˆj¸DÅ´¡è›mÀ°ý@/°U¶¶ÂØ÷í‘Ïß¹ ò·yíÿƒÝ¥e…¶áS$i‘yàþ¬Ýè¶'¹¢•íoŠªƒ_}Ÿ­‡ß``¹ÒGOÜá8bª°š±ñƒÙݵӁ|ÝQ¹y'I8ßRuÚOünc•P]Àʎ¸»jè먕î›q½LŠËUK§ÏNé«GÑ
2wýA;Jp*C‚wn¿3j_\ö‡Pɉ‹â
8[Ð
‹&UXüè°4¶+)yðA.Ðہóqü•Ž

[Lxr-commits] CVS: lxr/lib/LXR/Files BK.pm,1.1.2.3,1.1.2.4

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/lib/LXR/Files

Modified Files:
      Tag: bk-dev-branch
	BK.pm 
Log Message:
genxref now works against the test BK repository.

Index: BK.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Attic/BK.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- BK.pm	13 Feb 2005 19:35:05 -0000	1.1.2.3
+++ BK.pm	13 Feb 2005 23:07:06 -0000	1.1.2.4
@@ -23,6 +23,7 @@
 use strict;
 use File::Spec;
 use Cwd;
+use Digest::SHA qw(sha1_hex);
 use Time::Local;
 use LXR::Common;
 
@@ -40,20 +41,87 @@
 	return $self;
 }
 
-sub insert_entry {
-	my ($newtree, $path, $entry, $curfile, $rev) = @_;
-	$$newtree{$path} = {} if !defined($$newtree{$path});
-	$newtree->{$path}{$entry} = { 'curpath' => $curfile, 'revision' => $rev };
-}
+#
+# Public interface
+#
 
 sub getdir {
 	my ($self, $pathname, $release) = @_;
 
 	$self->fill_cache($release);
+	$pathname = canonise($pathname);
 	$pathname = File::Spec->rootdir() if $pathname eq '';
 	return keys %{ $tree_cache{$release}->{$pathname} };
 }
 
+sub getfile {
+	my ($self, $pathname, $release) = @_;
+	$pathname = canonise($pathname);
+	my $fileh = $self->getfilehandle($pathname, $release);
+
+	return undef unless $fileh;
+	my $buffer = join('', $fileh->getlines);
+	close $fileh;
+	return $buffer;
+}
+
+sub getfilehandle {
+	my ($self, $pathname, $release) = @_;
+	$pathname = canonise($pathname);
+	my $fileh = undef;
+	my $dir   = getcwd();
+	chdir($self->{'rootpath'});
+	if ($self->file_exists($pathname, $release)) {
+		my $info = $self->getfileinfo($pathname, $release);
+		my $ver = $info->{'revision'};
+		my $where = $info->{'curpath'};
+		open($fileh, "bk get -p -r$ver $where 2>/dev/null |")
+		  or die "Error executing bk get";
+	}
+	chdir($dir);
+	return $fileh;
+}
+
+
+
+sub filerev {
+	my ($self, $filename, $release) = @_;
+
+	my $info = $self->getfileinfo($filename, $release);
+	return sha1_hex($info->{'curpath'}.'-'.$info->{'revision'});	
+}
+
+sub tmpfile {
+	my ($self, $filename, $release) = @_;
+	my ($tmp,  $buf);
+
+	$buf = $self->getfile($filename, $release);
+	return undef unless defined($buf);
+
+	$tmp =
+	    $config->tmpdir
+	  . '/bktmp.'
+	  . time . '.'
+	  . $$ . '.'
+	  . &LXR::Common::tmpcounter;
+	open(TMP, "> $tmp") || return undef;
+	print(TMP $buf);
+	close(TMP);
+
+	return $tmp;
+}
+
+
+#
+# Private interface
+#
+
+sub insert_entry {
+	my ($newtree, $path, $entry, $curfile, $rev) = @_;
+	$$newtree{$path} = {} if !defined($$newtree{$path});
+	$newtree->{$path}{$entry} = { 'curpath' => $curfile, 'revision' => $rev };
+}
+
 sub fill_cache {
 	my ($self, $release) = @_;
 	
@@ -76,7 +144,7 @@
 			($vol, $path, $file) =
 			  File::Spec->splitpath(
 				File::Spec->catdir(File::Spec->splitdir($path)));
-			insert_entry(\%newtree, $path, $file);
+			insert_entry(\%newtree, $path, $file.'/');
 		}
 	}
 
@@ -108,23 +176,6 @@
 	return @files;
 }
 
-sub getfilehandle {
-	my ($self, $pathname, $release) = @_;
-	$pathname = canonise($pathname);
-	my $fileh = undef;
-	my $dir   = getcwd();
-	chdir($self->{'rootpath'});
-	if ($self->file_exists($pathname, $release)) {
-		my $info = $self->getfileinfo($pathname, $release);
-		my $ver = $info->{'revision'};
-		my $where = $info->{'curpath'};
-		open($fileh, "bk get -p -r$ver $where 2>/dev/null |")
-		  or die "Error executing bk get";
-	}
-	chdir($dir);
-	return $fileh;
-}
-
 sub canonise {
 	my $path = shift;
 	$path =~ s!^/!!;
@@ -151,33 +202,3 @@
 }
 	
 
-sub getfile {
-	my ($self, $pathname, $release) = @_;
-	$pathname = canonise($pathname);
-	my $fileh = $self->getfilehandle($pathname, $release);
-
-	return undef unless $fileh;
-	my $buffer = join('', $fileh->getlines);
-	close $fileh;
-	return $buffer;
-}
-
-sub tmpfile {
-	my ($self, $filename, $release) = @_;
-	my ($tmp,  $buf);
-
-	$buf = $self->getfile($filename, $release);
-	return undef unless defined($buf);
-
-	$tmp =
-	    $config->tmpdir
-	  . '/bktmp.'
-	  . time . '.'
-	  . $$ . '.'
-	  . &LXR::Common::tmpcounter;
-	open(TMP, "> $tmp") || return undef;
-	print(TMP $buf);
-	close(TMP);
-
-	return $tmp;
-}

[Lxr-commits] CVS: lxr/tests/bk-test-repository/sourcedir/SCCS s.main.c,NONE,1.1.2.1 s.cobol.c,NONE,1.1.2.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/SCCS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests/bk-test-repository/sourcedir/SCCS

Added Files:
      Tag: bk-dev-branch
	s.main.c s.cobol.c 
Log Message:
genxref now works against the test BK repository.

--- NEW FILE: s.main.c ---

H28894

s 00572/00000/00000

d D 1.1 05/02/13 21:48:10 malcolm 2 1

cC

cF1

cK29312

cO-rw-rw-r--

e

s 00000/00000/00000

d D 1.0 05/02/13 21:48:10 malcolm 1 0

c BitKeeper file /Users/malcolmbox/dev/eclipse/lxr-dev/lxr-dev/tests/bk-test-repository/sourcedir/main.c

cBmalcolm@serenity|ChangeSet|20050213141438|39042|47592d0dd15d5f58

cHserenity

cK19862

cPsourcedir/main.c

cR39b04783548e3a17

cV4

cX0x921

cZ+00:00

e

u

U

f e 4

f x 0x921

t

T
x^µ[{sÛF’¯üI~Š1ýd‰z$›ÛµWÎQe³–"U$e_.N¡@` â\¨Ç&þî×ÝóÀ
¢+
?/öÖ+i<Taž™R.P3!GÁ7%ƒ(ˆÈʼn²òsmj‚I{g¿­±>¯Îúì|0ìO±ãyœÉu®¥•»‹Nk‡-×°?¹ó²ä@>‡$e¦ü!”^wï‘>,)3
-@9)hP),1ÿìÏÞm#çqòˆ}ì}ê{§Ãñé?ÚϙÕ4\ô½ÐÆ; ʑÙsÆÓ0ŽÚÏy"øæ¬)M*Û¦?Oe»$WÒbi
ITS5ÔéW}eaœƒ!³ü	îçÁ–Iª†Öu.†j͕Uö.z(ªæfbþó(ü=*i€>×
~O
[ˆÆUšq¶IÒ³i–d,OÔ	ù|
Ž¨c5Ýð‡»,«æ+-ي\xµ1ç~m¢öÁتéEït2–^TÁn
ÌOœ[?Ys·Õrg
1ï:À$Yzíªv|̇.û‰u:ì-눎kˆžõf=vÖ?Œ³ÁxDäƙ@ï«ßˆ–ô÷»Rü5(¸xǾ‚«*üD°cv°K?ìë;³‰ê~¨#3	XÃÀƒ\ £~Îv>õ'äҎYç|Q/'ã“Þ…7ê]ô;åW蜂´Ð²é<¸ÂÂú´GÉkcsÙBöd¦÷®fèe$ùw–&õœ_NQ/8ÏÆ´k-
ém€
>ƒ¥gy?-À9öºägŽ#ÉÝw›ôk&h+ßv›Å!óÃP©Ùi·$-cç8-´id«Ò-M¦gnö“-ÝöoèR•=»2º¿9–´ßÙ]D»èC¥‹(a—„Gû«Y‡ÖT,θ
…ßž»òÛ}Ak/'&[®ë¶[–bf“«¾ÔÎ!(•Fš¯ˆNÎo|فWuë𕹿\Œe¸hÂ/4zk–‚tâxi'ì.Ö,èSQˆ9šˆ‡æ¤
Ò4°<žç™8Ÿ{“Ñ`ôýÎ.û“ÉxŠ	ü4Í
-,"7³²£/—âK§³k¤”ŒÚk·”?“’íÐv|×nA"
9±ãÐw±Õu5j@4 ¡eÖ¤9{ïC/•ÆëvhÂ
b¬ÝBŽÍÃô8W’Ê­Û)e·lw&A ZË楦¸ 0`6M×3@xEeÄïi\Ô8»H’4²1rî9 ¿õÒáh1Ü$¢lþûq£ëSB|ÂàÃÍÅ¥™ªïNˆ…ÝùNjâk»?A’Á‘BÛ@Zò«
tÉ_œ'@Wzv>˜Lg.n·jŸÕÙ®o„Êb>ÇIøy¨¥ý§½#Vx¾ËSízQ&
<aAbrÇåáhûx ÓøÁí,lf-8}ª€4L17Œ(Š„
y\€ôK~þ<žáÙHgSÛ&eg¥Ô¤­dT8ËlÍ¿
ގÞ!–°'ë¨â#H»ÂTFêí§a­“ŸcY¶Ú¶m}ŽlNµÀόiP¬³Ø' ½I,&²xˇqzS¦Ù"Þò|N³G¾Œb¸L–Q©jžånÜ/icþLžéS–ZÁã„
ì¶ÑÔ&,i@l¹‚C=l˜Æ̾Fg3ì™ÃM™,4žk,
Aਖ਼£vÓµ¬HA˜m&EÖ`•ÙîWç9Ö¨K<›1ã«ÙåÕÌ»ìÍ>zÓþeoқ'uº”A™)îNG1:iõd¦šQiZc§“*ݍA£®SåÑÿ”¶u;J7(_9x]MXU§•Ðnž§Q6®4ƒ_„t°dþJ|÷_ëƒV£i°_‰üõQ{<ÿéæ¨Å¶Ç
Æçþ™W9ÐM¯ô‡Î.˜%LËZ°ä¶Æ(A-ÖQÃUq±'^N–æÜm;¹þ=•Õù´$RqFœ!Ì,Ïa3DzƯIÉöÞÇbú°œgI%œŸe\±C<î÷„¢aùÓ­œŸQyóûXHù›Å,£èËVÔoYöØʦ\ 	8
>²¶R+…ŽÅ(˗~BÙÞãJYñ öx»N,™èF±nc”M$«¬æ¢7ºê
½ÃñÉ	(ïq„ëMÖ˯›pîç×OAøܙ¬Â =9ErQ#§åÐÚ&—ô?›Þ"~V•ƒ"÷Sáý6–°L€%T'ÀV!®È–¼ ëÅb
[
·±]‰-ԃ2x3”¢ òÍÑj«ÞtQ}:|ÜZ5˜ E#°ZžIô,÷"ûfôbŇHfïixê[Gï2yí‚ÜZQ”¬ÅçnB*Ák€67«ëÙ0^û€?Ž,BÏÿ®†@Oڳܳ\±¼–j“\„ÎÜô؆ÄM»q=ĺ`³S‘­xÄ)– 
¹Š¬}†¬n Qšd³Ë)óVx//›ˆ’̹Î{³Þp[ÆE:'…›|˨æÝSV€»T‹ßŠT¡ŒöÏc8ØL
èá>…‘ÍŒ¾{½O½Á°w2ìÓe8=𠎩«èwŠÏL즣ux@ÿÊ%
gbzÌô(ÓfÚ?häÁ‚ƒ¯¿«÷½BÖÖ
HCæëH…(z%ŜWs*×XÊq ¥c½5aop}øݕ…ùJKÉD,—
¼¥®¹OÕÒÑû
ât¡oÙÕNPR«
oò
Ø©š«ö
pTFŠƒ®®4¯AÇûÂEíÒ¨ÚC£/ùb¿d
Ÿµ¦p^ålŽá(`Îë/éë]òCh¶Ú.L.a„7€¾|–clބ7ˤMÝ[q®EýÖÊÜFý:ivǔ(¨ŽïŠÎ#kBåöx¯¯W
ñ–F™Ž½«Ñt<™õÏLN²)J©9Ӗ¥\s)Þv¨6W8:²pÔÆ÷U =ªƒö@[s‡È_eŸÍ:’ðÐBžõO®>lBŽ£Gûã…ýÚÀ“µÄAœÚðKÿž6t)JY"'¸ôo(zUÏ”±h—§|¢½Üï•Â?–jZÉ)G×è¨w#Eă_™ qLOtJn
t Ñ¯
ý%
uæyët-xèyÅ`W•vàËm™²i¿Æ°]˜ ðébJ,Ê°›s|…Äåswâ±ã—twü[½^8±…»Ó¥{ª–ÑKV܃ý1³	©Jü+)4þBº:I­¼¤U¼è9ô_‹„éë‚Ýeù
±@Œ
Ã#±Žóºæ<
èí¸¶²Óg0~eJA­çõ/þËóh’gÖW“ßOË¡Q
ËrmSë%uå`³ôÐl&.âùäj0<ó..?{³ñx(ß?"s)-´Ç!l=á Á‹Syñm
^m±é›	oÞ¨
Á‚7~ÍïK‰©–?àÓ-éyãLÚcèÃ2 „|Å»A:Xô1Y¤·Y@Ï^Hq±ŸÀ^ºôs¬'VzL!AµÓeÛi–Fñ5$8j›îHч3¬¤Dx°]¶ôQ´Š¦ÒvVꢔy‚I­X¶8¥(¿^U«…[êøçMÿÏæghC;&½€ŸpyÝQ2ÇÎ)µ¡7jîW®ª¹S®¦¹
Áóæ>ÂFµ‹úäæÁŠßÔIõ@Wrnã·øâ`'ŠluüW&qTÜÅa±8þá-jè»>;j7`‡øé°ý¿ïQv
--- NEW FILE: s.cobol.c ---

H59550

s 00050/00000/00000

d D 1.1 05/02/13 21:47:54 malcolm 2 1

cC

cF1

cK53974

cO-rw-rw-r--

e

s 00000/00000/00000

d D 1.0 05/02/13 21:47:54 malcolm 1 0

c BitKeeper file /Users/malcolmbox/dev/eclipse/lxr-dev/lxr-dev/tests/bk-test-repository/sourcedir/cobol.c

cBmalcolm@serenity|ChangeSet|20050213141438|39042|47592d0dd15d5f58

cHserenity

cK08846

cPsourcedir/cobol.c

cR97ec8a55cf04e8a6

cV4

cX0x921

cZ+00:00

e

u

U

f e 4

f x 0x921

t

T
x^•UmoÚ0V?6¿â”õÐðÖµÚÆÄ$˖DȤ­0É$Nb)$‘íôe¥ÿ}¶-ë:­EÂwöŸçîìsl8ÑÚ
­

8Òªf^ÜR'jA]nê4åN†•ïg‚W˜ò­÷<!X^Ò

[Lxr-commits] CVS: lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8852/tests/bk-test-repository/sourcedir/subdir1/SCCS

Log Message:
Directory /cvsroot/lxr/lxr/tests/bk-test-repository/sourcedir/subdir1/SCCS added to the repository