Changeset 2586 in ProjectBuilder

Timestamp:

Apr 3, 2020, 2:02:03 AM (5 years ago)

Author:

Bruno Cornec

Message:

Fix #177 for svn pbconf and tested with one level

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Env.pm (modified) (4 diffs)
• VCS.pm (modified) (9 diffs)

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -300 +300 @@
 
     #
-    # Check pbconf cms compliance
+    # Check pbconf cms compliance except when creating a project as this doesn't exist yet
     #
     pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$pbconfpath/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    confess "No PBCONFDIR variable created" if ((not defined $ENV{'PBCONFDIR'}) || ($ENV{'PBCONFDIR'} eq ""));
+
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
 
@@ -327 +329 @@
         confess "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
     }
-    pb_log(1,"PBROOTDIR=$ENV{'PBROOTDIR'}\n");
+    pb_log(1,"PBROOTDIR: $ENV{'PBROOTDIR'}\n");
 
     # Adds that conf file to the list to consider
     if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") {
-        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") {
         pb_vcs_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
@@ -399 +401 @@
             @pkgs = ("$ENV{'PBPROJ'}") if (not @pkgs);
     
-            # Case where the parent dir of PBROOTDIR isn't managed yet in VCS
-            pb_mkdir_p(dirname("$ENV{'PBROOTDIR'}"));
-            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},dirname("$ENV{'PBROOTDIR'}"));
             pb_mkdir_p("$ENV{'PBROOTDIR'}");
-            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}");
-            my $msg = "Project $ENV{'PBPROJ'} structure creation";
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}",$msg);
             open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") || confess "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             print CONF << "EOF";
@@ -1302 +1298 @@
     
             }
-            pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            $msg = "Project $ENV{'PBPROJ'} creation";
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBCONFDIR'}",$msg);
+            my $msg = "Project $ENV{'PBPROJ'} structure creation";
+            opendir(DIR,$ENV{'PBCONFDIR'}) || confess "Unable to open directory $ENV{'PBCONFDIR'}: $!";
+            foreach my $f (readdir(DIR)) {
+                next if ($f =~ /^\./);
+                pb_vcs_add($scheme,"$ENV{'PBCONFDIR'}/$f");
+            }
+            closedir(DIR);
+            pb_vcs_checkin($scheme,dirname($ENV{'PBCONFDIR'}),$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n");

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -371 +371 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
+pb_log(3,"scheme: $scheme - dir: $dir - vcscmd: $vcscmd\n");
 if ($scheme =~ /^svn/) {
     open(PIPE,"LANGUAGE=C $vcscmd info $dir 2> /dev/null |") || return("");
     while (<PIPE>) {
-        ($void,$res) = split(/^URL:/) if (/^URL:/);
+        pb_log(4,"line: $_");
+        if (/^URL[\s]*:/) {
+            ($void,$res) = split(/^URL[\s]*:/);
+            last;
+        }
     }
     $res =~ s/^\s*//;
     close(PIPE);
     chomp($res);
+    pb_log(3,"res $res\n");
 } elsif ($scheme =~ /^svk/) {
     open(PIPE,"LANGUAGE=C $vcscmd info $dir 2> /dev/null |") || return("");
@@ -402 +408 @@
         chdir($cwd) || return("");
         while (<PIPE>) {
-            ($void,$res) = split(/^URL:/) if (/^URL:/);
+            ($void,$res) = split(/^URL[\s]*:/) if (/^URL[\s]*:/);
         }
         $res =~ s/^\s*//;
@@ -614 +620 @@
 sub pb_vcs_add_if_not_in {
 my $scheme = shift;
-my @f = @_;
 my $vcscmd = pb_vcs_cmd($scheme);
 
 if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
-    for my $f (@f) {
+    for my $f (@_) {
         my $uri = pb_vcs_get_uri($scheme,$f);
-        pb_vcs_add($scheme,$f) if ($uri !~ /^$scheme/);
+        pb_log(3,"f: $f - scheme: $scheme - uri: $uri\n");
+        my ($scheme2, $a, $h, $p, $n) = pb_get_uri($uri);
+        pb_vcs_add($scheme,$f) if ("$scheme2" ne "$scheme");
     }
 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
@@ -663 +670 @@
     push(@f1,dirname($f)) if (-f $f);
 }
+# Wrong we need to push instead
 pb_vcs_up($scheme,@f1);
 }
@@ -768 +776 @@
 }
 
+=item B<pb_vcs_mkdir>
+
+This function makes a VCS directory
+The first parameter is the schema of the VCS systems (svn, cvs, svn+ssh, ...)
+The second parameter is the directory to create.
+The third parameter is the comment to pass during the commit
+
+=cut
+
+sub pb_vcs_mkdir {
+my $scheme = shift;
+my $dir = shift;
+my $msg = shift;
+my $vcscmd = pb_vcs_cmd($scheme);
+
+if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+    pb_system("$vcscmd mkdir -m \"$msg\" $dir","Making VCS directory $dir");
+} elsif ($scheme =~ /^git/) {
+    #pb_system("cd $dir && git init ", "Making VCS directory $dir");
+    ## + git remote add + git push
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
+    # Nothing to do.
+} else {
+    confess "cms $scheme unknown";
+}
+}
+
+
+
 =item B<pb_vcs_compliant>
 
