Backing out previous checkin.

This commit is contained in:
cls%seawood.org 2001-03-25 23:53:37 +00:00
parent ca068b563d
commit 176d0306a5
3 changed files with 18 additions and 23 deletions

View File

@ -374,16 +374,14 @@ sub print_ci {
my $log = &html_log($ci->[$::CI_LOG]);
my $rev = $ci->[$::CI_REV];
my $ci_branch = $ci->[$::CI_BRANCH];
$ci_branch = 'HEAD' if ($ci_branch eq '');
print "<tr>\n";
print "<TD width=2%>${sm_font_tag}$t</font>";
print "<TD width=2%><a href='$registryurl/who.cgi?email=$ci->[$::CI_WHO]'"
. " onClick=\"return js_who_menu('$ci->[$::CI_WHO]','',event);\" >"
. "$ci->[$::CI_WHO]</a>\n";
print "<TD width=45%><a href='cvsview2.cgi?subdir=$ci->[$::CI_DIR]&files=$ci->[$::CI_FILE]\&command=DIRECTORY&branch=$ci_branch&root=$::CVS_ROOT'\n"
. " onclick=\"return js_file_menu('$::CVS_ROOT', '$ci->[$::CI_DIR]','$ci->[$::CI_FILE]','$ci->[$::CI_REV]','$ci_branch',event)\">\n";
print "<TD width=45%><a href='cvsview2.cgi?subdir=$ci->[$::CI_DIR]&files=$ci->[$::CI_FILE]\&command=DIRECTORY&branch=$::query_branch&root=$::CVS_ROOT'\n"
. " onclick=\"return js_file_menu('$::CVS_ROOT', '$ci->[$::CI_DIR]','$ci->[$::CI_FILE]','$ci->[$::CI_REV]','$::query_branch',event)\">\n";
# if( (length $ci->[$::CI_FILE]) + (length $ci->[$::CI_DIR]) > 30 ){
# $d = $ci->[$::CI_DIR];
# if( (length $ci->[$::CI_DIR]) > 30 ){

View File

@ -40,7 +40,7 @@ my $lock = lock_datafile($tree);
# Grab globals for this tree:
# $cvs_module: The checkout module
# $cvs_branchlist: List of branches for this module
# $cvs_branch: The current branch
# $cvs_root: The path to the cvs root
# $bonsai_tree: The data directory for this tree in ../bonsai
#
@ -85,7 +85,7 @@ sub lock_datafile {
my ($tree) = @_;
my $lock_fh = new FileHandle ">>$tree/buildwho.sem"
or die "Couldn't open semaphore file! $tree/buildwho.sem";
or die "Couldn't open semaphore file!";
# Get an exclusive lock with a non-blocking request
unless (flock($lock_fh, LOCK_EX|LOCK_NB)) {
@ -107,28 +107,26 @@ sub build_who {
print "Minimum date: $query_date_min\n" if $F_DEBUG;
$query_module=$cvs_module;
$query_branch=$cvs_branch;
my $who_file = "$tree/who.dat";
my $temp_who_file = "$who_file.$$";
open(WHOLOG, ">$temp_who_file");
chdir "../bonsai";
$::TreeID = $bonsai_tree;
my $result = &query_checkins(%mod_map);
$query_module=$cvs_module;
foreach $query_branch (split(/\s+/,$cvs_branchlist)) {
my $result = &query_checkins(%mod_map);
$last_who='';
$last_date=0;
for $ci (@$result) {
if ($ci->[$CI_DATE] != $last_date or $ci->[$CI_WHO] ne $last_who) {
print WHOLOG "$ci->[$CI_DATE]|$ci->[$CI_WHO]\n";
}
$last_who=$ci->[$CI_WHO];
$last_date=$ci->[$CI_DATE];
$last_who='';
$last_date=0;
for $ci (@$result) {
if ($ci->[$CI_DATE] != $last_date or $ci->[$CI_WHO] ne $last_who) {
print WHOLOG "$ci->[$CI_DATE]|$ci->[$CI_WHO]\n";
}
$last_who=$ci->[$CI_WHO];
$last_date=$ci->[$CI_DATE];
}
close (WHOLOG);
chdir "../tinderbox";

View File

@ -118,8 +118,7 @@ sub create_tree {
$treename = $form{'treename'};
my $repository = $form{'repository'};
$modulename = $form{'modulename'};
@branchlist = split(' ', $form{'branchname'});
@branchlist = ('HEAD') if (!$#branchlist);
$branchname = $form{'branchname'};
if( -r $treename ){
chmod 0777, $treename;
@ -129,7 +128,7 @@ sub create_tree {
}
open( F, ">$treename/treedata.pl" );
print F "\$cvs_module='$modulename';\n";
print F "\$cvs_branchlist='@branchlist';\n";
print F "\$cvs_branch='$branchname';\n";
if ($repository ne "") {
print F "\$cvs_root='$repository';\n";
}