WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage2.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
 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
+            }
+        }
+        #
         #   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 if ( $versions{$entry}{Age} > 10  );
+                next unless ( $versions{$entry}{Age} <= $opt_recentAge  );
-                 $versions{$entry}{keepRecent} = 1;
+                $versions{$entry}{keepRecent} = 1;
+                $recentCount++;
-print "--- Recent version $versions{$entry}{vname}\n";
+#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
     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) = @_;
     Message ("------------------------------------------------------------------" );
     Message ("Package $processCount of $processTotal");
     Message ("New package-version: " . GetVname($entry) . " Tag: " . $versions{$entry}{vcsTag} );
+    #
+    #   Detect user abort
+    #
+    if ( -f $cwd . '/stopfile' )
+    {
+        $globalError = 1;
+        Message ("Stop file located");
+    }
+    #
     #   If we have a global error,then we pretend to process, but we
     #   report errors for the logging system
+    #
             $timestamp,
             $duration,
             $data{errStr} || ''
             );
     logToFile( $cwd . '/importsummary.txt', ";$line;");
+    #
     #   Sava data
+    #
     $data{errFlags} = $flags;
     $data{duration} = $duration;
     $versions{$entry}{rmRef} = $data{rmRef};
     delete $data{rmRef};
     delete $data{tag};
-    delete $data{ViewRoot};
+    ##delete $data{ViewRoot};
     $versions{$entry}{data} = \%data;
+    #
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
+    {
+        if ( !$opt_reuse || $rv )
+        {
+            Message ("Delete View: $data{ViewRoot}");
-        RmDirTree ($data{ViewRoot} ) if ( !$opt_reuse || $rv );
+            RmDirTree ($data{ViewRoot} );
+        }
+        else
+        {
+            Message ("Retaining View: $data{ViewRoot}");
+        }
+    }
+    else
+    {
+        Message ("No view to delete");
+    }
+    #
     #   If this version has any 'ripples' then process them while we have the
+        #
         #   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;
+    #
     #   Perform the branch
+    #
     if ( defined $src_label )
+    {
+        #
+        #   Backtrack source label to a branch
+        #   Will make the output version tree much prettier
+        #
+        $src_label = backTrackSvnLabel( $src_label );
         my @opts;
         push (@opts, '-date', $date) if ( $date );
         push (@opts, '-author', $author) if ( $author );
         JatsToolPrint ( 'jats_svnlabel',
                         '-packagebase', "$svnRepo/$packageNames",
-                        'tags/' . $src_label,
+                        $src_label,
                         '-branch',
                         '-clone', $tgt_label,
                         @opts
                       );
+    }
     while ( $base )
+    {
     my $fileCount = 0;
     my $dirCount = 0;
+    my $firstDir;
     my @list = glob( $base . '/*');
     foreach ( @list )
+    {
         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;
+    }
+}
 #-------------------------------------------------------------------------------
         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';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
         push @text, 'E: Essential Release Version';
         push @text, 'G: Glued into Version Tree';
         push @text, 'r: Recent version';
+        push @text, 'R: Ripple';
         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 ( $versions{$entry}{isaRipple} );
         $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} );
     #   Return 0 to keep on going
     return 0;
+}
+#-------------------------------------------------------------------------------
+# Function        : backTrackSvnLabel
+#
+# Description     : Examine a Svn Tag and packtrack until we find the branch
+#                   that was used to create the label
+#
+# Inputs          : $src_label              - Label to process
+#
+#                   Assumes "$svnRepo/$packageNames"
+#
+# Returns         : label
+#
+sub backTrackSvnLabel
+{
+    my ($src_label) = @_;
+    #
+    #   Re-init data
+    #
+    @svnDataItems = ();
+    %svnData = ();
+    #
+    #   Create an SVN session
+    #
+    return unless ( $svnRepo );
+    my $svn = NewSessionByUrl ( "$svnRepo/$packageNames" );
+    return unless ( $svn );
+    #
+    #   extract data
+    #
+#    DebugDumpData("SVN", $svn );
+    $svn->SvnCmd ( 'log', '-v', '--xml', '--stop-on-copy', $svn->Full() . '/tags/' . $src_label
+                    , { 'credentials' => 1,
+                        'process' => \&ProcessSvnLog,
+                         }
+                        );
+    #
+    #   Process data
+    #
+#    DebugDumpData("svnDataItems", \@svnDataItems );
+#    DebugDumpData("svnData", \%svnData );
+    my $branch;
+    foreach my $entry ( @svnDataItems )
+    {
+        my $name;
+        my $isaBranch;
+        my $target = $entry->{target};
+        if ( $target =~ m~/tags/$src_label$~ )
+        {
+            my $parent = $entry->{fromPath};
+            if ( $parent =~ m~(.+)/((tags|branches|trunk)(/|$).*)~ )
+            {
+                $branch = $2 . '@' . $entry->{fromRev};
+                last;
+            }
+        }
+    }
+    #
+    #   Return nice value or original value
+    #
+    unless ( $branch )
+    {
+        $branch = 'tags/' . $src_label;
+    }
+    Message( "backTrackSvnLabel: $src_label -> $branch");
+    return $branch;
+}
 #-------------------------------------------------------------------------------
 # Function        : saveData
+#
 # Description     : Save essential data

Subversion Repositories DevTools

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