Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv32313/bin
Modified Files:
Tag: release-1_0-branch
sandweb.cgi
Log Message:
cool, branch is working too :)
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.348.2.3
retrieving revision 1.348.2.4
diff -U2 -r1.348.2.3 -r1.348.2.4
--- sandweb.cgi 1 Jun 2003 09:27:03 -0000 1.348.2.3
+++ sandweb.cgi 1 Jun 2003 09:53:33 -0000 1.348.2.4
@@ -376,5 +376,8 @@
my $create_branch = $cgi->param('create_branch') || '';
my $remove_branch = $cgi->param('remove_branch') || '';
- if ($submit) {
+
+ if (($submenu == 1)
+ && ($submenu_final != 1)){
+ $log->debug("branch commit..");
branch_commit(
ck_auth => $ck_auth,
@@ -390,6 +393,9 @@
filename => \@filename,
location => $location,
+ submenu_final => 1,
);
- } else {
+ exit;
+ } elsif ($submenu_final != 1){
+ $log->debug("branch menu..");
branch_menu(
ck_auth => $ck_auth,
@@ -399,6 +405,6 @@
location => $location,
);
+ exit;
}
- exit;
}
@@ -1921,5 +1927,8 @@
my @params_loop = ();
# dereference params hash, turn into array
- my @params_array = %$params;
+ my @params_array;
+ if ($params){
+ @params_array = %$params;
+ }
my $count = 0;
@@ -2699,4 +2708,8 @@
$log->debug("Filename(s): @filename");
+ if ( $vcs_command eq 'branch' ) {
+ $vcs_command = 'tag';
+ }
+
if ( $vcs_command eq 'commit' ) {
if ($message) {
@@ -3461,4 +3474,5 @@
my $prev_url = "$ENV{'HTTP_REFERER'}";
my $submenu = $args{'submenu'} || '';
+ my $submenu_final = $args{'submenu_final'} || '';
$log->debug("prev_url $prev_url");
my %return;
@@ -3509,4 +3523,5 @@
repo_password => $repo_password,
submenu => $submenu,
+ submenu_final => $submenu_final,
filename => \@filename,
location => $location,
@@ -3514,4 +3529,5 @@
main_window_url => $main_window_url,
);
+ exit;
}
if ($branch_switch) {
@@ -3529,8 +3545,10 @@
filename => \@filename,
submenu => $submenu,
+ submenu_final => $submenu_final,
location => $location,
params => \%params,
main_window_url => $main_window_url,
);
+ exit;
}
if ($trunk_sync) {
@@ -3546,4 +3564,5 @@
repo_password => $repo_password,
submenu => $submenu,
+ submenu_final => $submenu_final,
filename => \@filename,
location => $location,
@@ -3551,4 +3570,5 @@
main_window_url => $main_window_url,
);
+ exit;
}
if ($trunk_switch) {
@@ -3565,4 +3585,5 @@
repo_password => $repo_password,
submenu => $submenu,
+ submenu_final => $submenu_final,
filename => \@filename,
location => $location,
@@ -3570,4 +3591,5 @@
main_window_url => $main_window_url,
);
+ exit;
}
@@ -3580,9 +3602,10 @@
vcs_menu(
ck_auth => $ck_auth,
- vcs_command => 'tag',
+ vcs_command => 'branch',
module_name => $module_name,
repo_name => $repo_name,
repo_password => $repo_password,
submenu => $submenu,
+ submenu_final => $submenu_final,
filename => \@filename,
location => $location,
@@ -3590,4 +3613,5 @@
main_window_url => $main_window_url,
);
+ exit;
}
if ($remove_branch) {
@@ -3599,9 +3623,10 @@
vcs_menu(
ck_auth => $ck_auth,
- vcs_command => 'tag',
+ vcs_command => 'branch',
module_name => $module_name,
repo_name => $repo_name,
repo_password => $repo_password,
submenu => $submenu,
+ submenu_final => $submenu_final,
filename => \@filename,
location => $location,
@@ -3609,4 +3634,5 @@
main_window_url => $main_window_url,
);
+ exit;
}
|