@@ -777 +814 @@
 The fifth parameter indicates whether we should inititate the context or not.
 
+Only called for PBCONFDIR and PBDIR
 =cut
 
@@ -809 +847 @@
 eval { $ENV{$envar} =~ s/(\$ENV.+\})/$1/eeg };
 pb_log(2,"$envar: $ENV{$envar}\n");
+my $exportdir = $ENV{$envar};
 
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
@@ -816 +855 @@
     pb_log(1,"pb_vcs_compliant useless\n");
     return;
-} elsif ((defined $pbinit) || (! -d "$ENV{$envar}")) {
-    my $exportdir = $ENV{$envar};
+} elsif ((defined $pbinit) && (! -d "$exportdir")) {
     # Either we have a version in the uri, and it should be the same
     # as the one in the envar. Or we should add the version to the uri
@@ -824 +862 @@
         $uri .= "/".basename($exportdir);
     }
-    if ((defined $pbinit) && ($scheme =~ /git/)) {
-        # If initializing remove the potential pbconf part if we treat pbconfdir
-        $exportdir =~ s|pbconf[/]*||;
-    }
-    pb_log(1,"Checking out $uri\n");
-    # Create structure and remove end dir before exporting
+
     pb_mkdir_p("$exportdir");
-    pb_rm_rf($exportdir);
+    # Should only have pbconf
+    if ((pb_path_nbfiles(dirname($exportdir)) > 1) && ($envar eq 'PBCONFDIR')) {
+        confess("Directory ".dirname($exportdir)." has content.\nPlease remove it if you want to use that directory\n");
+    }
+    if (pb_path_nbfiles("$exportdir") > 0) {
+        confess("Directory $exportdir has content.\nPlease remove it if you want to use that directory\n");
+    }
+    if ($envar eq 'PBCONFDIR') {
+        # Remove the potential pbconf part if we treat pbconfdir
+        $exportdir =~ s|/pbconf[/]*||;
+        $uri =~ s|/pbconf[/]*||;
+    }
+    # Don't add content here as it may conflict later on with PBROOT addition
+    # Done in Env.pm 
+    pb_log(0,"Trying to check out (may fail) ".$uri."\n");
     pb_vcs_checkout($scheme,$uri,$exportdir);
-    if ((defined $pbinit) && ($scheme =~ /git/)) {
-        # And now created the potentially missing pbconf dir
-        pb_mkdir_p("$exportdir/pbconf");
-    }
+    if (($envar eq 'PBCONFDIR') && (pb_path_nbfiles("$exportdir/pbconf") == 0)) {
+        # Export failed, because there is nothing yet in the repo
+        # we now need to clean stuff before doing mkdir to avoid conflicts
+        pb_rm_rf($exportdir);
+        pb_log(0,"Pushing first $uri\n");
+        pb_vcs_mkdir($scheme,$uri,"Creating structure directory");
+        pb_vcs_mkdir($scheme,"$uri/pbconf","Creating structure sub directory");
+        pb_log(0,"Re-Trying to check out again $uri\n");
+        pb_vcs_up($scheme,$exportdir);
+    }
+    pb_log(0,"Done\n");
 } else {
     pb_log(1,"$uri found locally, checking content\n");