sandweb-commit Mailing List for SandWeb (Page 18)

Brought to you by: formnull, njennings

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)

Flat | Threaded

<< < 1 .. 16 17 18 19 20 .. 53 > >> (Page 18 of 53)

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.16,1.17

From: Rob H. <for...@us...> - 2002-06-19 01:08:24

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv21115/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
put ' instead of " around message, seems to fix that "space in comments"
bug.. yay :)


Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- cvs.pm	5 Jun 2002 06:32:17 -0000	1.16
+++ cvs.pm	19 Jun 2002 01:08:22 -0000	1.17
@@ -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),

[Sandweb-commit] CVS: sandweb/templates sandbox.html,1.19,1.20

From: Rob H. <for...@us...> - 2002-06-17 19:45:44

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv5653/templates

Modified Files:
	sandbox.html 
Log Message:
oops, somehow removed the popup stuff from the checkout when I fixed the
update. corrected.


Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- sandbox.html	17 Jun 2002 00:51:22 -0000	1.19
+++ sandbox.html	17 Jun 2002 19:45:39 -0000	1.20
@@ -20,5 +20,5 @@
 
 
-   <form name="module" submit="<TMPL_VAR NAME=PROGNAME>">
+   <form name="module" submit="<TMPL_VAR NAME=PROGNAME>" onsubmit="myOpenWindow()" target="popUp">
    <input type="hidden" name="action" value="sandbox" />
    <tr>

[Sandweb-commit] CVS: sandweb/templates sandbox.html,1.18,1.19

From: Rob H. <for...@us...> - 2002-06-17 00:51:25

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv16986/templates

Modified Files:
	sandbox.html 
Log Message:
fixed the "clicking update in sandbox_menu does not cause popup" bug, used
javascript form variable redefinition and submit ( update is a link on
the sandbox menu, not a button, which is what made this awkward and a little
different from the browse_module menu ).

fixing this gave me some good ideas for making browse_module's way of doing
pop-ups more generic, which it can then share with sandbox menu.


Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- sandbox.html	22 Mar 2002 04:14:51 -0000	1.18
+++ sandbox.html	17 Jun 2002 00:51:22 -0000	1.19
@@ -20,5 +20,5 @@
 
 
-   <form name="module" submit="<TMPL_VAR NAME=PROGNAME>" onsubmit="myOpenWindow()" target="popUp">
+   <form name="module" submit="<TMPL_VAR NAME=PROGNAME>">
    <input type="hidden" name="action" value="sandbox" />
    <tr>
@@ -48,7 +48,11 @@
    </tr>
 
-<form submit="<TMPL_VAR NAME=PROGNAME>">
-<input type="hidden" name="action" value="browse" />
-   <TMPL_LOOP NAME="MODULE_LOOP">
+<form submit="<TMPL_VAR NAME=PROGNAME>" name="sandbox" target="popUp">
+  <input type="hidden" name="action" value="sandbox" />
+  <input type="hidden" name="Submit" value="Update" />
+  <input type="hidden" name="module_name" value="0" />
+  <input type="hidden" name="repo_name" value="0" />
+
+  <TMPL_LOOP NAME="MODULE_LOOP">
    <tr>
     <td width="20%" align="left">
@@ -63,5 +67,5 @@
     <td width="15%" align="center">
      <font size="2">
-      <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Update&module_name=<TMPL_VAR NAME="MODULE_NAME">&repo_name=<TMPL_VAR NAME="REPOSITORY">">update</a> 
+      <a href="javascript:onClick=myOpenWindow();javascript:document.sandbox.module_name.value='<TMPL_VAR NAME=MODULE_NAME>';javascript:document.sandbox.repo_name.value='<TMPL_VAR NAME=REPO_NAME>';javascript:document.sandbox.submit();">update</a> 
       &nbsp; | &nbsp;
       <a href="<TMPL_VAR NAME=PROGNAME>?action=sandbox&Submit=Delete&module_name=<TMPL_VAR NAME="MODULE_NAME">&repo_name=<TMPL_VAR NAME="REPOSITORY">">delete</a>

[Sandweb-commit] CVS: sandweb/templates configuration.html,1.1,1.2

From: Rob H. <for...@us...> - 2002-06-14 00:35:15

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv6807/templates

Modified Files:
	configuration.html 
Log Message:
"preferences" has been renamed to "configuration"


Index: configuration.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/configuration.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- configuration.html	5 Jun 2002 06:19:21 -0000	1.1
+++ configuration.html	14 Jun 2002 00:35:12 -0000	1.2
@@ -1,4 +1,4 @@
 <form submit="<TMPL_VAR NAME=PROGNAME>">
-<input type="hidden" name="action" value="preferences" />
+<input type="hidden" name="action" value="configuration" />
 <table width="100%" border="0" align="center" valign="top" cellspacing="0" cellpadding="0">
  <tr>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.298,1.299

From: Rob H. <for...@us...> - 2002-06-13 21:12:42

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv32103a/bin

Modified Files:
	sandweb.cgi 
Log Message:
I passed the HTTP_REFERRER through the main branch and tag menus as "main_window_url", and then they give it to their commit subs as "previous_url" so the main window gets refreshed after tagging operations.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.298
retrieving revision 1.299
diff -U2 -r1.298 -r1.299
--- sandweb.cgi	7 Jun 2002 07:28:43 -0000	1.298
+++ sandweb.cgi	13 Jun 2002 21:12:36 -0000	1.299
@@ -151,4 +151,5 @@
 		my $sort = $cgi->param('sort') || '';
 		my $previous_url = $cgi->param('previous_url') || '';
+		my $main_window_url = $cgi->param('main_window_url') || '';
 
 		$log->debug("action: $action submit: $submit");
@@ -240,4 +241,5 @@
 						tag_commit(
 							ck_auth => $ck_auth,
+							main_window_url => $main_window_url,
 							tag_sync => $tag_sync,
 							tag_switch => $tag_switch,
@@ -266,13 +268,14 @@
 
 				if ( $vcs_command eq "branch" ) {
-					my $branch_sync = CGI::param('branch_sync') || '';
-					my $branch_switch = CGI::param('branch_switch') || '';
-					my $trunk_sync = CGI::param('trunk_sync') || '';
-					my $trunk_switch = CGI::param('trunk_switch') || '';
-					my $create_branch = CGI::param('create_branch') || '';
-					my $remove_branch = CGI::param('remove_branch') || '';
+					my $branch_sync = $cgi->param('branch_sync') || '';
+					my $branch_switch = $cgi->param('branch_switch') || '';
+					my $trunk_sync = $cgi->param('trunk_sync') || '';
+					my $trunk_switch = $cgi->param('trunk_switch') || '';
+					my $create_branch = $cgi->param('create_branch') || '';
+					my $remove_branch = $cgi->param('remove_branch') || '';
 					if ($submit) {
 						branch_commit(
 							ck_auth => $ck_auth,
+							main_window_url => $main_window_url,
 							branch_sync => $branch_sync,
 							branch_switch => $branch_switch,
@@ -1493,4 +1496,6 @@
 	my $repo_name = $args{'repo_name'};
 
+	my $main_window_url = "$ENV{'HTTP_REFERER'}";
+
 	my @filename = ();
 	my $count = 0;
@@ -1507,4 +1512,5 @@
 		MODULE_NAME => $module_name,
 		REPO_NAME => $repo_name,
+		MAIN_WINDOW_URL => $main_window_url,
 	);
 	print $cgi->header( -cookie => $ck_auth );
@@ -1539,4 +1545,6 @@
 	my $repo_name = $args{'repo_name'};
 
+	my $main_menu_url = "$ENV{'HTTP_REFERER'}";
+
 	my @filename = ();
 	my $count = 0;
@@ -1553,6 +1561,7 @@
 		MODULE_NAME => $module_name,
 		REPO_NAME => $repo_name,
+		MAIN_WINDOW_URL => $main_menu_url,
 	);
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> 'SandWeb : branch menu',
@@ -2530,4 +2539,6 @@
 		configuration_menu( ck_auth => $ck_auth );
 	}
+
+	my $main_window_url = $args{'main_window_url'};
 	
 	my @filename = ();
@@ -2674,4 +2685,5 @@
 		MENU_TITLE => 'SandWeb',
 		SUBMENU_TITLE => "VCS tag",
+		PREVIOUS_URL => $main_window_url,
 		FOOTER => '',
 		CONTENT => $content,
@@ -2709,4 +2721,6 @@
 	}
 	
