WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage3.pl

 my $opt_vobMap;
 my $opt_fileList;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_resume;
+my $opt_delete;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
 my $multiPackages = -1;
 my $visitId = 0;
 my $noTransfer;
 my $rippleCount = 0;
 my $svnRepo;
+my $processCount = 0;
+my $processTotal = 0;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
                 "pruneMode:s"   => \$opt_pruneModeString,
                 "listtags:i"    => \$opt_listTags,
                 "name:s"        => \$opt_name,          # Alternate output
                 "tip:s"         => \@opt_tip,           # Force tip version(s)
                 "log!"          => \$opt_log,
+                "delete!"       => \$opt_delete,
                 "postimage!"    => \$opt_postimage,
                 'workdir:s'     => \$opt_workDir,
                 'filelist:s'    => \$opt_fileList,      # A list of CC tags
                 'resume:s'      => \$opt_resume,
                 );
+    }
+    #
     #   All done
+    #
+    $processTotal = scalar keys %versions;
-    Message("Retained entries: " . (scalar keys %versions) );
+    Message("Retained entries: $processTotal" );
     Message("Pruned entries: $pruneCount");
     Message("Deadwood entries: $trimCount");
     Message("Bad Singletons: $badSingletonCount");
     Message("Ripples: $rippleCount");
+}
+    #
     #   If its been processed then fake that its been done
     #   May have been a ripple that we processed
+    #
+    return if ($versions{$entry}{Processed});
+    $processCount++;
     Message ("------------------------------------------------------------------" );
+    Message ("Package $processCount of $processTotal");
     Message ("New package-version: " . GetVname($entry) . " Tag: " . $versions{$entry}{vcsTag} );
-    return if ($versions{$entry}{Processed});
     if ( $opt_resume )
+    {
         return
         unless ( $opt_resume eq $versions{$entry}{vcsTag} );
     logToFile( $cwd . '/importsummary.txt', ";$line;");
+    #
     #   Sava data
+    #
+    $data{errFlags} = $flags;
+    $data{duration} = $duration;
     $versions{$entry}{rmRef} = $data{rmRef};
-    $versions{$entry}{errStr} = $data{errStr};
+    delete $data{rmRef};
+    delete $data{tag};
-    $versions{$entry}{errFlags} = $flags;
+    delete $data{ViewRoot};
-    $versions{$entry}{BadProjectBase} = $data{BadProjectBase};
+    $versions{$entry}{data} = \%data;
+    #
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
+    #
     $data->{rmRef} = 'ERROR';
     $data->{tag} = '';
     $data->{ViewRoot} = undef;
     $data->{ViewPath} = undef;
-    $data->{flags} = undef;
     $data->{errStr} = '';
     $versions{$entry}{Processed} = 1;
     SystemConfig ('ExitOnError' => 0);
     #   Correct well known path mistakes
+    #
     $cc_path =~ s~/MASS_Dev/Bus/~/MASS_Dev_Bus/~i;
     $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
     $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
+    $cc_path =~ s~/MREF_21/MREF_Package/~/MREF_Package/~i;
 #print "--- Path: $cc_path, Label: $cc_label\n";
+    #
     #   Create CC view
             $data->{errStr} = 'Bad usage of ProjectBase detected';
             return 14;
+        }
+    }
+    #
+    #   Developers have been slack
+    #       Sometime the mark the source path as 'GMTPE2005'
+    #       Sometimes as 'GMTPE2005/Package/Fred/Jill/Harry'
+    #
+    #   Attempt to suck up empty directories below the specified
+    #   source path
+    #
+    unless ( $opt_preserveProjectBase )
+    {
+        #
+        #   Look in ViewPath
+        #   If it contains only ONE directory then we can suck it up
+        #
+        my $testDir = findDirWithStuff( $data->{ViewPath} );
+        unless ( $data->{ViewPath} eq $testDir  )
+        {
+            Message ("Adjust Base Dir: $testDir");
+            $data->{adjustedPath} = $data->{ViewPath};
+            $data->{ViewPath} = $testDir;
+        }
+    }
+    #
     #   Have a CC view
     #   Now we can create the SVN package and branching point before we
     #   import the CC data into SVN
+    #
     #   Only do once
+    #
     return unless ( $createPackageDone );
     $createPackageDone = 0;
+    #
+    #   Real import
+    #       Do not Delete package if it exists
+    #       Package must NOT exist
+    #
     Message ("Creating new SVN package: $packageNames");
+    if ( $opt_delete )
+    {
+        Message ("Delete existing version of package: $packageNames");
-    JatsToolPrint ( 'jats_svn', 'delete-package', '-noerror',  "$svnRepo/$packageNames" );
+        JatsToolPrint ( 'jats_svn', 'delete-package', '-noerror',  "$svnRepo/$packageNames" );
+    }
-    JatsToolPrint ( 'jats_svn', 'create', "$svnRepo/$packageNames", @opts );
+    JatsToolPrint ( 'jats_svn', 'create', "$svnRepo/$packageNames", '-new', @opts );
+}
 #-------------------------------------------------------------------------------
 # Function        : createBranchPoint
         $retval = 1;
+    }
     return $retval;
+}
+#-------------------------------------------------------------------------------
+# Function        : findDirWithStuff
+#
+# Description     : Find a directory that contains more than just another subdir
+#
+# Inputs          : $base               - Start of the scan
+#
+# Returns         : Path to dir with more than just a single dir in it
+#
+sub findDirWithStuff
+{
+    my ($base) = @_;
+    while ( $base )
+    {
+    my $fileCount = 0;
+    my $dirCount = 0;
+    my @list = glob( $base . '/*');
+    foreach ( @list )
+    {
+        next if ( $_ eq '.' );
+        next if ( $_ eq '..' );
+        if ( -d $_ )
+        {
+            $dirCount++;
+            return $base if ( $dirCount > 1  );
+        }
+        else
+        {
+            return $base;
+        }
+    }
+    return $base unless ( $dirCount == 1  );
+    $base = $list[0];
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : JatsToolPrint
+#
 # Description     : Print and Execuate a JatsTool command
         push @text, 'Total RM versions: ' . $totalVersions;
         push @text, 'Essential Entries: ' . scalar @EssentialPackages;
         push @text, 'Initial trees: ' . $initialTrees;
-        push @text, 'Number of Entries: ' . scalar keys %versions;
+        push @text, 'Number of Entries: ' . $processTotal;
         push @text, 'Type : ' . $packageType;
         push @text, 'All versions in Subversion' if ( $allSvn );
         push @text, '|';
         push @text, 'Total Project Branches: ' . $ProjectCount;
     -images[=n]        - Create SVG of version tree. N=0,1,2
     -name=aaa          - Alternate output package name. Test Only
     -[no]log           - Write output to log file. Def: -nolog
     -[no]postimage     - Create image after transger: Def: -post
     -workdir=path      - Use for temp storage (def:/work)
+    -delete            - Delete SVN package before test
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage3.pl – Rev 1271 → 1272