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

     '.u244.syd'     => '.syd',
     '.pxxx.sea'     => '.sea',
     '.pxxx.syd'     => '.syd',
     '.pxxx.sydddd'  => '.syd',
     '.oslo'         => '.oso',
+    '.osl'          => '.oso',
 );
 my %specialPackages = (
     'core_devl' =>  ',all,protected,',
 #    'core_devl' =>  ',all,',
                 $entry = $versions{$entry}{last}
+            }
+        }
+        #
+        #   Keep recent versions
+        #
+        if ( $pruneMode == 1 )
+        {
+            foreach my $entry ( keys(%versions) )
+            {
+                next if ( $versions{$entry}{Age} > 10  );
+                 $versions{$entry}{keepRecent} = 1;
+print "--- Recent version $versions{$entry}{vname}\n";
+            }
+        }
+        #
         #   Keep versions that are common parents to Essential Versions
         #       Mark paths through the tree to essential versions
         #       Mark nodes with the number of essential versions that they sprout
         #   Don't do it if we are ripple pruning
+        #
             return 0 if ( $versions{$entry}{newSuffix} && (exists $versions{$entry}{EssentialPath}) );
 #            return 1 if ( exists $versions{$entry}{DeadWood} );
             return 0 if ( exists $versions{$entry}{EssentialSplitPoint} && $versions{$entry}{EssentialSplitPoint} > 1 );
             return 0 if ( exists $versions{$entry}{keepLowestRipple} &&  $versions{$entry}{keepLowestRipple} );
             return 0 if ( ($pruneMode == 1) && ! $versions{$entry}{isaRipple} );
+            return 0 if ( exists $versions{$entry}{keepRecent} && $versions{$entry}{keepRecent} );
             return 1;
+        }
         foreach my $entry ( keys(%versions) )
+        {
 #-------------------------------------------------------------------------------
 # Function        : calcRippleGroups
+#
 # Description     : Locate and mark ripple groups
-#                   packages that are ripples fo each other
+#                   packages that are ripples of each other
 #                       Keep first version of each ripple. Must keep first
 #                       Group ripples together so that they can be
 #                       proccessed at the same time
+#
 # Inputs          :
     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
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
 # Inputs          : $data               - Shared data
 #                   $entry              - Package entry to process
+#
 # Returns         : Error Code
 #                         0 - All is well
-#                       <10 - Recoveralble error
+#                       <10 - Recoverable error
 #                       >10 - Fatal error
+#
 sub newPackageVersionBody
+{
     my ($data, $entry) = @_;
+    #
     $data->{rmRef} = 'ERROR';
     $data->{tag} = '';
     $data->{ViewRoot} = undef;
     $data->{ViewPath} = undef;
-    $data->{flags} = undef;
     $data->{errStr} = '';
     $versions{$entry}{Processed} = 1;
     SystemConfig ('ExitOnError' => 0);
             $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
+    #
         $data->{rmRef} = 'SVN::' . $rmData->getProperty('subversion.tag');
+    }
     unless ( $data->{rmRef}  )
+    {
-        $data->{errStr} = 'Failed to determin Rm Reference';
+        $data->{errStr} = 'Failed to determine Rm Reference';
         return 13;
+    }
     Message ("RM Ref: $data->{rmRef}");
     unlink $datafile;
         $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
+}
 sub saneLabel
+{
     my ($entry, $pkgname) = @_;
+    my $me;
-    my $me = $versions{$entry}{vname};
+    $me = $versions{$entry}{vname};
     $pkgname = $versions{$entry}{name} unless ( defined $pkgname );
     Error ("Package does have a version string: pvid: $entry")
         unless ( defined $me );
         my @attributes;
         push @attributes, "shape=record";
         push @attributes, "label=\"{$text}\"";
         push @attributes, "tooltip=\"$packageNames\"";
-        push @attributes, "URL=\"" . $GBE_RM_URL . "/view_by_version.asp?pkg_id=$first_pkg_id" . "\"";
+        push (@attributes, "URL=\"" . $GBE_RM_URL . "/view_by_version.asp?pkg_id=$first_pkg_id" . "\"" )if $first_pkg_id;
         push @attributes, "color=red";
         my $attr = join( ' ', @attributes);
         my $tld_done = 'TitleBlock';
         print FH "$tld_done [$attr]\n";
         push @text, '|{Code';
         push @text, '|{N: Not Locked';
         push @text, 'b: Bad Singleton';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
-        push @text, 'E: Essential Version';
+        push @text, 'E: Essential Release Version';
         push @text, 'G: Glued into Version Tree';
+        push @text, 'r: Recent version';
         push @text, 'S: Splitpoint';
         push @text, 't: Glued into Project Tree';
         push @text, 'T: Tip version';
         push @text, 'V: In SVN';
         push @text, '+: In Subversion';
         $stateText .= 'B' if (exists $versions{$entry}{badVcsTag});
         $stateText .= 'G' if (exists $versions{$entry}{GluedIn});
         $stateText .= 't' if (exists $versions{$entry}{MakeTree});
         $stateText .= 'E' if (exists $versions{$entry}{Essential});
         $stateText .= 'D' if (exists $versions{$entry}{DeadWood});
+        $stateText .= 'r' if (exists $versions{$entry}{keepRecent} && $versions{$entry}{keepRecent} );
         $stateText .= 'S' if (exists $versions{$entry}{EssentialSplitPoint} && $versions{$entry}{EssentialSplitPoint} > 1 );
         $stateText .= 'T' if (exists $versions{$entry}{Tip} );
         $stateText .= 'V' if (exists $versions{$entry}{isSvn} );
         $stateText .= '+' if (exists $versions{$entry}{svnVersion} );
 #        $stateText .= 's' if (exists $versions{$entry}{branchPoint} );

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage2.pl – Rev 1270 → 1272