+	my $main_window_url = $args{'main_window_url'};
+
 	my @filename = ();
 	my $count = 0;
@@ -2717,5 +2731,5 @@
 	my $module_name = $args{'module_name'};
 	my $location = $args{'location'};
-	my $message = CGI::param('message');
+	my $message = $cgi->param('message');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -2849,9 +2863,10 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> "SandWeb : VCS branch",
 		MENU_TITLE => 'SandWeb',
 		SUBMENU_TITLE => "VCS branch",
+		PREVIOUS_URL => $main_window_url,
 		FOOTER => '',
 		CONTENT => $content,

[Sandweb-commit] CVS: sandweb/templates branch.html,1.1,1.2 tag.html,1.11,1.12

From: Rob H. <for...@us...> - 2002-06-13 21:12:42

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv32103a/templates

Modified Files:
	branch.html tag.html 
Log Message:
I passed the HTTP_REFERRER through the main branch and tag menus as "main_window_url", and then they give it to their commit subs as "previous_url" so the main window gets refreshed after tagging operations.


Index: branch.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/branch.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- branch.html	4 Jun 2002 18:14:14 -0000	1.1
+++ branch.html	13 Jun 2002 21:12:37 -0000	1.2
@@ -6,4 +6,5 @@
 	<input type="hidden" name="action" value="vcs" />
 	<input type="hidden" name="vcs_command" value="branch" />
+	<input type="hidden" name="main_window_url" value="<TMPL_VAR NAME=MAIN_WINDOW_URL>" />
 	<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
 	<input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />

Index: tag.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- tag.html	4 May 2002 05:48:54 -0000	1.11
+++ tag.html	13 Jun 2002 21:12:37 -0000	1.12
@@ -5,4 +5,5 @@
   <form submit="<TMPL_VAR NAME=PROGNAME>">
 	<input type="hidden" name="action" value="vcs" />
+	<input type="hidden" name="main_window_url" value="<TMPL_VAR NAME=MAIN_WINDOW_URL>" />
 	<input type="hidden" name="vcs_command" value="tag" />
 	<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />

[Sandweb-commit] CVS: sandweb MANIFEST,1.11,1.12

From: Rob H. <for...@us...> - 2002-06-13 20:21:10

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv9562

Modified Files:
	MANIFEST 
Log Message:
changed name of templates/preferences.html to templates/configuration.html


Index: MANIFEST
===================================================================
RCS file: /cvsroot/sandweb/sandweb/MANIFEST,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- MANIFEST	4 Apr 2002 19:33:59 -0000	1.11
+++ MANIFEST	13 Jun 2002 20:21:06 -0000	1.12
@@ -43,5 +43,5 @@
 templates/vcs_output.html
 templates/current_location.html
-templates/preferences.html
+templates/configuration.html
 templates/view_file.html
 templates/edit_file.html

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.297,1.298

From: Rob H. <for...@us...> - 2002-06-07 07:28:46

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv19032/bin

Modified Files:
	sandweb.cgi 
Log Message:
arg, accidently substituted over the "write_preferences_data" method
of Config in a checkin yesterday :) duh.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.297
retrieving revision 1.298
diff -U2 -r1.297 -r1.298
--- sandweb.cgi	5 Jun 2002 06:19:21 -0000	1.297
+++ sandweb.cgi	7 Jun 2002 07:28:43 -0000	1.298
@@ -30,4 +30,5 @@
 use SandWeb::Browse;
 use SandWeb::File;
+use SandWeb::Config;
 
 # Debugging
@@ -2925,5 +2926,5 @@
 	my $username = $auth->get_username();
 	# write config data into the .$user_cfg file in the users directory
