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

 my $opt_workDir = '/work';
 my $opt_vobMap;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_delete;
+my $opt_recentAge = 14;             # Days
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.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,',
 my $noTransfer;
 my $rippleCount = 0;
 my $svnRepo;
 my $processCount = 0;
 my $processTotal = 0;
+my $recentCount = 0;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
                 "help+"         => \$opt_help,          # flag, multiple use allowed
                 "manual:3"      => \$opt_help,
                 "verbose:+"     => \$opt_verbose,       # Versose
                 "repository:s"  => \$opt_repo,          # Name of repository
+                'rbase:s'       => \$opt_repo_base,     # Base of the repo
                 "flat!"         => \$opt_flat,          # Flat structure
                 "test!"         => \$opt_test,          # Test operations
                 "reuse!"        => \$opt_reuse,         # Reuse ClearCase views
                 "age:i"         => \$opt_age,           # Only recent versions
                 "dump:1"        => \$opt_dump,          # Dump Data
                 $entry = $versions{$entry}{last}
+            }
+        }
+        #
+        #   Keep recent versions
+        #       Keep versions created in the last N days
+        #       Will keep recent ripples too
+        #
+        if ( $pruneMode == 1 )
+        {
+            foreach my $entry ( keys(%versions) )
+            {
+                next unless ( $versions{$entry}{Age} <= $opt_recentAge  );
+                $versions{$entry}{keepRecent} = 1;
+                $recentCount++;
+#print "--- Recent version $versions{$entry}{vname}, $versions{$entry}{Age} <= $opt_recentAge\n";
+            }
+#            #
+#            #   Keep the tip of each branch
+#            #
+#            foreach my $entry ( @endPoints )
+#            {
+#                next if exists $versions{$entry}{keepRecent};
+#                $versions{$entry}{keepRecent} = 1;
+##print "--- Tip 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) )
+        {
     Message("Retained entries: $processTotal" );
     Message("Pruned entries: $pruneCount");
     Message("Deadwood entries: $trimCount");
     Message("Bad Singletons: $badSingletonCount");
     Message("Ripples: $rippleCount");
+    Message("Recent entries: $recentCount");
+}
 sub calculateWalkOrder
+{
     my ($entry) = @_;
 #-------------------------------------------------------------------------------
 # 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          :
 # 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) = @_;
+        #
         #   Look in ViewPath
         #   If it contains only ONE directory then we can suck it up
+        #
         my $testDir = findDirWithStuff( $data->{ViewPath} );
+print "-- findDirWithStuff: Result $data->{ViewPath} --> $testDir\n";
         unless ( $data->{ViewPath} eq $testDir  )
+        {
             Message ("Adjust Base Dir: $testDir");
             $data->{adjustedPath} = $data->{ViewPath};
             $data->{ViewPath} = $testDir;
         $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;
+{
     my ($base) = @_;
     while ( $base )
+    {
+print "-- findDirWithStuff: Base: $base\n";
     my $fileCount = 0;
     my $dirCount = 0;
+    my $firstDir;
     my @list = glob( $base . '/*');
     foreach ( @list )
+    {
+print "-- findDirWithStuff: Test: $_\n";
         next if ( $_ eq '.' );
         next if ( $_ eq '..' );
         if ( -d $_ )
+        {
             $dirCount++;
+            $firstDir = $_ unless ( defined $firstDir );
             return $base if ( $dirCount > 1  );
+        }
-        else
+        elsif ( -e $_ )
+        {
             return $base;
+        }
+        # else its probably a dead symlink
+    }
     return $base unless ( $dirCount == 1  );
-    $base = $list[0];
+    $base = $firstDir;
+    }
+}
 #-------------------------------------------------------------------------------
+}
 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 );
         push @text, 'Bad Singletions : ' . $badSingletonCount;
         push @text, 'Deadwood entries : ' . $trimCount;
         push @text, 'Walking Mode : Flat' if ($opt_flat);
         push @text, 'Pruned Mode : ' . $pruneModeString;
         push @text, 'Pruned entries : ' . $pruneCount;
+        push @text, 'Recent entries : ' . $recentCount;
         if ( @unknownProjects )
+        {
             push @text, '|';
             push @text, 'Unknown Projects';
         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_importpackage.pl – Rev 1270 → 1272