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

+    {
         $data->{errStr} = 'Failed to determine Rm Reference';
         return 13;
+    }
+    #
+    #   Add supplemental tags if this version is in a 'Release'
+    #
+    foreach my $rname ( keys %{$versions{$entry}{Releases}}  )
+    {
+        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rname});
+        Message ("Adding Release Tag: $rname");
+        $rv = JatsToolPrint ( 'jats_svnlabel' ,
+                    $data->{rmRef},
+                    '-clone',
+                    $rtext,
+#                    @args,
+                     );
+        if ( $rv )
+        {
+            $data->{errStr} = 'Failed to add Release tag';
+            return 14;
+        }
+    }
     Message ("RM Ref: $data->{rmRef}");
     unlink $datafile;
+    #
     #   All is good
     #   Perform the branch
+    #
     if ( defined $src_label )
+    {
+        #
-        #   Backtrack source label to a branch
+        #   The 'clone' operation will backtrack the branch point
+        #   to the source of the label. This will make the output version
-        #   Will make the output version tree much prettier
+        #   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",
-                        $src_label,
+                        'tags/' . $src_label,
                         '-branch',
                         '-clone', $tgt_label,
                         @opts
                       );
+    }
     $me =~ tr~_~_~s;
     return $me;
+}
+sub saneString
+{
+    my ($string) = @_;
+    #
+    #   Get rid of multiple '_'
+    #   Replace space with -
+    #
+    $string =~ s~\W~_~g;
+    $string =~ tr~ ~_~s;
+    $string =~ tr~_-~-~s;
+    $string =~ tr~-_~-~s;
+    $string =~ tr~-~-~s;
+    $string =~ tr~_~_~s;
+    $string =~ s~-$~~;
+    $string =~ s~_$~~;
+    return $string;
+}
 exit 0;
 #-------------------------------------------------------------------------------
 #        $stateText .= ' Count='. $versions{$entry}{EssentialSplitPoint} if (exists $versions{$entry}{EssentialSplitPoint});
 #        $stateText .= ' M='. $versions{$entry}{maxVersion} if (exists $versions{$entry}{maxVersion});
         push @label, "(${stateText})" if ( $stateText );
+##       Insert Release Names
+#        foreach my $rname ( keys %{$versions{$entry}{Releases}}  ) {
+#            push @label, "Release: $versions{$entry}{Releases}{$rname}";
+#        }
         return join ('\n', @label );
+    }
     sub genAttributes
+    {
         next unless ( exists  $pkg_ids{ $ScmPackages{$_}{pkgid} } );
         push @EssentialPackages, $_;
         Error ("Essential Package Version not in extracted Release Manager Data: $_")
             unless ( exists $versions{$_} );
         $versions{$_}{Essential} = 1;
+        # Retain which RM Release this package-version is the tip
+        # Release of
+        foreach my $release ( @{$ScmPackages{$_}{'release'}} )
+        {
+            $versions{$_}{Releases}{$release} = $ScmReleases{$release}{name};
+        }
         #print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname}\n";
+    }
+    #
     #   Free memory
+    #
     %ScmReleases = ();
     %ScmPackages = ();
             $fromBranch = 'trunk';
         } elsif ( $entry->{fromPath} =~ m~/branches/(.*)~ ) {
             $fromBranch = $1;
+        }
+        # largest Rev number on branch
-        if ( defined($fromBranch) && ! exists $svnData{branches}{$fromBranch} )
+        if ( exists $svnData{max}{$fromBranch} )
+        {
-            unless ( $name eq $fromBranch )
+            if ( $svnData{max}{$fromBranch}{rev} <  $entry->{fromRev} )
+            {
-                $svnData{branches}{$fromBranch} = $name;
+                $svnData{max}{$fromBranch}{rev} =  $entry->{fromRev};
-                $svnData{tips}{$name} = $fromBranch;
+                $svnData{max}{$fromBranch}{name} = $name;
+            }
+        }
+        else
+        {
+            $svnData{max}{$fromBranch}{rev} =  $entry->{fromRev};
+            $svnData{max}{$fromBranch}{name} = $name;
+        }
+    }
+    foreach my $branch ( keys %{$svnData{max}} )
+    {
+        $svnData{tips}{$svnData{max}{$branch}{name}} = $branch;
+    }
+#    DebugDumpData("svnDataItems", \@svnDataItems);
 #    DebugDumpData("SvnData", \%svnData);
     foreach my $entry ( keys(%versions) )
+    {
         my $import_label = saneLabel($entry);
         delete $versions{$entry}{svnVersion};
         delete $versions{$entry}{svnBranchTip};
+        {
             $versions{$entry}{svnBranchTip} = $svnData{tips}{$import_label};
+        }
+    }
-    Message ( 'Trunk used: ' . (exists $svnData{branches}{trunk} ? 'Yes' : 'No') );
+    Message ( 'Trunk used: ' . (exists $svnData{'max'}{trunk} ? 'Yes' : 'No') );
     Message ( 'Labels    : ' . scalar keys %{$svnData{tags}} );
-    Message ( 'Branches  : ' . scalar keys %{$svnData{branches}} );
+    Message ( 'Branches  : ' . scalar keys %{$svnData{'max'}} );
+}
 #-------------------------------------------------------------------------------
 # Function        : ProcessSvnLog
+#
+    #
     #   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_importpackage.pl – Rev 1340 → 1341