Menu
▾
▴
sandweb-commit — CVS activity
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(28) |
Nov
(58) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(125) |
Feb
(222) |
Mar
(274) |
Apr
(51) |
May
(22) |
Jun
(50) |
Jul
(15) |
Aug
(33) |
Sep
(11) |
Oct
(29) |
Nov
(17) |
Dec
(1) |
| 2003 |
Jan
(100) |
Feb
(21) |
Mar
(7) |
Apr
(45) |
May
|
Jun
(43) |
Jul
(27) |
Aug
(24) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(1) |
Feb
|
Mar
(13) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: Rob H. <for...@us...> - 2002-06-24 20:28:37
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv2537/bin
Modified Files:
sandweb-expect
Log Message:
added error checking for invalid vcs or system username/password
Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- sandweb-expect 5 Jun 2002 06:32:17 -0000 1.6
+++ sandweb-expect 24 Jun 2002 20:28:32 -0000 1.7
@@ -22,11 +22,21 @@
expect {
"Password:" { send "$system_password\r" }
- eof { send_user "Unexpected EOF\r\n" }
+ eof {
+ send_user "Unexpected EOF\r\n"
+ exit 3
+ }
}
expect {
"password:" { send "$vcs_password\r" }
+ "Sorry." {
+ send "Invalid system username/password\r"
+ exit 1
+ }
"Are you sure" { send "yes\r" }
- eof { send_user "Unexpected EOF\r\n" }
+ eof {
+ send_user "Unexpected EOF\r\n"
+ exit 3
+ }
}
@@ -42,5 +52,15 @@
expect {
"Password:" { send "$system_password\r" }
- eof { send_user "Unexpected EOF\r\n" }
+ eof {
+ send_user "Unexpected EOF\r\n"
+ exit 3
+ }
+ }
+
+ expect {
+ "Sorry." {
+ send "Invalid system username/password\r"
+ exit 1
+ }
}
}
@@ -55,5 +75,19 @@
"password:" { send "$vcs_password\r" }
"Are you sure" { send "yes\r" }
- eof { send_user "Unexpected EOF\r\n" }
+ eof {
+ send_user "Unexpected EOF\r\n"
+ exit 3
+ }
+ }
+ expect {
+ "Are you sure" { send "yes\r" }
+ "Permission denied" {
+ send "Invalid VCS username/password\r"
+ exit 2
+ }
+ eof {
+ send_user "Unexpected EOF\r\n"
+ exit 3
+ }
}
}
|
|
From: Rob H. <for...@us...> - 2002-06-19 22:06:35
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv8501/bin
Modified Files:
sandweb.cgi
Log Message:
oops, rolling back. We *do* need PREVIOUS_URL there so checkout will work.
need to find a better way to control these kinds of things. for now, i'm
not going to complicate it by hacking it up.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.302
retrieving revision 1.303
diff -U2 -r1.302 -r1.303
--- sandweb.cgi 19 Jun 2002 22:05:25 -0000 1.302
+++ sandweb.cgi 19 Jun 2002 22:06:32 -0000 1.303
@@ -1550,5 +1550,5 @@
my $repo_name = $args{'repo_name'};
- my $main_window_url = "$ENV{'HTTP_REFERER'}";
+ my $main_menu_url = "$ENV{'HTTP_REFERER'}";
my @filename = ();
@@ -1566,5 +1566,5 @@
MODULE_NAME => $module_name,
REPO_NAME => $repo_name,
- MAIN_WINDOW_URL => $main_window_url,
+ MAIN_WINDOW_URL => $main_menu_url,
);
print $cgi->header( -cookie => $ck_auth );
@@ -2349,4 +2349,5 @@
MENU_TITLE => 'SandWeb',
SUBMENU_TITLE => "vcs output",
+ PREVIOUS_URL => "$progname?action=sandbox",
FOOTER => '',
CONTENT => $content,
|
|
From: Rob H. <for...@us...> - 2002-06-19 22:05:28
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv8129/bin
Modified Files:
sandweb.cgi
Log Message:
updating from the sandbox_menu shouldn't require the main window to be
updated. There's no way an update can change that, only a checkout.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.301
retrieving revision 1.302
diff -U2 -r1.301 -r1.302
--- sandweb.cgi 19 Jun 2002 22:00:40 -0000 1.301
+++ sandweb.cgi 19 Jun 2002 22:05:25 -0000 1.302
@@ -1550,5 +1550,5 @@
my $repo_name = $args{'repo_name'};
- my $main_menu_url = "$ENV{'HTTP_REFERER'}";
+ my $main_window_url = "$ENV{'HTTP_REFERER'}";
my @filename = ();
@@ -1566,5 +1566,5 @@
MODULE_NAME => $module_name,
REPO_NAME => $repo_name,
- MAIN_WINDOW_URL => $main_menu_url,
+ MAIN_WINDOW_URL => $main_window_url,
);
print $cgi->header( -cookie => $ck_auth );
@@ -2349,5 +2349,4 @@
MENU_TITLE => 'SandWeb',
SUBMENU_TITLE => "vcs output",
- PREVIOUS_URL => "$progname?action=sandbox",
FOOTER => '',
CONTENT => $content,
|
|
From: Rob H. <for...@us...> - 2002-06-19 22:00:45
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory usw-pr-cvs1:/tmp/cvs-serv6350/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: SandWeb::Repository now returns "output" and "error", where "error" is an error message, not an error code. If there is no error message, everything went fine. If there is, it should be displayed to the user ( the error code from the shell is inside the error message ). This eliminates the annoyance of dealing with 1 being a good error code in Perl and 0 being a good error code in the Unix shell. Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -U2 -r1.26 -r1.27 --- cvs.pm 19 Jun 2002 08:04:31 -0000 1.26 +++ cvs.pm 19 Jun 2002 22:00:41 -0000 1.27 @@ -671,5 +671,5 @@ %return = ( - output => "$output", + output => join(//,@output_lines), ); |
|
From: Rob H. <for...@us...> - 2002-06-19 22:00:44
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv6350/bin
Modified Files:
sandweb.cgi
Log Message:
SandWeb::Repository now returns "output" and "error", where "error" is an error
message, not an error code.
If there is no error message, everything went fine. If there is, it should be
displayed to the user ( the error code from the shell is inside the error message ).
This eliminates the annoyance of dealing with 1 being a good error code in Perl and 0 being a good error code in the Unix shell.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.300
retrieving revision 1.301
diff -U2 -r1.300 -r1.301
--- sandweb.cgi 19 Jun 2002 21:39:12 -0000 1.300
+++ sandweb.cgi 19 Jun 2002 22:00:40 -0000 1.301
@@ -2321,8 +2321,8 @@
$log->debug('dump', \%return);
- if (! $return{'errorlevel'}) {
+ if ($return{'errorlevel'}) {
# vcs action failed
$log->debug("failed checkout/update of module '$module_name'\n");
- set_message("failed checking out module '$module_name'\n");
+ set_message("failed checkout/update of module '$module_name'\n");
} else {
my $return = write_config();
|
|
From: Rob H. <for...@us...> - 2002-06-19 21:39:15
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv32653/bin
Modified Files:
sandweb.cgi
Log Message:
oops, forgot to check in important change
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.299
retrieving revision 1.300
diff -U2 -r1.299 -r1.300
--- sandweb.cgi 13 Jun 2002 21:12:36 -0000 1.299
+++ sandweb.cgi 19 Jun 2002 21:39:12 -0000 1.300
@@ -708,4 +708,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log_obj' => $log,
);
@@ -945,5 +946,7 @@
# selected repository data
- my $repository = SandWeb::Repository->new();
+ my $repository = SandWeb::Repository->new(
+ 'log_obj' => $log,
+ );
my @connections = $repository->get_connections();
@@ -1100,5 +1103,7 @@
$log->debug("creating Repository object");
- my $repository = SandWeb::Repository->new();
+ my $repository = SandWeb::Repository->new(
+ 'log_obj' => $log,
+ );
my @vcs_commands = $repository->get_vcs_commands();
@@ -2063,4 +2068,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log_obj' => $log,
);
@@ -2297,4 +2303,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log_obj' => $log,
);
@@ -2598,4 +2605,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log_obj' => $log,
);
@@ -2779,4 +2787,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log_obj' => $log,
);
|
|
From: Rob H. <for...@us...> - 2002-06-19 08:04:39
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv12041/lib/SandWeb
Modified Files:
Shell.pm
Log Message:
finally! added decent error checking ( it has been lacking since the post-ALPHA
addition of sandweb-expect and the Shell class ).
I expanded on the error reporting method I used back when cvs.pm made it's
own calls to the shell ... Shell returns a hash containing "output" and "error"
to cvs, cvs passes it to Repository, Repository gives it to the CGI, which
assigns the VCS_OUTPUT and VCS_ERROR template variables accordingly ( VCS_ERROR
uses a glaring red font in the vcs_output.html template ).
This along with the better debugging should give us much more info when
trying to figure out why VCS actions aren't working.
Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- Shell.pm 19 Jun 2002 07:19:04 -0000 1.15
+++ Shell.pm 19 Jun 2002 08:04:28 -0000 1.16
@@ -79,4 +79,8 @@
my %args = @_;
+ # error variable, so we have something to pass back if there are
+ # any problems
+ my $error;
+
# sandweb-expect is an Expect script that handles username/password
# authentication for SandWeb
@@ -130,8 +134,21 @@
}
$output = `$command 2>&1`;
+ $error = $?;
}
$output =~ s/\r/\n/g;
- return $output;
+ my $error_message;
+ if ($error) {
+ $error_message = "An error occurred. A call to the shell gave us this error code : $error\n";
+ } else {
+ $error_message = '';
+ }
+
+ my %return = (
+ output => "$output",
+ error => "$error_message",
+ );
+
+ return %return;
}
|
|
From: Rob H. <for...@us...> - 2002-06-19 08:04:39
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv12041/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
finally! added decent error checking ( it has been lacking since the post-ALPHA
addition of sandweb-expect and the Shell class ).
I expanded on the error reporting method I used back when cvs.pm made it's
own calls to the shell ... Shell returns a hash containing "output" and "error"
to cvs, cvs passes it to Repository, Repository gives it to the CGI, which
assigns the VCS_OUTPUT and VCS_ERROR template variables accordingly ( VCS_ERROR
uses a glaring red font in the vcs_output.html template ).
This along with the better debugging should give us much more info when
trying to figure out why VCS actions aren't working.
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- cvs.pm 19 Jun 2002 07:19:04 -0000 1.25
+++ cvs.pm 19 Jun 2002 08:04:31 -0000 1.26
@@ -112,20 +112,8 @@
$log->debug("File: $file");
}
- my $output = $self->shell(
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -147,14 +135,8 @@
if ($type == "text") { push @param, " -kkv -MMERGE" };
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
+ my %return = $self->shell(
+ 'param' => join('', @param),
+ 'file' => "$file",
+ );
return %return;
@@ -181,20 +163,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -222,20 +193,9 @@
$log->debug("File: $file");
}
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -262,4 +222,5 @@
my $output;
+ my %return;
if (!$message) {
@@ -272,5 +233,5 @@
$log->debug("File: $file");
}
- $output = $self->shell(
+ %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
@@ -278,16 +239,9 @@
};
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
+ if ($output) {
+ %return = (
+ output => "$output",
+ );
+ }
return %return;
@@ -320,15 +274,11 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $raw_output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
+ my $raw_output = $return{'output'};
my $diff = SandWeb::Diff->new(
@@ -340,5 +290,4 @@
my %return = (
output => $output,
- errorlevel => $errorlevel,
);
@@ -364,20 +313,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -400,20 +338,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -433,20 +360,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -466,20 +382,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -499,20 +404,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -539,20 +433,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -568,20 +451,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -604,20 +476,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel
- );
return %return;
@@ -645,20 +506,9 @@
$log->debug("File: $file");
}
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel
- );
return %return;
@@ -684,20 +534,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -730,20 +569,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel
- );
return %return;
@@ -766,20 +594,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -817,17 +634,13 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $raw_output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
- my @lined_output = split(/\n/, $raw_output);
+ my $raw_output = $return{'output'};
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
+ my @lined_output = split(/\n/, $raw_output);
foreach my $line (@lined_output) {
@@ -857,9 +670,8 @@
}
- my %return = (
- output => join('', @output_lines),
- errorlevel => $errorlevel
+ %return = (
+ output => "$output",
);
-
+
return %return;
}
@@ -885,20 +697,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel,
- );
return %return;
@@ -921,20 +722,9 @@
$log->debug("Params: @param");
$log->debug("File: $file");
- my $output = $self->shell(
+
+ my %return = $self->shell(
'param' => join('', @param),
'file' => "$file",
);
- my $errorlevel = $?;
-
- if ( $errorlevel == 0 ) {
- $errorlevel = 1;
- } else {
- $errorlevel = 0;
- }
-
- my %return = (
- output => $output,
- errorlevel => $errorlevel
- );
return %return;
@@ -987,9 +777,9 @@
);
- my $output = $shell->execute(
+ my %return = $shell->execute(
'command' => "cd $sandbox && CVS_RSH=$ssh_bin && export CVS_RSH && $cvs_bin -q -d $root $param \'$file\'",
);
- return $output;
+ return %return;
}
|
|
From: Rob H. <for...@us...> - 2002-06-19 07:19:06
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv30079/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
explicit check for the existence of the reference to the log object in some
places, so that the tests will run.
There must be a better way, maybe we can create the log object in the test
and pass it to the Repository object?
Not critical, would be nice though.
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- cvs.pm 19 Jun 2002 07:09:00 -0000 1.24
+++ cvs.pm 19 Jun 2002 07:19:04 -0000 1.25
@@ -107,7 +107,9 @@
if ($message) { push @param, " -m $message" };
- $log->debug("Performing add operation");
- $log->debug("Params: @param");
- $log->debug("File: $file");
+ if ($log) {
+ $log->debug("Performing add operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
+ }
my $output = $self->shell(
'param' => join('', @param),
@@ -215,7 +217,9 @@
if ($date) { push @param, " $date" };
- $log->debug("Performing checkout operation");
- $log->debug("Params: @param");
- $log->debug("File: $file");
+ if ($log) {
+ $log->debug("Performing checkout operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
+ }
my $output = $self->shell(
'param' => join('', @param),
@@ -263,7 +267,9 @@
} else {
push @param, " -m \"$message\"";
- $log->debug("Performing commit operation");
- $log->debug("Params: @param");
- $log->debug("File: $file");
+ if ($log) {
+ $log->debug("Performing commit operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
+ }
$output = $self->shell(
'param' => join('', @param),
@@ -634,7 +640,9 @@
if ($recurse) { push @param, " -R" };
- $log->debug("Performing remove operation");
- $log->debug("Params: @param");
- $log->debug("File: $file");
+ if ($log) {
+ $log->debug("Performing remove operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
+ }
my $output = $self->shell(
'param' => join('', @param),
@@ -965,5 +973,7 @@
}
- $log->debug("Creating Shell object");
+ if ($log) {
+ $log->debug("Creating Shell object");
+ }
my $shell = SandWeb::Shell->new(
'vcs_username' => "$vcs_username",
|
|
From: Rob H. <for...@us...> - 2002-06-19 07:19:06
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv30079/lib/SandWeb
Modified Files:
Shell.pm Repository.pm
Log Message:
explicit check for the existence of the reference to the log object in some
places, so that the tests will run.
There must be a better way, maybe we can create the log object in the test
and pass it to the Repository object?
Not critical, would be nice though.
Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- Shell.pm 19 Jun 2002 07:09:00 -0000 1.14
+++ Shell.pm 19 Jun 2002 07:19:04 -0000 1.15
@@ -92,6 +92,8 @@
my $command = $args{'command'};
- $log->debug("VCS call to Unix shell");
- $log->debug("VCS command is : $command");
+ if ($log) {
+ $log->debug("VCS call to Unix shell");
+ $log->debug("VCS command is : $command");
+ }
my $output;
@@ -124,5 +126,7 @@
$output = join('', @lined_output);
} else {
- $log->debug("Not using VCS username/password");
+ if ($log) {
+ $log->debug("Not using VCS username/password");
+ }
$output = `$command 2>&1`;
}
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -U2 -r1.45 -r1.46
--- Repository.pm 19 Jun 2002 07:10:02 -0000 1.45
+++ Repository.pm 19 Jun 2002 07:19:04 -0000 1.46
@@ -134,7 +134,9 @@
}
}
-
- $log->debug("Performing add operation");
- $log->debug("Params: @params");
+
+ if ($log) {
+ $log->debug("Performing add operation");
+ $log->debug("Params: @params");
+ }
my %return = $self->call_vcs(
command => 'add',
@@ -245,6 +247,8 @@
}
- $log->debug("Performing checkout operation");
- $log->debug("Params: @params");
+ if ($log) {
+ $log->debug("Performing checkout operation");
+ $log->debug("Params: @params");
+ }
my %return = $self->call_vcs(
command => 'checkout',
@@ -289,6 +293,8 @@
}
- $log->debug("Performing commit operation");
- $log->debug("Params: @params");
+ if ($log) {
+ $log->debug("Performing commit operation");
+ $log->debug("Params: @params");
+ }
my %return = $self->call_vcs(
command => 'commit',
@@ -599,6 +605,8 @@
}
- $log->debug("Performing remove operation");
- $log->debug("Params: @params");
+ if ($log) {
+ $log->debug("Performing remove operation");
+ $log->debug("Params: @params");
+ }
my %return = $self->call_vcs(
command => 'remove',
|
|
From: Rob H. <for...@us...> - 2002-06-19 07:12:55
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv28462/lib/SandWeb Modified Files: Log.pm Log Message: adding comments at the top Index: Log.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Log.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -U2 -r1.11 -r1.12 --- Log.pm 19 Jun 2002 07:08:59 -0000 1.11 +++ Log.pm 19 Jun 2002 07:12:52 -0000 1.12 @@ -2,5 +2,4 @@ # # This class allows us to have a standardized method for logging and debugging. -# It's possible to print messages to the screen as well as to a log file. # # SandWeb (Web-based VCS client) |
|
From: Rob H. <for...@us...> - 2002-06-19 07:10:05
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv27739/lib/SandWeb
Modified Files:
Repository.pm
Log Message:
log was declared twice in one place, -w fodder
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -U2 -r1.44 -r1.45
--- Repository.pm 19 Jun 2002 07:09:00 -0000 1.44
+++ Repository.pm 19 Jun 2002 07:10:02 -0000 1.45
@@ -466,5 +466,4 @@
my $repo_type = $self->get_repo_type();
my $log = $self->get_log();
- my $log = $self->get_log();
my $file = $args{'file'};
|
|
From: Rob H. <for...@us...> - 2002-06-19 07:09:02
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv27419/lib/SandWeb Modified Files: UI.pm Log.pm Auth.pm Diff.pm Browse.pm Repository.pm Shell.pm File.pm Log Message: added comments to the top of every class Index: UI.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -U2 -r1.35 -r1.36 --- UI.pm 28 Mar 2002 06:39:41 -0000 1.35 +++ UI.pm 19 Jun 2002 07:08:59 -0000 1.36 @@ -1,4 +1,5 @@ # SandWeb User Interface Class # +# This class is currently a front-end to our templating system, HTML::Template # # SandWeb (Web-based VCS client) Index: Log.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Log.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -U2 -r1.10 -r1.11 --- Log.pm 10 Mar 2002 01:56:05 -0000 1.10 +++ Log.pm 19 Jun 2002 07:08:59 -0000 1.11 @@ -1,4 +1,6 @@ # SandWeb logging facility # +# This class allows us to have a standardized method for logging and debugging. +# It's possible to print messages to the screen as well as to a log file. # # SandWeb (Web-based VCS client) Index: Auth.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -U2 -r1.21 -r1.22 --- Auth.pm 18 Mar 2002 21:07:58 -0000 1.21 +++ Auth.pm 19 Jun 2002 07:08:59 -0000 1.22 @@ -1,5 +1,6 @@ #lib/SandWeb/Auth.pm # -# the login class. +#This class handles logins using modules. A module will return true if the user +#is authentic, false if not. # # SandWeb (Web-based VCS client) Index: Diff.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Diff.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- Diff.pm 12 Apr 2002 20:23:03 -0000 1.7 +++ Diff.pm 19 Jun 2002 07:08:59 -0000 1.8 @@ -1,2 +1,10 @@ +#SandWeb Diff Class +# +#This class will eventually implement "diff" functionality for SandWeb. This +#will give us VCS-independant formatting of diffs, and will also give us the +#ability to do nicely-formatted, side-by-side colorized diffs. +# +#At the moment, all this class does is colorize any "unified format" diff +#given to it. # # SandWeb (Web-based VCS client) Index: Browse.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v retrieving revision 1.76 retrieving revision 1.77 diff -U2 -r1.76 -r1.77 --- Browse.pm 18 Mar 2002 05:17:38 -0000 1.76 +++ Browse.pm 19 Jun 2002 07:08:59 -0000 1.77 @@ -1,5 +1,12 @@ #lib/SandWeb/Browse.pm # -# the browse class. +#This class handles all filesystem and sandbox browsing functionality. It +#can show the user a list of files, allow the user to perform abitrary +#actions on any number of files, and allows you to view the contents of +#specific files. +# +#All filesystem and VCS operations are handled through a generic tool_bar, +#which is displayed in the UI. All UI is handled through the SandWeb::UI +#class. # # SandWeb (Web-based VCS client) Index: Repository.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v retrieving revision 1.43 retrieving revision 1.44 diff -U2 -r1.43 -r1.44 --- Repository.pm 19 Jun 2002 06:44:40 -0000 1.43 +++ Repository.pm 19 Jun 2002 07:09:00 -0000 1.44 @@ -1,5 +1,8 @@ #lib/SandWeb/Repository.pm # -# the repository class. +#This class abstracts VCS functionality. It takes high-level VCS operations, +#and decides what method(s) to call in it's VCS-specific subclasses ( such +#as SandWeb::Repository::cvs ). It is up to the subclass to translate the +#high-level commands into something each VCS can use directly. # # SandWeb (Web-based VCS client) Index: Shell.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -U2 -r1.13 -r1.14 --- Shell.pm 19 Jun 2002 06:55:36 -0000 1.13 +++ Shell.pm 19 Jun 2002 07:09:00 -0000 1.14 @@ -1,2 +1,8 @@ +#lib/SandWeb/Shell +# +#This class makes any and all calls to the operating system shell. It has +#one public method, execute, which takes a command parameter. Shell is +#capable of understand SandWeb-specific needs, such as running a command +#as a specific Unix user, or authenticating to a VCS system like CVS. # # SandWeb (Web-based VCS client) Index: File.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -U2 -r1.57 -r1.58 --- File.pm 23 Mar 2002 19:47:11 -0000 1.57 +++ File.pm 19 Jun 2002 07:09:00 -0000 1.58 @@ -1,5 +1,8 @@ #lib/SandWeb/File.pm # -# the file class. +#This class handles all file viewing and operations. If any class wants +#to view the contents of a file or directory, or perform a file action +#such as delete, rename, create, etc. then it just needs to create a File +#object and call the appropriate File method. # # SandWeb (Web-based VCS client) |
|
From: Rob H. <for...@us...> - 2002-06-19 07:09:02
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory usw-pr-cvs1:/tmp/cvs-serv27419/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: added comments to the top of every class Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.23 retrieving revision 1.24 diff -U2 -r1.23 -r1.24 --- cvs.pm 19 Jun 2002 06:52:20 -0000 1.23 +++ cvs.pm 19 Jun 2002 07:09:00 -0000 1.24 @@ -1,5 +1,6 @@ #lib/SandWeb/Repository/cvs.pm # -# the repository class. +#This class directly interfaces with the CVS version control system. It can +#translate calls from Repository into command-line flags that CVS can use. # # SandWeb (Web-based VCS client) |
|
From: Rob H. <for...@us...> - 2002-06-19 07:09:02
|
Update of /cvsroot/sandweb/sandweb/lib In directory usw-pr-cvs1:/tmp/cvs-serv27419/lib Modified Files: SandWeb.pm Log Message: added comments to the top of every class Index: SandWeb.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -U2 -r1.18 -r1.19 --- SandWeb.pm 10 Mar 2002 23:22:48 -0000 1.18 +++ SandWeb.pm 19 Jun 2002 07:09:00 -0000 1.19 @@ -1,4 +1,8 @@ # SandWeb main class # +#This class handles all the "bootstrapping" for SandWeb. It created the +#basic objects we always need on every run, like Log, Config, UI, and +#Auth. +# # SandWeb (Web-based VCS client) # |
|
From: Rob H. <for...@us...> - 2002-06-19 07:09:01
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Auth In directory usw-pr-cvs1:/tmp/cvs-serv27419/lib/SandWeb/Auth Modified Files: FlatFile.pm Log Message: added comments to the top of every class Index: FlatFile.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth/FlatFile.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -U2 -r1.6 -r1.7 --- FlatFile.pm 18 Mar 2002 21:07:58 -0000 1.6 +++ FlatFile.pm 19 Jun 2002 07:08:59 -0000 1.7 @@ -1,2 +1,6 @@ +# SandWeb FlatFile authentication module +# +# This class verifies MD5 passwords for a given username, and returns +# true if the user if authentic, false if not. # # SandWeb (Web-based VCS client) |
|
From: Rob H. <for...@us...> - 2002-06-19 06:55:39
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv24002/lib/SandWeb
Modified Files:
Shell.pm
Log Message:
added more comments to the Shell class
Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- Shell.pm 19 Jun 2002 06:30:36 -0000 1.12
+++ Shell.pm 19 Jun 2002 06:55:36 -0000 1.13
@@ -26,11 +26,31 @@
my %args = @_;
+ # bindir is the full path on the local box to SandWeb's scripts, like
+ # sandweb-expect and sandweb-admin
my $bindir = $args{'bindir'} || '';
+
+ # system_username is the user's username on the local box ( optional )
my $system_username = $args{'system_username'} || '';
+
+ # system_username is the user's password on the local box ( optional )
my $system_password = $args{'system_password'} || '';
+
+ # system_username is the user's VCS username on the local box
+ # ( optional )
my $vcs_username = $args{'vcs_username'} || '';
+
+ # system_username is the user's VCS password on the local box
+ # ( optional )
my $vcs_password = $args{'vcs_password'} || '';
+
+ # system is true if the user wants to authenticate with the OS, false
+ # if they do not
my $system = $args{'system'} || '';
+
+ # vcs is true if the user wants to authenticate with the VCS, false
+ # if they do not
my $vcs = $args{'vcs'} || '';
+
+ # log is a reference to an object based on the SandWeb::Log class
my $log = $args{'log_obj'} || '';
@@ -53,5 +73,8 @@
my %args = @_;
+ # sandweb-expect is an Expect script that handles username/password
+ # authentication for SandWeb
my $sandweb_expect = "$self->{'bindir'}/sandweb-expect";
+
my $system_username = $self->{'system_username'};
my $system_password = $self->{'system_password'};
|
|
From: Rob H. <for...@us...> - 2002-06-19 06:52:23
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv23155/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
added more comments
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- cvs.pm 19 Jun 2002 06:47:07 -0000 1.22
+++ cvs.pm 19 Jun 2002 06:52:20 -0000 1.23
@@ -32,15 +32,40 @@
my %args = @_;
+ # root is the path on the remote file system to the CVS repository
my $root = $args{'root'} || '';
+
+ # sandbox is the local directory that the user's sandbox for this
+ # repo begins
my $sandbox = $args{'sandbox'} || '';
+
+ # connection is the CVS connection type, SSH, pserver, local, etc
my $connection = $args{'connection'} || '';
+
+ # server is the name of the CVS server
my $server = $args{'server'} || '';
+
+ # ssh_bin is the full path and name of the local SSH binary ( optional )
my $ssh_bin = $args{'ssh_bin'} || '';
+
+ # cvs_bin is the full path and name of the local CVS binary ( required )
my $cvs_bin = $args{'cvs_bin'} || '';
+
+ # bindir is the full path to the local SandWeb binary dir, this is where
+ # we store scripts like sandweb-expect and sandweb-admin
my $bindir = $args{'bindir'} || '';
+
+ # vcs_username is the user's name on the CVS server ( optional )
my $vcs_username = $args{'vcs_username'} || '';
+
+ # vcs_password is the user's password on the CVS server ( optional )
my $vcs_password = $args{'vcs_password'} || '';
+
+ # system_username is the user's username on the local box ( optional )
my $system_username = $args{'system_username'} || '';
+
+ # system_password is the user's password on the local box ( optional )
my $system_password = $args{'system_password'} || '';
+
+ # log is a reference to an object based on the SandWeb::Log class
my $log = $args{'log_obj'} || '';
|
|
From: Rob H. <for...@us...> - 2002-06-19 06:47:10
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory usw-pr-cvs1:/tmp/cvs-serv21167/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: added "-q" global command to CVS call, this keeps it from printing the name of every directory it looks in when doing update. The only thing you really want to see are files that have been updated, right? :) Not every damn dir in your sandbox. Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -U2 -r1.21 -r1.22 --- cvs.pm 19 Jun 2002 06:44:41 -0000 1.21 +++ cvs.pm 19 Jun 2002 06:47:07 -0000 1.22 @@ -952,5 +952,5 @@ my $output = $shell->execute( - 'command' => "cd $sandbox && CVS_RSH=$ssh_bin && export CVS_RSH && $cvs_bin -d $root $param \'$file\'", + 'command' => "cd $sandbox && CVS_RSH=$ssh_bin && export CVS_RSH && $cvs_bin -q -d $root $param \'$file\'", ); |
|
From: Rob H. <for...@us...> - 2002-06-19 06:44:44
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv20649/lib/SandWeb
Modified Files:
Repository.pm
Log Message:
added lots o' debugging statements :)
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -U2 -r1.42 -r1.43
--- Repository.pm 19 Jun 2002 06:30:36 -0000 1.42
+++ Repository.pm 19 Jun 2002 06:44:40 -0000 1.43
@@ -111,4 +111,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $type = $args{'type'};
my $message = $args{'message'};
@@ -131,4 +132,6 @@
}
+ $log->debug("Performing add operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'add',
@@ -144,4 +147,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $type = $args{'type'};
my $file = $args{'file'};
@@ -158,4 +162,6 @@
}
+ $log->debug("Performing admin operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'admin',
@@ -171,4 +177,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $date = $args{'date'};
my $rev = $args{'rev'};
@@ -195,4 +202,6 @@
}
+ $log->debug("Performing annotate operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'annotate',
@@ -208,4 +217,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $date = $args{'date'} || '';
my $rev = $args{'rev'} || '';
@@ -232,4 +242,6 @@
}
+ $log->debug("Performing checkout operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'checkout',
@@ -245,4 +257,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $message = $args{'message'};
my $rev = $args{'rev'};
@@ -273,4 +286,6 @@
}
+ $log->debug("Performing commit operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'commit',
@@ -287,4 +302,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $rev = $args{'rev'};
my $recurse = $args{'recurse'};
@@ -316,4 +332,6 @@
}
+ $log->debug("Performing diff operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'diff',
@@ -329,4 +347,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $action = $args{'message'};
my $recurse = $args{'recurse'};
@@ -348,4 +367,6 @@
}
+ $log->debug("Performing edit operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'edit',
@@ -361,4 +382,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $recurse = $args{'recurse'};
my $file = $args{'file'};
@@ -375,4 +397,6 @@
}
+ $log->debug("Performing editors operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'editors',
@@ -388,4 +412,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $file = $args{'file'};
@@ -397,4 +422,6 @@
}
+ $log->debug("Performing history operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'history',
@@ -410,4 +437,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $file = $args{'file'};
@@ -419,4 +447,6 @@
}
+ $log->debug("Performing init operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'init',
@@ -433,4 +463,5 @@
my $repo_type = $self->get_repo_type();
my $log = $self->get_log();
+ my $log = $self->get_log();
my $file = $args{'file'};
@@ -442,5 +473,6 @@
}
- $log->debug("Performing log operation");
+ $log->debug("Performing log operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'log',
@@ -477,4 +509,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $password = $args{'password'};
@@ -486,4 +519,6 @@
}
+ $log->debug("Performing login operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'login',
@@ -496,5 +531,8 @@
sub logout {
my $self = shift;
+ my $log = $self->get_log();
+ $log->debug("Performing logout operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'logout',
@@ -508,4 +546,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $delete = $args{'delete'};
@@ -523,4 +562,6 @@
}
+ $log->debug("Performing release operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'release',
@@ -535,4 +576,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $remove = $args{'remove'};
@@ -555,4 +597,6 @@
}
+ $log->debug("Performing remove operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'remove',
@@ -567,4 +611,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $verbose = $args{'verbose'};
@@ -587,4 +632,6 @@
}
+ $log->debug("Performing status operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'status',
@@ -599,4 +646,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $verbose = $args{'verbose'};
@@ -644,4 +692,6 @@
}
+ $log->debug("Performing tag operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'tag',
@@ -655,4 +705,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $recurse = $args{'recurse'};
@@ -670,4 +721,6 @@
}
+ $log->debug("Performing unedit operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'unedit',
@@ -682,4 +735,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type() || '';
my $recurse = $args{'recurse'} || '';
@@ -741,4 +795,6 @@
}
+ $log->debug("Performing update operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'update',
@@ -753,4 +809,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $recurse = $args{'recurse'};
@@ -778,4 +835,6 @@
}
+ $log->debug("Performing watch operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'watch',
@@ -790,4 +849,5 @@
my %args = @_;
+ my $log = $self->get_log();
my $repo_type = $self->get_repo_type();
my $recurse = $args{'recurse'};
@@ -815,4 +875,6 @@
}
+ $log->debug("Performing watchers operation");
+ $log->debug("Params: @params");
my %return = $self->call_vcs(
command => 'watchers',
|
|
From: Rob H. <for...@us...> - 2002-06-19 06:44:43
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv20649/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
added lots o' debugging statements :)
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- cvs.pm 19 Jun 2002 06:30:36 -0000 1.20
+++ cvs.pm 19 Jun 2002 06:44:41 -0000 1.21
@@ -67,4 +67,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $type = $params{'type'};
@@ -80,4 +81,7 @@
if ($message) { push @param, " -m $message" };
+ $log->debug("Performing add operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -105,4 +109,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $type = $params{'type'};
@@ -132,4 +137,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $date = $params{'type'};
@@ -144,4 +150,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing annotate operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -168,4 +177,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $rev = $params{'rev'};
@@ -179,4 +189,7 @@
if ($date) { push @param, " $date" };
+ $log->debug("Performing checkout operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -204,4 +217,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -223,4 +237,7 @@
} else {
push @param, " -m \"$message\"";
+ $log->debug("Performing commit operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
$output = $self->shell(
'param' => join('', @param),
@@ -249,4 +266,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $date = $params{'date'};
@@ -267,4 +285,7 @@
print "cd \"$sandbox\" && cvs -d $root @param \"$file\" 2>&1";
+ $log->debug("Performing diff operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $raw_output = $self->shell(
'param' => join('', @param),
@@ -297,4 +318,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -307,4 +329,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing edit operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -331,4 +356,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -339,4 +365,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing editors operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -363,4 +392,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $file = $params{'file'};
@@ -368,4 +398,7 @@
my @param = 'history';
+ $log->debug("Performing history operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -392,4 +425,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $file = $params{'file'};
@@ -397,4 +431,7 @@
my @param = 'init';
+ $log->debug("Performing init operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -428,4 +465,6 @@
$log->debug("Performing log operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -452,4 +491,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $password = $params{'password'};
@@ -464,4 +504,7 @@
}
+ $log->debug("Performing login operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -489,4 +532,8 @@
my @param = 'logout';
+ my $log = $self->get_log();
+ $log->debug("Performing logout operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -513,4 +560,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $delete = $params{'delete'};
@@ -521,4 +569,7 @@
if ($delete) { push @param, " -f" };
+ $log->debug("Performing release operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -545,4 +596,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $remove = $params{'remove'};
@@ -556,4 +608,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing remove operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -580,4 +635,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
@@ -591,4 +647,7 @@
if ($verbose) { push @param, " -v" };
+ $log->debug("Performing status operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -615,4 +674,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -633,4 +693,7 @@
if ($name) { push @param, " $name" };
+ $log->debug("Performing tag operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -657,4 +720,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -665,4 +729,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing unedit operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -689,4 +756,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -712,4 +780,7 @@
my @output_lines = ();
+ $log->debug("Performing update operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $raw_output = $self->shell(
'param' => join('', @param),
@@ -764,4 +835,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $set = $params{'set'};
@@ -776,4 +848,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing watch operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
@@ -800,4 +875,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $recurse = $params{'recurse'};
@@ -808,4 +884,7 @@
if ($recurse) { push @param, " -R" };
+ $log->debug("Performing watchers operation");
+ $log->debug("Params: @param");
+ $log->debug("File: $file");
my $output = $self->shell(
'param' => join('', @param),
|
|
From: Rob H. <for...@us...> - 2002-06-19 06:30:39
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv15477/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
ok, the log object reference is being passed correctly down this path -
Repository -> cvs -> Shell
Added some very important debugging to the Shell class, going to add
alot more
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- cvs.pm 19 Jun 2002 05:38:57 -0000 1.19
+++ cvs.pm 19 Jun 2002 06:30:36 -0000 1.20
@@ -43,4 +43,5 @@
my $system_username = $args{'system_username'} || '';
my $system_password = $args{'system_password'} || '';
+ my $log = $args{'log_obj'} || '';
my $self = bless {
@@ -56,4 +57,5 @@
'system_username' => $system_username,
'system_password' => $system_password,
+ 'log' => $log,
}, $class;
@@ -419,4 +421,5 @@
my %args = @_;
+ my $log = $self->get_log();
my %params = @{ $args{'params'}[0] };
my $file = $params{'file'};
@@ -424,4 +427,5 @@
my @param = 'log';
+ $log->debug("Performing log operation");
my $output = $self->shell(
'param' => join('', @param),
@@ -839,4 +843,5 @@
my $system_username = $self->get_system_username() || '';
my $system_password = $self->get_system_password() || '';
+ my $log = $self->get_log() || '';
my $vcs = '';
@@ -855,4 +860,5 @@
}
+ $log->debug("Creating Shell object");
my $shell = SandWeb::Shell->new(
'vcs_username' => "$vcs_username",
@@ -863,4 +869,5 @@
'system' => "$system",
'vcs' => "$vcs",
+ 'log_obj' => $log,
);
@@ -976,4 +983,14 @@
if ($self->{'system_password'}) {
return $self->{'system_password'};
+ }
+ else {
+ return 0;
+ }
+}
+
+sub get_log {
+ my $self = shift;
+ if ($self->{'log'}) {
+ return $self->{'log'};
}
else {
|
|
From: Rob H. <for...@us...> - 2002-06-19 06:30:39
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv15477/lib/SandWeb
Modified Files:
Shell.pm Repository.pm
Log Message:
ok, the log object reference is being passed correctly down this path -
Repository -> cvs -> Shell
Added some very important debugging to the Shell class, going to add
alot more
Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- Shell.pm 5 Jun 2002 06:32:17 -0000 1.11
+++ Shell.pm 19 Jun 2002 06:30:36 -0000 1.12
@@ -33,4 +33,5 @@
my $system = $args{'system'} || '';
my $vcs = $args{'vcs'} || '';
+ my $log = $args{'log_obj'} || '';
my $self = bless {
@@ -42,4 +43,5 @@
'system' => "$system",
'vcs' => "$vcs",
+ 'log' => $log,
}, $class;
@@ -58,10 +60,15 @@
my $system = $self->{'system'} || '';
my $vcs = $self->{'vcs'} || '';
+ my $log = $self->{'log'} || '';
my $command = $args{'command'};
+ $log->debug("VCS call to Unix shell");
+ $log->debug("VCS command is : $command");
my $output;
if ( $system ) {
+ $log->debug("Using System username/password");
if ( $vcs ) {
+ $log->debug("Using VCS username/password");
my $raw_output = `$sandweb_expect system_vcs $system_username $system_password \'$vcs_password\' $command`;
$raw_output =~ s/
/\n/g;
@@ -71,4 +78,5 @@
$output = join('', @lined_output);
} else {
+ $log->debug("Not using VCS username/password");
my $raw_output = `$sandweb_expect system $system_username $system_password $command`;
$raw_output =~ s/^M/\n/g;
@@ -79,4 +87,5 @@
}
} elsif ( $vcs ) {
+ $log->debug("Using VCS username/password");
my $raw_output = `$sandweb_expect vcs \'$vcs_password\' "$command" 2>&1`;
$raw_output =~ s/^M/\n/g;
@@ -86,4 +95,5 @@
$output = join('', @lined_output);
} else {
+ $log->debug("Not using VCS username/password");
$output = `$command 2>&1`;
}
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -U2 -r1.41 -r1.42
--- Repository.pm 4 Jun 2002 18:24:59 -0000 1.41
+++ Repository.pm 19 Jun 2002 06:30:36 -0000 1.42
@@ -83,4 +83,8 @@
my $bindir = $args{'bindir'} || '';
+ # $log hold the log object
+
+ my $log = $args{'log_obj'} || '';
+
my $self = bless {
'repo_type' => $repo_type,
@@ -96,4 +100,5 @@
'cvs_bin' => $cvs_bin,
'bindir' => $bindir,
+ 'log' => $log,
}, $class;
@@ -427,4 +432,5 @@
my $repo_type = $self->get_repo_type();
+ my $log = $self->get_log();
my $file = $args{'file'};
@@ -436,4 +442,5 @@
}
+ $log->debug("Performing log operation");
my %return = $self->call_vcs(
command => 'log',
@@ -831,4 +838,5 @@
my $cvs_bin = $self->get_cvs_bin() || '';
my $bindir = $self->get_bindir() || '';
+ my $log = $self->get_log() || '';
my $command = $args{'command'} || '';
@@ -851,4 +859,5 @@
vcs_username => $vcs_username,
vcs_password => $vcs_password,
+ log_obj => $log,
);
@@ -1027,4 +1036,14 @@
if ($self->{'bindir'}) {
return $self->{'bindir'};
+ }
+ else {
+ return 0;
+ }
+}
+
+sub get_log {
+ my $self = shift;
+ if ($self->{'log'}) {
+ return $self->{'log'};
}
else {
|
|
From: Rob H. <for...@us...> - 2002-06-19 05:39:00
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv5343/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
cool, i think I finally got all the quoting issues worked out.
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- cvs.pm 19 Jun 2002 01:19:25 -0000 1.18
+++ cvs.pm 19 Jun 2002 05:38:57 -0000 1.19
@@ -220,5 +220,5 @@
$output = "There must be a commit message.\n";
} else {
- push @param, " -m \'$message\'";
+ push @param, " -m \"$message\"";
$output = $self->shell(
'param' => join('', @param),
|
|
From: Rob H. <for...@us...> - 2002-06-19 01:19:29
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory usw-pr-cvs1:/tmp/cvs-serv23137/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: this fixes the bug with commiting on files that have spaces, just needed single quotes around filename in call to SandWeb::Shell.. :) Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -U2 -r1.17 -r1.18 --- cvs.pm 19 Jun 2002 01:08:22 -0000 1.17 +++ cvs.pm 19 Jun 2002 01:19:25 -0000 1.18 @@ -866,5 +866,5 @@ my $output = $shell->execute( - 'command' => "cd $sandbox && CVS_RSH=$ssh_bin && export CVS_RSH && $cvs_bin -d $root $param $file", + 'command' => "cd $sandbox && CVS_RSH=$ssh_bin && export CVS_RSH && $cvs_bin -d $root $param \'$file\'", ); |
3 messages has been excluded from this view by a project administrator.