-	my ($return, $msg) = $user->write_configuration_config(
+	my ($return, $msg) = $user->write_preferences_config(
 		'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
 		'config_file' => ".$user_cfg",

[Sandweb-commit] CVS: sandweb/templates preferences.html,1.17,NONE

From: Rob H. <for...@us...> - 2002-06-07 05:23:32

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv11872/templates

Removed Files:
	preferences.html 
Log Message:
removing preferences, changes name to configuration


--- preferences.html DELETED ---

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.15,1.16

From: Rob H. <for...@us...> - 2002-06-05 06:32:20

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv31423/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
changed "unix" to "system"


Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- cvs.pm	5 Jun 2002 02:07:32 -0000	1.15
+++ cvs.pm	5 Jun 2002 06:32:17 -0000	1.16
@@ -841,5 +841,5 @@
 
 	my $vcs = '';
-	my $unix = '';
+	my $system = '';
 
 	my $file = $args{'file'};
@@ -861,5 +861,5 @@
 		'system_password' => "$system_password",
 		'bindir' => "$bindir",
-		'unix' => "$unix",
+		'system' => "$system",
 		'vcs' => "$vcs",
 	);

[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.10,1.11

From: Rob H. <for...@us...> - 2002-06-05 06:32:20

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv31423/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
changed "unix" to "system"


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- Shell.pm	5 Jun 2002 02:07:32 -0000	1.10
+++ Shell.pm	5 Jun 2002 06:32:17 -0000	1.11
@@ -31,5 +31,5 @@
 	my $vcs_username = $args{'vcs_username'} || '';
 	my $vcs_password = $args{'vcs_password'} || '';
-	my $unix = $args{'unix'} || '';
+	my $system = $args{'system'} || '';
 	my $vcs = $args{'vcs'} || '';
 
@@ -40,5 +40,5 @@
 		'vcs_username' => "$vcs_username",
 		'vcs_password' => "$vcs_password",
-		'unix' => "$unix",
+		'system' => "$system",
 		'vcs' => "$vcs",
 	}, $class;
@@ -56,5 +56,5 @@
 	my $vcs_username = $self->{'vcs_username'};
 	my $vcs_password = $self->{'vcs_password'};
-	my $unix = $self->{'unix'} || '';
+	my $system = $self->{'system'} || '';
 	my $vcs = $self->{'vcs'} || '';
 
@@ -62,7 +62,7 @@
 	my $output;
 
-	if ( $unix ) {
+	if ( $system ) {
 		if ( $vcs ) {
-			my $raw_output = `$sandweb_expect unix_vcs $system_username $system_password \'$vcs_password\' $command`;
+			my $raw_output = `$sandweb_expect system_vcs $system_username $system_password \'$vcs_password\' $command`;
 			$raw_output =~ s/
/\n/g;
 			my @lined_output = split(/\n/, $raw_output);
@@ -71,5 +71,5 @@
 			$output = join('', @lined_output);
 		} else {
-			my $raw_output = `$sandweb_expect unix $system_username $system_password $command`;
+			my $raw_output = `$sandweb_expect system $system_username $system_password $command`;
                         $raw_output =~ s/^M/\n/g;
                         my @lined_output = split(/\n/, $raw_output);

[Sandweb-commit] CVS: sandweb/bin sandweb-expect,1.5,1.6

From: Rob H. <for...@us...> - 2002-06-05 06:32:20

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv31423/bin

Modified Files:
	sandweb-expect 
Log Message:
changed "unix" to "system"


Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- sandweb-expect	4 Jun 2002 07:16:47 -0000	1.5
+++ sandweb-expect	5 Jun 2002 06:32:17 -0000	1.6
@@ -1,9 +1,9 @@
 #!expect
 
-# Unix account, vcs password :
-# input : unix_vcs system_username system_password vcs_password vcs_command
+# System account, vcs password :
+# input : system_vcs system_username system_password vcs_password vcs_command
 #
 # Unix account, no vcs password :
-# input : unix system_username system_password vcs_command
+# input : system system_username system_password vcs_command
 #
 # No Unix account, vcs password:
@@ -12,5 +12,5 @@
 set timeout -1
 
-if {[lindex $argv 0]=="unix_vcs"} {
+if {[lindex $argv 0]=="system_vcs"} {
 	set system_username [lindex $argv 1]
 	set system_password [lindex $argv 2]
@@ -33,5 +33,5 @@
 } 
 
-if {[lindex $argv 0]=="unix"} {
+if {[lindex $argv 0]=="system"} {
 	set system_username [lindex $argv 1]
 	set system_password [lindex $argv 2]

[Sandweb-commit] CVS: sandweb/templates menu_bar.html,1.14,1.15

From: Rob H. <for...@us...> - 2002-06-05 06:21:16

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv28705/templates

Modified Files:
	menu_bar.html 
Log Message:
changing "prefs" to "config"


Index: menu_bar.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/menu_bar.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- menu_bar.html	13 Feb 2002 05:42:01 -0000	1.14
+++ menu_bar.html	5 Jun 2002 06:21:14 -0000	1.15
@@ -6,5 +6,5 @@
 &nbsp; <b>|</b> &nbsp; <a href="<TMPL_VAR NAME=CGI_PATH>/<TMPL_VAR NAME=CGI_EXEC>?action=repository">repository</a>
 
-&nbsp; <b>|</b> &nbsp; <a href="<TMPL_VAR NAME=CGI_PATH>/<TMPL_VAR NAME=CGI_EXEC>?action=preferences">prefs</a>
+&nbsp; <b>|</b> &nbsp; <a href="<TMPL_VAR NAME=CGI_PATH>/<TMPL_VAR NAME=CGI_EXEC>?action=configuration">config</a>
 
 &nbsp; <b>|</b> &nbsp; <a href="<TMPL_VAR NAME=CGI_PATH>/<TMPL_VAR NAME=CGI_EXEC>?action=logout">logout</a><br />

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.296,1.297

From: Rob H. <for...@us...> - 2002-06-05 06:19:24

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv28216/bin

Modified Files:
	sandweb.cgi 
Log Message:
changed "prefs" to "config"


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.296
retrieving revision 1.297
diff -U2 -r1.296 -r1.297
--- sandweb.cgi	5 Jun 2002 00:51:49 -0000	1.296
+++ sandweb.cgi	5 Jun 2002 06:19:21 -0000	1.297
@@ -174,13 +174,13 @@
 				);
 			}
-			elsif ( $action eq 'preferences' ) {
+			elsif ( $action eq 'configuration' ) {
 				if (! $cgi->param('Submit')) {
-					# call preferences menu
-					preferences_menu( 
+					# call configuration menu
+					configuration_menu( 
 						ck_auth => $ck_auth,
 					);
 				} else {
 					# commit menu data
-					preferences_commit( 
+					configuration_commit( 
 						ck_auth => $ck_auth,
 					);
@@ -671,5 +671,5 @@
 	if (! load_config()) { 
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -819,5 +819,5 @@
 
 ###############################################################################
-# preferences menu
+# configuration menu
 #
 # user prefs, this is the menu for configuring the users prefs.cfg
@@ -826,5 +826,5 @@
 # 	ck_auth		- the sessions cookie
 ###############################################################################
-sub preferences_menu {
+sub configuration_menu {
 	my %args = @_;
 	my $ck_auth = $args{'ck_auth'};
@@ -833,18 +833,16 @@
 	my $username = $auth->get_username();
 	my $full_name = $user->get_full_name();
-	my $work_dir = $user->get_work_dir();
 
 	my $content = $ui->get_menu( 
-		MENU => 'preferences',
+		MENU => 'configuration',
 		PROGNAME => $progname,
 		FULL_NAME => $full_name,
-		WORK_DIR => $work_dir,
 	);
 
 	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
-		TITLE=> 'SandWeb : preferences',
+		TITLE=> 'SandWeb : configuration',
 		MENU_TITLE => 'SandWeb',
-		SUBMENU_TITLE => 'preferences',
+		SUBMENU_TITLE => 'configuration',
 		FOOTER => '',
 		CONTENT => $content,
@@ -1056,5 +1054,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1210,5 +1208,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1288,5 +1286,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1593,5 +1591,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1980,5 +1978,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2367,5 +2365,5 @@
 
 ###############################################################################
-# preferences commit
+# configuration commit
 #
 # Writes user preference data to user's config file.
@@ -2374,5 +2372,5 @@
 # 	ck_auth		- the sessions cookie
 ###############################################################################
-sub preferences_commit {
+sub configuration_commit {
 	my %args = @_;
 	my $ck_auth = $args{'ck_auth'};
@@ -2381,5 +2379,4 @@
 	my @personal_params = ( 
 		'full_name', 
-		'work_dir',
 	);
 
@@ -2393,5 +2390,5 @@
     if (! $return) {
         # uh oh, problem occured
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	# when finished go to sandbox menu. (this should be dynamic probably, 
@@ -2530,5 +2527,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2708,5 +2705,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2873,5 +2870,5 @@
 #
 # check user prefs config file, if it doesn't exist, 
-# call the preferences menu to fill in required info.
+# call the configuration menu to fill in required info.
 # if it does exist, load it.
 #
@@ -2883,6 +2880,6 @@
 	my $username = $auth->get_username();
 	if (! -f "$config->{'paths'}->{'users_dir'}/$username/.$user_cfg") {
-		# user doesn't have a preferences file!
-		# load user preferences from default config in config dir
+		# user doesn't have a configuration file!
+		# load user configuration from default config in config dir
 		my $return = SandWeb::Config::->new(
 			'config_dir' => $config_dir,
@@ -2895,10 +2892,10 @@
 		# if $no_error is true, ignore this error msgs
 		if (! $no_error) {
-			set_message("No config file cound for '$username', enter preferences.");
+			set_message("No config file cound for '$username', enter configuration.");
 		}
 		return 0;
 	}
 
-	# load users preferences from users dir
+	# load users configuration from users dir
 	$return = SandWeb::Config::->new( 
 		'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
@@ -2928,5 +2925,5 @@
 	my $username = $auth->get_username();
 	# write config data into the .$user_cfg file in the users directory
-	my ($return, $msg) = $user->write_preferences_config(
+	my ($return, $msg) = $user->write_configuration_config(
 		'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
 		'config_file' => ".$user_cfg",
@@ -2972,5 +2969,5 @@
 		if (! load_config()) { 
 			# no existing user config, forward to prefs menu
-			preferences_menu( ck_auth => $ck_auth );
+			configuration_menu( ck_auth => $ck_auth );
 		}
 		sandbox_menu( ck_auth => $ck_auth );

[Sandweb-commit] CVS: sandweb/templates configuration.html,NONE,1.1

From: Rob H. <for...@us...> - 2002-06-05 06:19:23

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv28216/templates

Added Files:
	configuration.html 
Log Message:
changed "prefs" to "config"


--- NEW FILE ---
<form submit="<TMPL_VAR NAME=PROGNAME>">
<input type="hidden" name="action" value="preferences" />
<table width="100%" border="0" align="center" valign="top" cellspacing="0" cellpadding="0">
 <tr>
  <td width="20%" align="right">
    Full Name :
  </td>
  <td width="80%" align="left">
    <input type="text" name="full_name" value="<TMPL_VAR NAME=FULL_NAME>" />
  </td>
 </tr>
<table width="100%" align="center" border="0">
 <tr>
  <td width="5%" align="center">
   <br />&nbsp; <br />
  </td>
  <td width="30%" align="center">
  <!--  <a href="<TMPL_VAR NAME=PROGNAME>?action=vcs_prefs">Set Up Repository</a> -->
  </td>
  <td width="65%" align="center">
   &nbsp; <br />
  </td>
 </tr>
</table>
<table width="100%" align="center" border="0">
 <tr>
  <td width="15%" align="center">
   <br />&nbsp; <br />
  </td>
  <td width="10%" align="center">
   <input type="submit" name="Submit" Value="Done" />
  </td>
  <td width="75%" align="center">
   &nbsp; <br />
  </td>
 </tr>
<table width="100%" border="0" align="center" valign="top" cellspacing="0" cellpadding="0">
</form>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.9,1.10

From: Rob H. <for...@us...> - 2002-06-05 02:07:37

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv11155/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
fixed problem reported by Blake on the -devel list. just needed to be
implemented correctly, depending on the presence of username/password
to decide if we are doing SSH or not is dumb :P


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- Shell.pm	20 May 2002 23:34:52 -0000	1.9
+++ Shell.pm	5 Jun 2002 02:07:32 -0000	1.10
@@ -31,4 +31,6 @@
 	my $vcs_username = $args{'vcs_username'} || '';
 	my $vcs_password = $args{'vcs_password'} || '';
+	my $unix = $args{'unix'} || '';
+	my $vcs = $args{'vcs'} || '';
 
         my $self = bless {
@@ -38,4 +40,6 @@
 		'vcs_username' => "$vcs_username",
 		'vcs_password' => "$vcs_password",
+		'unix' => "$unix",
+		'vcs' => "$vcs",
 	}, $class;
 
@@ -52,10 +56,12 @@
 	my $vcs_username = $self->{'vcs_username'};
 	my $vcs_password = $self->{'vcs_password'};
+	my $unix = $self->{'unix'} || '';
+	my $vcs = $self->{'vcs'} || '';
 
 	my $command = $args{'command'};
 	my $output;
 
-	if ( $system_username && $system_password ) {
-		if ( $vcs_username && $vcs_password ) {
+	if ( $unix ) {
+		if ( $vcs ) {
 			my $raw_output = `$sandweb_expect unix_vcs $system_username $system_password \'$vcs_password\' $command`;
 			$raw_output =~ s/
/\n/g;
@@ -72,5 +78,5 @@
                         $output = join('', @lined_output);
 		}
-	} elsif ( $vcs_username && $vcs_password ) {
+	} elsif ( $vcs ) {
 		my $raw_output = `$sandweb_expect vcs \'$vcs_password\' "$command" 2>&1`;
                 $raw_output =~ s/^M/\n/g;

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.14,1.15

From: Rob H. <for...@us...> - 2002-06-05 02:07:37

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv11155/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
fixed problem reported by Blake on the -devel list. just needed to be
implemented correctly, depending on the presence of username/password
to decide if we are doing SSH or not is dumb :P


Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- cvs.pm	3 May 2002 17:17:34 -0000	1.14
+++ cvs.pm	5 Jun 2002 02:07:32 -0000	1.15
@@ -840,7 +840,19 @@
         my $system_password = $self->get_system_password() || '';
 
+	my $vcs = '';
+	my $unix = '';
+
 	my $file = $args{'file'};
 	my $param = $args{'param'};
 
+	if ( $connection eq 'SSH' ) {
+		$root = ":ext:$vcs_username\@$server:$root";
+		$vcs = 1;
+	} 
+	elsif ( $connection eq 'pserver' ) {
+		$root = ":pserver:$vcs_username\@$server:$root";
+		$vcs = 1;
+	}
+
 	my $shell = SandWeb::Shell->new(
 		'vcs_username' => "$vcs_username",
@@ -849,12 +861,7 @@
 		'system_password' => "$system_password",
 		'bindir' => "$bindir",
+		'unix' => "$unix",
+		'vcs' => "$vcs",
 	);
-
-	if ( $connection eq 'SSH' ) {
-		$root = ":ext:$vcs_username\@$server:$root";
-	} 
-	elsif ( $connection eq 'pserver' ) {
-		$root = ":pserver:$vcs_username\@$server:$root";
-	}
 
 	my $output = $shell->execute(

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.295,1.296

From: Rob H. <for...@us...> - 2002-06-05 00:51:52

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv26676/bin

Modified Files:
	sandweb.cgi 
Log Message:
fixed mostly cosmetic issue, after committing a file, the output page
would have HTTP headers and the commit message prompt under it again,
the vcs_commit "if" block that handled "commits" needed to exit after
it was done.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.295
retrieving revision 1.296
diff -U2 -r1.295 -r1.296
--- sandweb.cgi	4 Jun 2002 18:13:55 -0000	1.295
+++ sandweb.cgi	5 Jun 2002 00:51:49 -0000	1.296
@@ -250,4 +250,5 @@
 							location => $location,
 						);
+						exit;
 					} else {
 						tag_menu(
@@ -258,4 +259,5 @@
 							location => $location,
 						);
+						exit;
 					}
 					exit;
@@ -303,4 +305,5 @@
 					location => $location,
 				);
+				exit;
 			}
 			elsif ( $action eq 'view_file' ) {
@@ -2089,4 +2092,5 @@
 				MESSAGE => $message,
 			);
+			exit;
 		}
 		my $content = $ui->get_menu(

[Sandweb-commit] CVS: sandweb/lib/SandWeb Repository.pm,1.40,1.41

From: Rob H. <for...@us...> - 2002-06-04 18:25:02

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv3034/lib/SandWeb

Modified Files:
	Repository.pm 
Log Message:
completing branch work


Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -U2 -r1.40 -r1.41
--- Repository.pm	20 May 2002 06:00:42 -0000	1.40
+++ Repository.pm	4 Jun 2002 18:24:59 -0000	1.41
@@ -203,8 +203,8 @@
 
 	my $repo_type = $self->get_repo_type();
-	my $date = $args{'date'};
-	my $rev = $args{'rev'};
-	my $recurse = $args{'recurse'};
-	my $file = $args{'file'};
+	my $date = $args{'date'} || '';
+	my $rev = $args{'rev'} || '';
+	my $recurse = $args{'recurse'} || '';
+	my $file = $args{'file'} || '';
 
 	if ($repo_type eq 'CVS') {
@@ -258,4 +258,8 @@
                         push (@params, "$recurse");
                 }
+                if ($message) {
+                        push (@params, 'message');
+                        push (@params, "$message");
+                }
                 if ($file) {
                         push (@params, 'file');
@@ -671,14 +675,14 @@
 	my %args = @_;
 
-	my $repo_type = $self->get_repo_type();
-	my $recurse = $args{'recurse'};
-	my $reset = $args{'reset'};
-	my $prune = $args{'prune'};
-	my $clobber = $args{'clobber'};
-	my $directories = $args{'directories'};
-	my $rev = $args{'rev'};
-	my $date = $args{'date'};
-	my $merge = $args{'merge'};
-	my $file = $args{'file'};
+	my $repo_type = $self->get_repo_type() || '';
+	my $recurse = $args{'recurse'} || '';
+	my $reset = $args{'reset'} || '';
+	my $prune = $args{'prune'} || '';
+	my $clobber = $args{'clobber'} || '';
+	my $directories = $args{'directories'} || '';
+	my $rev = $args{'rev'} || '';
+	my $date = $args{'date'} || '';
+	my $merge = $args{'merge'} || '';
+	my $file = $args{'file'} || '';
 
 	if ($repo_type eq 'CVS') {
@@ -708,5 +712,8 @@
                         push (@params, 'directories');
                         push (@params, "$directories");
-                }
+                } else {
+                        push (@params, 'directories');
+                        push (@params, '1');
+		}
                 if ($rev) {
                         push (@params, 'rev');
@@ -881,4 +888,5 @@
 		'add', 
 		'annotate', 
+		'branch',
 		'commit', 
 		'diff', 
@@ -893,5 +901,4 @@
 		'unedit', 
 		'update', 
-		'tag', 
 		'unedit', 
 		'watch',

[Sandweb-commit] CVS: sandweb/templates branch.html,NONE,1.1

From: Rob H. <for...@us...> - 2002-06-04 18:14:16

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv32140a

Added Files:
	branch.html 
Log Message:
branching stuff..


--- NEW FILE ---
<table width="100%" border="1" align="center" valign="top" cellspacing="0" cellpadding="0">
<tr>
<center>
  File(s): <TMPL_VAR NAME=FILENAME>
  <form submit="<TMPL_VAR NAME=PROGNAME>">
	<input type="hidden" name="action" value="vcs" />
	<input type="hidden" name="vcs_command" value="branch" />
	<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
	<input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
	<input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
	<input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
	<input name="Submit" value="1" type="hidden" />
	<tr>
	<td align="center">
		Sync with branch : 
	</td>
	<td align="left">
		<input type="text" name="branch_sync" />
		<input type="submit" />
	</td>
	</td>
	</tr>
	<tr>
        <td align="center">
		Switch to branch : 
	</td>
	<td align="left">
		<input type="text" name="branch_switch" />
		<input type="submit"  />
	</td>
	</td>
	</tr>
        </td>
	</tr>
	<tr>
	<td align="center">
		Sync with trunk
	</td>
	<td align="left">
		<input type="submit" name="trunk_sync" value="Submit" />
	</td>
	</tr>
	<tr>
	<td align="center">
		Switch to trunk
	</td>
	<td align="left">
		<input type="submit" name="trunk_switch" value="Submit" />
	</td>
	</tr>
</table>
<table width="100%" border="1" align="center" valign="top" cellspacing="0" cellpadding="0">

	<hr />
	<tr>
	<td align="center">
		Create branch :
	</td>
	<td align="left">
		<input name="create_branch" type="text" />
		<input type="submit"  />
	</td>
	</tr>
	<td align="center">
		Remove branch :
	</td>
	<td align="left">
		<input name="remove_branch" type="text" />
		<input type="submit" name="Submit" />
	</td>
	<tr>
	</tr>
  </form>
</center>
</tr>
</table>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.294,1.295

From: Rob H. <for...@us...> - 2002-06-04 18:13:58

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv31988

Modified Files:
	sandweb.cgi 
Log Message:
checking in branching stuff..


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.294
retrieving revision 1.295
diff -U2 -r1.294 -r1.295
--- sandweb.cgi	2 Jun 2002 18:40:59 -0000	1.294
+++ sandweb.cgi	4 Jun 2002 18:13:55 -0000	1.295
@@ -262,4 +262,37 @@
 				}
 
+				if ( $vcs_command eq "branch" ) {
+					my $branch_sync = CGI::param('branch_sync') || '';
+					my $branch_switch = CGI::param('branch_switch') || '';
+					my $trunk_sync = CGI::param('trunk_sync') || '';
+					my $trunk_switch = CGI::param('trunk_switch') || '';
+					my $create_branch = CGI::param('create_branch') || '';
+					my $remove_branch = CGI::param('remove_branch') || '';
+					if ($submit) {
+						branch_commit(
+							ck_auth => $ck_auth,
+							branch_sync => $branch_sync,
+							branch_switch => $branch_switch,
+							trunk_sync => $trunk_sync,
+							trunk_switch => $trunk_switch,
+							create_branch => $create_branch,
+							remove_branch => $remove_branch,
+							module_name => $module_name,
+							repo_name => $repo_name,
+							filename => \@filename,
+							location => $location,
+						);
+					} else {
+						branch_menu(
+							ck_auth => $ck_auth,
+							module_name => $module_name,
+							repo_name => $repo_name,
+							filename => \@filename,
+							location => $location,
+						);
+					}
+					exit;
+				}
+
 				vcs_commit(
 					ck_auth => $ck_auth,
@@ -1485,4 +1518,51 @@
 
 ###############################################################################
+# branch menu
+#
+# allows user to perform branch operations on file or files
+#
+# args:
+#       ck_auth         - the sessions cookie
+#       filename	- filename(s) to branch (NOTE: this is an array)
+#       repo_name       - name of the current repository.
+#       module_name     - name of the current module.
+#       users_dir       - location of user sandbox directories.
+###############################################################################
+
+sub branch_menu {
+	my %args = @_;
+
+	my $ck_auth = $args{'ck_auth'};
+	my $module_name = $args{'module_name'};
+	my $repo_name = $args{'repo_name'};
+
+	my @filename = ();
+	my $count = 0;
+	while ( $args{'filename'}->[$count] ) {
+		push (@filename, $args{'filename'}->[$count]);
+		$count++;
+	}
+	my $filename = "@filename";
+
+	my $content = $ui->get_menu( 
+		MENU => 'branch',
+		FILENAME => $filename,
+		PROGNAME => $progname,
+		MODULE_NAME => $module_name,
+		REPO_NAME => $repo_name,
+	);
+	print CGI::header( -cookie => $ck_auth );
+	$ui->print_popup(
+		TITLE=> 'SandWeb : branch menu',
+		MENU_TITLE => 'SandWeb',
+		SUBMENU_TITLE => 'branch menu',
+		FOOTER => '',
+		CONTENT => $content,
+		MESSAGE => $message, 
+	);
+}
+
+
+###############################################################################
 ###############################################################################
 ## Commit Menu Data
@@ -2600,4 +2680,182 @@
 
 
+###############################################################################
+# branch commit
+#
+# processes calls from branch menu to sync with/switch to trunk or branchname
+#
+# A Repository object is created and used.
+#
+# args:
+# 	ck_auth		- the sessions cookie
+#	filename	- name of the file(s) that the vcs_command should
+#			  be used with. NOTE: this is an array
+#	location	- system path to the file(s) specified by filename
+# 	repo_name	- name of the current repository.
+# 	module_name	- name of the current module.
+# 	users_dir	- location of user sandbox directories.
+# 	message		- message to the VCS system.
+###############################################################################
+
+sub branch_commit {
+	my %args = @_;
+
+	my $ck_auth = $args{'ck_auth'};
+	if (! load_config()) {
+		# no existing user config, forward to prefs menu
+		preferences_menu( ck_auth => $ck_auth );
+	}
+	
+	my @filename = ();
+	my $count = 0;
+	while ( $args{'filename'}->[$count] ) {
+		push (@filename, $args{'filename'}->[$count]);
+		$count++;
+	}
+	my $module_name = $args{'module_name'};
+	my $location = $args{'location'};
+	my $message = CGI::param('message');
+	my $username = $auth->get_username();
+	my $users_dir = $config->{'paths'}->{'users_dir'};
+	my $repo_name = $args{'repo_name'};
+	my $prev_url = "$ENV{'HTTP_REFERER'}";
+	$log->debug("prev_url $prev_url");
+	my %return;
+
+	my $branch_sync = $args{'branch_sync'} || '';
+	my $branch_switch = $args{'branch_switch'} || '';
+	my $trunk_sync = $args{'trunk_sync'} || '';
+	my $trunk_switch = $args{'trunk_switch'} || '';
+	my $create_branch = $args{'create_branch'} || '';
+	my $remove_branch = $args{'remove_branch'} || '';
+
+	$log->debug("module_name: $module_name");
+	$log->debug("username: $username");
+	$log->debug("location: $location");
+
+	my $repo_server = $user->get_repo_server(repo => $repo_name);
+	my $repo_username = $user->get_repo_username(repo => $repo_name);
+	my $repo_password = $user->get_repo_password(repo => $repo_name);
+	my $repo_type = $user->get_repo_type(repo => $repo_name);
+	my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+	my $repo_root = $user->get_repo_root(repo => $repo_name);
+	my $ssh_bin = $config->{'system'}->{'ssh_bin'};
+	my $cvs_bin = $config->{'system'}->{'cvs_bin'};
+	my $bindir = $config->{'system'}->{'bindir'};
+
+	my $sandbox = $user->{'paths'}->{'users_dir'} || '';
+
+	my @vcs_output = ();
+	my @vcs_error = ();
+
+	my $repository = SandWeb::Repository->new(
+		root => $repo_root,
+		connection => $repo_connection,
+                'vcs_username' => $repo_username,
+                'vcs_password' => $repo_password,
+		'unix_auth' => $unix_auth,
+                'system_username' => $system_username,
+                'system_password' => $system_password,
+		server => $repo_server,
+		repo_type => $repo_type,
+		sandbox => "$users_dir/$username/$repo_name/$module_name/$location",
+		'ssh_bin' => $ssh_bin,
+		'cvs_bin' => $cvs_bin,
+		'bindir' => $bindir,
+	);
+
+	$log->debug("Repo name: $repo_name");
+	$log->debug("Repo root: $repo_root");
+	$log->debug("VCS sandbox: $users_dir/$username/$repo_name/$module_name/$location");
+	$log->debug("Repo type: $repo_type");
+	$log->debug("Filename(s): @filename");
+
+	if ($branch_sync) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				rev => "$branch_sync",
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($branch_switch) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				rev => "$branch_switch",
+				clobber => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($trunk_sync) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				reset => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($trunk_switch) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				clobber => 1,
+				reset => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+
+	if ($create_branch) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				name => "$create_branch",
+				branch => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($remove_branch) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				name => "$remove_branch",
+				branch => 1,
+				delete => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+
+	my $content = $ui->get_menu(
+		MENU => 'vcs_output',
+		LOCATION => $location,
+		FILENAME => @filename,
+		PROGNAME => $progname,
+		VCS_OUTPUT => join('', @vcs_output),
+		VCS_ERROR => join('', @vcs_error),
+	);
+
+	print CGI::header( -cookie => $ck_auth );
+	$ui->print_popup(
+		TITLE=> "SandWeb : VCS branch",
+		MENU_TITLE => 'SandWeb',
+		SUBMENU_TITLE => "VCS branch",
+		FOOTER => '',
+		CONTENT => $content,
+		MESSAGE => $message,
+	);
+	exit 0;
+}

[Sandweb-commit] CVS: sandweb/bin sandweb-expect,1.4,1.5

From: Rob H. <for...@us...> - 2002-06-04 07:16:50

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv5471/bin

Modified Files:
	sandweb-expect 
Log Message:
*serious* double-edged sword here.

* this checkin fixes a bug with large repositories/file, or 
maybe high-latency connections. I get this all the time on
the LAN where I work, because our files are enourmous.

Expect has a default timeout of 10 seconds, and that's not 
always long enough.

I can set the default timeout to -1, but it seems to take SSH 
forever to timeout if the user gets the password wrong. Not sure
how long, I waited a couple minutes, which is too long IMO.

Anyway, I am going to check this in, I *think* I may be able
to do something like keep "expect"ing a password prompt, if I
get it three times than abort with "incorrect password" ( which
would be cool because it would be much better than the crappy errors
we get from sandweb-expect now :) 



Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- sandweb-expect	23 Apr 2002 07:11:09 -0000	1.4
+++ sandweb-expect	4 Jun 2002 07:16:47 -0000	1.5
@@ -10,4 +10,6 @@
 # input : vcs vcs_password vcs_command
 
+set timeout -1
+
 if {[lindex $argv 0]=="unix_vcs"} {
 	set system_username [lindex $argv 1]

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.293,1.294

From: Rob H. <for...@us...> - 2002-06-02 18:41:03

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv18818/bin

Modified Files:
	sandweb.cgi 
Log Message:
changed the way we use the CGI class so it's objected-oriented style rather
than procedural, e.g. $cgi->header; instead of CGI::header;



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.293
retrieving revision 1.294
diff -U2 -r1.293 -r1.294
--- sandweb.cgi	20 May 2002 06:00:42 -0000	1.293
+++ sandweb.cgi	2 Jun 2002 18:40:59 -0000	1.294
@@ -51,4 +51,7 @@
 
 # object creation, all objects global throughout CGI
+
+my $cgi = new CGI;
+
 my $return = SandWeb::->start_up( 
 	config_dir => $config_dir, 
@@ -97,11 +100,11 @@
 ###############################################################################
 sub main {
-	my $action = CGI::param('action') || '';
+	my $action = $cgi->param('action') || '';
 
 	if ($action eq 'login') {
 		# attempting login
-		my $username = CGI::param('username');
-		my $password = CGI::param('password');
-		my $salt = CGI::param('salt');
+		my $username = $cgi->param('username');
+		my $password = $cgi->param('password');
+		my $salt = $cgi->param('salt');
 		login(
 			username => $username,
@@ -111,5 +114,5 @@
 	} else {
 		# if auth cookie exists, this will return it's data
-		my $ck_auth = CGI::cookie('sandweb_auth') || '';
+		my $ck_auth = $cgi->cookie('sandweb_auth') || '';
 
 		if ($ck_auth) {
@@ -131,20 +134,20 @@
 
 		# has valid auth cookie
-		my $repository_selected = CGI::param('repository_selected') || '';
-		my $repo_name = CGI::param('repo_name') || '';
-		my $repo_server = CGI::param('repo_server') || '';
-		my $repo_username = CGI::param('repo_username') || '';
-		my $repo_password = CGI::param('repo_password') || '';
-		my $repo_type = CGI::param('repo_type') || '';
-		my $repo_connection = CGI::param('repo_connection') || '';
-		my $repo_root = CGI::param('repo_root') || '';
-		my $new_repository = CGI::param('new_repository') || '';
-		my $submit = CGI::param('Submit') || '';
-		my $vcs_command = CGI::param('vcs_command') || '';
-		my $module_name = CGI::param('module_name') || '';
-		my $module_description = CGI::param('module_description') || '';
-		my $location = CGI::param('location') || '';
-		my $sort = CGI::param('sort') || '';
-		my $previous_url = CGI::param('previous_url') || '';
+		my $repository_selected = $cgi->param('repository_selected') || '';
+		my $repo_name = $cgi->param('repo_name') || '';
+		my $repo_server = $cgi->param('repo_server') || '';
+		my $repo_username = $cgi->param('repo_username') || '';
+		my $repo_password = $cgi->param('repo_password') || '';
+		my $repo_type = $cgi->param('repo_type') || '';
+		my $repo_connection = $cgi->param('repo_connection') || '';
+		my $repo_root = $cgi->param('repo_root') || '';
+		my $new_repository = $cgi->param('new_repository') || '';
+		my $submit = $cgi->param('Submit') || '';
+		my $vcs_command = $cgi->param('vcs_command') || '';
+		my $module_name = $cgi->param('module_name') || '';
+		my $module_description = $cgi->param('module_description') || '';
+		my $location = $cgi->param('location') || '';
+		my $sort = $cgi->param('sort') || '';
+		my $previous_url = $cgi->param('previous_url') || '';
 
 		$log->debug("action: $action submit: $submit");
@@ -172,5 +175,5 @@
 			}
 			elsif ( $action eq 'preferences' ) {
-				if (! CGI::param('Submit')) {
+				if (! $cgi->param('Submit')) {
 					# call preferences menu
 					preferences_menu( 
@@ -220,6 +223,6 @@
 				my @filename = ();
 
-				if ( CGI::param('filename') ) {
-					@filename = CGI::param('filename'),
+				if ( $cgi->param('filename') ) {
+					@filename = $cgi->param('filename'),
 				} else {
 					@filename = ('.');
@@ -227,10 +230,10 @@
 
 				if ( $vcs_command eq "tag" ) {
-					my $tag_sync = CGI::param('tag_sync') || '';
-					my $tag_switch = CGI::param('tag_switch') || '';
-					my $trunk_sync = CGI::param('trunk_sync') || '';
-					my $trunk_switch = CGI::param('trunk_switch') || '';
-					my $create_tag = CGI::param('create_tag') || '';
-					my $remove_tag = CGI::param('remove_tag') || '';
+					my $tag_sync = $cgi->param('tag_sync') || '';
+					my $tag_switch = $cgi->param('tag_switch') || '';
+					my $trunk_sync = $cgi->param('trunk_sync') || '';
+					my $trunk_switch = $cgi->param('trunk_switch') || '';
+					my $create_tag = $cgi->param('create_tag') || '';
+					my $remove_tag = $cgi->param('remove_tag') || '';
 					if ($submit) {
 						tag_commit(
@@ -272,5 +275,5 @@
 				view_file_menu( 
 					ck_auth => $ck_auth,
-					filename => CGI::param('filename') || '',
+					filename => $cgi->param('filename') || '',
 					module_name => $module_name,
 					repo_name => $repo_name,
@@ -283,5 +286,5 @@
 					edit_file_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -291,5 +294,5 @@
 					edit_file_menu( 
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -300,5 +303,5 @@
 			elsif ( $action eq 'delete' ) {
 				# called file deleter
-				my @filename = CGI::param('filename') || '';
+				my @filename = $cgi->param('filename') || '';
 				delete_commit( 
 					ck_auth => $ck_auth,
@@ -314,6 +317,6 @@
 					rename_commit( 
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
-						tofile => CGI::param('tofile') || '',
+						filename => $cgi->param('filename') || '',
+						tofile => $cgi->param('tofile') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -323,5 +326,5 @@
 					rename_menu(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -335,5 +338,5 @@
 					create_file_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -354,5 +357,5 @@
 					create_folder_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -373,5 +376,5 @@
 					upload_commit(
 						ck_auth => $ck_auth,
-						filename => CGI::param('filename') || '',
+						filename => $cgi->param('filename') || '',
 						module_name => $module_name,
 						repo_name => $repo_name,
@@ -392,5 +395,5 @@
 				download_file_commit( 
 					ck_auth => $ck_auth,
-					filename => CGI::param('filename') || '',
+					filename => $cgi->param('filename') || '',
 					module_name => $module_name,
 					repo_name => $repo_name,
@@ -433,5 +436,5 @@
 				# load current menu (instead of going to new one)
 				#no strict 'refs';
-				#my $curr_menu = CGI::param('curr_menu') || '';
+				#my $curr_menu = $cgi->param('curr_menu') || '';
 				#&$curr_menu( ck_auth => $ck_auth);
 				debug_menu( 
@@ -473,5 +476,5 @@
 	);
 
-	print CGI::header;
+	print $cgi->header;
 	$ui->print_screen(
 		TITLE => 'SandWeb : login', 
@@ -506,5 +509,5 @@
 	$content = "Data Dump<br /><pre>" . $content . "</pre>";
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : debug',
@@ -596,5 +599,5 @@
 
 	my $username = $auth->get_username();
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : sandbox',
@@ -766,5 +769,5 @@
 	my $content = "$popup_header $toolbar_menu $current_location_menu $browser_menu $popup_footer";
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : browse module',
@@ -803,5 +806,5 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : preferences',
@@ -980,5 +983,5 @@
 	$js .= $ui->get_javascript( SCRIPT => "repository" );
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : repository',
@@ -1138,5 +1141,5 @@
 	my $content = "$popup_header $toolbar_menu $current_location_menu $menu $popup_footer";
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : view file',
@@ -1214,5 +1217,5 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
 		TITLE=> 'SandWeb : edit file',
@@ -1280,5 +1283,5 @@
 		);
 
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> "SandWeb : renamefile",
@@ -1300,5 +1303,5 @@
 		);
 
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> 'SandWeb : rename file',
@@ -1346,5 +1349,5 @@
 	$log->debug("location: $location");
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> 'SandWeb : create file',
@@ -1384,5 +1387,5 @@
 		REPO_NAME => $repo_name,
 	);
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE => 'SandWeb : create folder',
@@ -1424,5 +1427,5 @@
 		PREVIOUS_URL => $prev_url,
 	);
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> 'SandWeb : upload file',
@@ -1470,5 +1473,5 @@
 		REPO_NAME => $repo_name,
 	);
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> 'SandWeb : tag menu',
@@ -1527,5 +1530,5 @@
 	);
 	$log->debug("editing file : $filename");
-	my $file_content = CGI::param('data'),
+	my $file_content = $cgi->param('data'),
 	$filename = $file->get_filename();
 	$log->debug("saving edited file : $filename");
@@ -1538,5 +1541,5 @@
 	);
 
-	print CGI::redirect( "$progname?action=view_file&filename=$filename&location=$location&repo_name=$repo_name&module_name=$module_name" );
+	print $cgi->redirect( "$progname?action=view_file&filename=$filename&location=$location&repo_name=$repo_name&module_name=$module_name" );
 }
 
@@ -1595,5 +1598,5 @@
 		);
 
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> "SandWeb : delete file",
@@ -1642,5 +1645,5 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> "SandWeb : delete file",
@@ -1813,5 +1816,5 @@
 	# if a file has been uploaded, then
 	# grab it's filehandle
-	$filehandle = CGI::upload('filehandle');
+	$filehandle = $cgi->upload('filehandle');
 	if ( $filehandle) {
 		$filename = $filehandle;
@@ -1825,8 +1828,8 @@
 			filehandle => $filehandle,
 		); 
-		print CGI::redirect( "$previous_url" );
+		print $cgi->redirect( "$previous_url" );
 	} else {
 		set_message("Error: no file was received!");
-		print CGI::redirect( "$previous_url" );
+		print $cgi->redirect( "$previous_url" );
 	}
 }
@@ -1906,5 +1909,5 @@
 	my $module_name = $args{'module_name'};
 	my $location = $args{'location'};
-	my $message = CGI::param('message');
+	my $message = $cgi->param('message');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -1943,5 +1946,5 @@
 			VCS_ERROR => join('', @vcs_error),
 		);
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> "SandWeb :VCS Command",
@@ -1997,5 +2000,5 @@
 			);
 
-			print CGI::header( -cookie => $ck_auth );
+			print $cgi->header( -cookie => $ck_auth );
 			$ui->print_popup(
 				TITLE=> "SandWeb : VCS $vcs_command",
@@ -2015,5 +2018,5 @@
 			FILENAME => "@filename",
 		);
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> 'SandWeb : commit file(s)',
@@ -2051,5 +2054,5 @@
 
 		if ( $return{'error'} ) {
-			print CGI::header( -cookie => $ck_auth );
+			print $cgi->header( -cookie => $ck_auth );
 			$ui->print_popup(
 				TITLE=> "SandWeb : VCS $vcs_command",
@@ -2072,5 +2075,5 @@
 			);
 
-			print CGI::header( -cookie => $ck_auth );
+			print $cgi->header( -cookie => $ck_auth );
 			$ui->print_popup(
 				TITLE=> "SandWeb : VCS $vcs_command",
@@ -2106,5 +2109,5 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> "SandWeb : VCS $vcs_command",
@@ -2242,5 +2245,5 @@
 		my $prev_url = "$ENV{'HTTP_REFERER'}";
 		$log->debug("prev_url $prev_url");
-		print CGI::header( -cookie => $ck_auth );
+		print $cgi->header( -cookie => $ck_auth );
 		$ui->print_popup(
 			TITLE=> "SandWeb : vcs output",
@@ -2298,5 +2301,5 @@
 
 	foreach my $param (@personal_params) {
-		if ( CGI::param("$param") ) {
+		if ( $cgi->param("$param") ) {
 			$user->{'personal'}->{"$param"} = param("$param");
 		}
@@ -2454,5 +2457,5 @@
 	my $module_name = $args{'module_name'};
 	my $location = $args{'location'};
-	my $message = CGI::param('message');
+	my $message = $cgi->param('message');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -2584,5 +2587,5 @@
 	);
 
-	print CGI::header( -cookie => $ck_auth );
+	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_popup(
 		TITLE=> "SandWeb : VCS tag",
@@ -2704,5 +2707,5 @@
 	if ($stat) {
 		$log->standard("$username logged on.");
-		my $ck_auth = CGI::cookie( $auth->set_auth_cookie() );
+		my $ck_auth = $cgi->cookie( $auth->set_auth_cookie() );
 		if (! load_config()) { 
 			# no existing user config, forward to prefs menu

[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.8,1.9

From: Rob H. <for...@us...> - 2002-05-20 23:34:55

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv7501/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
heh, noticed a funny error with the SSH connection type. If your password
has a | character in it ( not saying mine does :P ) then the call to the
shell won't succeed.

Now passwords have single quotes, seems to work for me.


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Shell.pm	17 May 2002 22:40:41 -0000	1.8
+++ Shell.pm	20 May 2002 23:34:52 -0000	1.9
@@ -58,5 +58,5 @@
 	if ( $system_username && $system_password ) {
 		if ( $vcs_username && $vcs_password ) {
-			my $raw_output = `$sandweb_expect unix_vcs $system_username $system_password $vcs_password $command`;
+			my $raw_output = `$sandweb_expect unix_vcs $system_username $system_password \'$vcs_password\' $command`;
 			$raw_output =~ s/
/\n/g;
 			my @lined_output = split(/\n/, $raw_output);
@@ -73,5 +73,5 @@
 		}
 	} elsif ( $vcs_username && $vcs_password ) {
-		my $raw_output = `$sandweb_expect vcs $vcs_password "$command"`;
+		my $raw_output = `$sandweb_expect vcs \'$vcs_password\' "$command" 2>&1`;
                 $raw_output =~ s/^M/\n/g;
                 my @lined_output = split(/\n/, $raw_output);

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.292,1.293

From: Rob H. <for...@us...> - 2002-05-20 06:00:45

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1266/bin

Modified Files:
	sandweb.cgi 
Log Message:
cool, creating tags works now


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.292
retrieving revision 1.293
diff -U2 -r1.292 -r1.293
--- sandweb.cgi	20 May 2002 05:25:09 -0000	1.292
+++ sandweb.cgi	20 May 2002 06:00:42 -0000	1.293
@@ -2510,7 +2510,4 @@
 	$log->debug("Filename(s): @filename");
 
-print header;
-print "$tag_sync";
-exit;
 	if ($tag_sync) {
 		foreach my $file (@filename) {
@@ -2525,5 +2522,5 @@
 	if ($tag_switch) {
 		foreach my $file (@filename) {
-			%return = $repository->tag( 
+			%return = $repository->update( 
 				file => "$file",
 				rev => "$tag_switch",
@@ -2546,5 +2543,5 @@
 	if ($trunk_switch) {
 		foreach my $file (@filename) {
-			%return = $repository->tag( 
+			%return = $repository->update( 
 				file => "$file",
 				clobber => 1,

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 16 17 18 19 20 .. 53 > >> (Page 18 of 53)

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)