WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage3.pl

 use Fcntl ':flock'; # import LOCK_* constants
 use Cwd;
 use DBI;
 use Getopt::Long;
 use Pod::Usage;                             # required for help support
+use Encode;
+#
 #   Options
+#
 my $opt_help = 0;
 my $opt_fileList;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_resume;
 my $opt_delete;
+my $opt_recentAge = 14;             # Days
+my $opt_relabel = 1;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.uk'       => { Name => 'UkProject' },
     '.pmb'      => { Name => 'Pietermaritzburg' },
     '.vps'      => { Name => 'VixPayments' },
     '.ncc'      => { Name => 'NSWClubCard' },
     '.rm'       => { Name => 'Rome' },
+    '.vss'      => { Name => 'SmartSite' },
     'unknown'   => { Name => 'UnknownProject' },
     '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
     '.mas'      => { Name => 'Mass'  , Trunk => 1 },
     '.cr'       => { Name => 'Core'  , Trunk => 1 },
     '.pxxx.sydddd'  => '.syd',
     '.oslo'         => '.oso',
     '.osl'          => '.oso',
 );
+my @excludeFromImport = (
+    # 22-Oct-12: Excluded on request from Kasun Sirikumara
+    # Pending VSS work
+    'agency_website',
+    'alx',
+    'alx-api',
+    'cardholder_website',
+    'loginmodule-ad',
+    'ols-enquiry',
+    'ols-enquiry-api',
+    'olsrpc4j',
+    'orca-middleware',
+    'orca-middleware-api',
+    'orca-salesEngine',
+    'orca-web-api',
+    'orca-web-utils',
+    'TestPaymentGateway',
+    'tgen4j',
+    'web-cd-client',
+);
 my %specialPackages = (
-    'core_devl' =>  ',all,protected,',
+    'core_devl'           =>  ',all,protected,',
+    'daf_utils_mos'       => ',flat,',
-#    'core_devl' =>  ',all,',
+    'mos_packager'        => ',all,',
+    'cfmgr-cfmgr'         => ',flat,',
-    'daf_utils_mos' => ',flat,',
+    'daf_utils_button_st' => ',flat,',
-    'mos_packager'  => ',all,',
+    'ReleaseName'         => ',flat,',
+    'reports'             => ',utf8,',
+    'cda_imports'         => ',utf8,',
+    'cdxforms'            => ',utf8,',
+    'db_cda'              => ',utf8,',
     # Need to be handled in a special manner
     # Not done by this utility
+    #
     'linux_drivers_eb5600'  => ',protected,',
     'linux_drivers_cobra'   => ',protected,',
     'linux_drivers_bcp4600' => ',protected,',
     'linux_drivers_etx86'   => ',protected,',
     'linux_drivers_tp5600'  => ',protected,',
+# Not in the ukHops migration at the moment
+    'cs'                        => ',protected,',
+    'DBA-Common'                => ',protected,',
+    'DBA-DatabaseInstall'       => ',protected,',
+    'DBA-ExternalPerlModules'   => ',protected,',
+    'DBA-OraUserBuild'          => ',protected,',
+    'DBA-OST'                   => ',protected,',
+    'orahops-install'           => ',protected,',
+    'orahops-patch'             => ',protected,',
+    'orahops-ssw-install'       => ',protected,',
+    'orahops-ssw-patch'         => ',protected,',
+# End of ukHops migration exclussion
     'ftp'                   => 'SetProjectBase,',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
     'daf_osa_mos'           => 'IgnoreProjectBase,',
     'itso_ud'               => 'IgnoreProjectBase,',
 #    'mos_api'               => 'IgnoreProjectBase,',
 #    'mos_fonts'             => 'IgnoreProjectBase,',
 #    'sntp'                  => 'IgnoreProjectBase,',
 #    'time_it'               => 'IgnoreProjectBase,',
 );
 my %notCots = (
     'isl'       => 1,
 );
+my $ukHopsMode = 0;
+my %ukHopsReleases = (
+    '6222'      => { name => 'MainLine', 'trunk' => 1 },
+    '14503'     => { name => 'Hops3' },
+    '21864'     => { name => 'Hops3.6' },
+    '22303'     => { name => 'Hops3.7' },
+    '17223'     => { name => 'Hops4' },
+);
+# The following packages will have the version in the specified release forced to be on the trunk
+# A trunk will be forced and the version will be on it.
+#   May only work if the version in the release is also a TIP
+my %ukHopsTip = (
+    'ItsoMessaging'         => '6222',
+    'MessageProcessor'      => '6222',
+    'StrongNameKey'         => '6222',
+);
 ################################################################################
 #   Global data
+#
 my $VERSION = "1.0.0";
 my $RM_DB;
 my $allSvn;
 my @multiplePaths;
 my @badEssentials;
 my %svnData;
 my $cwd;
+my $mustConvertFileNames;
 my $packageNames;
 my @packageNames;
 my $multiPackages = -1;
 my $visitId = 0;
 my $noTransfer;
 my $rippleCount = 0;
 my $svnRepo;
 my $processCount = 0;
 my $processTotal = 0;
+my $recentCount = 0;
+my $packageReLabelCount = 0;
+my %saneLabels;
 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
                 "delete!"       => \$opt_delete,
                 "postimage!"    => \$opt_postimage,
                 'workdir:s'     => \$opt_workDir,
                 'filelist:s'    => \$opt_fileList,      # A list of CC tags
                 'resume:s'      => \$opt_resume,
+                'relabel!'      => \$opt_relabel,
                 );
+#
 #   Process help and manual options
+#
     chdir $cwd || Error ("Cannot cd back to $cwd");
     rmdir $workDir;
     Warning ("Work Directory still exists: $workDir");
     saveData();
-#DebugDumpData("AllData", \%versions );
+}
 #-------------------------------------------------------------------------------
 # Function        : setPruneMode
+#
         $opt_flat = 1 unless defined $opt_flat;
         setPruneMode('none') unless (defined $opt_pruneModeString);
     } elsif ( exists $suffixes{'.tool'} ) {
         $packageType = 'TOOL';
-        $Projects{'.tool'}{'Trunk'} = 1;
+        $Projects{'.tool'}{Trunk} = 1;
         $singleProject = 1;
         setPruneMode('none') unless (defined $opt_pruneModeString);
 #        $opt_flat = 1;
     } elsif ( scalar (keys %suffixes ) == 1 ) {
+    }
+    #
     #   Some packages are special
+    #
+    if ( $svnRepo =~ m~/Manufacturing(/|$)~ )
+    {
+        Message ("Set Manufacturing Repo style");
+        $opt_flat = 1;
+        setPruneMode('none') unless (defined $opt_pruneModeString);
+    }
     if ( $packageNames[0] =~ m'^br_applet_' )
+    {
-        $opt_flat = 1 unless defined $opt_flat;
+      $opt_flat = 1 unless defined $opt_flat;
+    }
+    foreach  ( @excludeFromImport )
+    {
+         $specialPackages{$_} .= 'protected,';
+    }
     if ( exists $specialPackages{$packageNames[0]} )
+    {
         my $data = $specialPackages{$packageNames[0]};
         if ( index( $data, 'IgnoreProjectBase,' ) >= 0) {
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Ignore ProjectBase Errors");
+        }
+        if ( index( $data, 'utf8,' ) >= 0) {
+            $mustConvertFileNames = 1;
+            Message ("Convert filenames to UTF8");
+        }
+    }
     Message("Package Type: $packageType, $pruneModeString");
+}
                     $versions{$entry}{newSuffix} = 1;
+                }
+            }
+        }
+    }
+    #
+    #   Mark UkHops special points
+    #
+    foreach my $entry ( keys(%versions) ) {
+        foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
+            next unless ( exists $ukHopsReleases{$rtag_id} );
+            next unless ( $svnRepo =~ m~/ITSO_TRACS$~ );
+            #
+            #   This package is current in a special ukHops release
+            #   Need to handle the differently
+            #
+            my $ukData =  $ukHopsReleases{$rtag_id};
+            # Mark version we want on the trunk
+            # Will calculate tip later
+            if ( $ukData->{trunk} )
+            {
+                #
+                #   Can only place on trunk IFF its a tip
+                #   May have a WIP.
+                #   Solution. Walk to the tip, but only if there is one
+                #             path.
+                #
+                my $end = $entry;
+                my $last;
+                while ( $end )
+                {
+                    $last = $end;
+                    if ( @{$versions{$end}{next}} > 1)
+                    {
+                        Warning ("Uk Release. Preferred trunk is not a tip: $versions{$entry}{vname}");
+                        last;
+                    }
+                    $end = @{$versions{$end}{next}}[0];
+                }
+                $versions{$last}{ukTrunk} = 1 ;
+            }
+            #
+            #   What to do if the version is in more than one release
+            #
+            $versions{$entry}{ukBranch}++;
+            if ( $versions{$entry}{ukBranch} > 1 )
+            {
+                Warning ("Version found in multiple Uk Releases - don't know what to do");
+            }
+            #
+            #   What to do if the package has multiple version in a release
+            #
+            $ukData->{count}++;
+            if ( $ukData->{count} > 1 )
+            {
+                Warning ("Package has multiple versions in the one Uk Release: $versions{$entry}{Releases}{$rtag_id}{rname}");
+            }
+        }
+    }
+    #
     #   Prune
     #   Marks paths to root for all essential packages
     #   Marks the last-N from all essential packages
             my $entry = $_;
             my $count = 0;
             while ( $entry )
+            {
                 last if ( $versions{$entry}{KeepMe} );
-                unless ( $versions{$entry}{isaRipple} )
+#                unless ( $versions{$entry}{isaRipple} )
+                {
                     my $keepFlag = ($count++ < $opt_retaincount);
                     last unless ( $keepFlag );
                     $versions{$entry}{KeepMe} = $keepFlag;
+                }
                 $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
+        #
+        {
             my ($entry) = @_;
             return 0 unless ( exists $versions{$entry} );
             return 0 unless ( $versions{$entry}{last} );
-            return 0 if ( ($pruneMode == 2) && exists $versions{$entry}{KeepMe} );
+#            return 0 if ( ($pruneMode == 2) && exists $versions{$entry}{KeepMe} );
+            return 0 if ( exists $versions{$entry}{KeepMe} );
             return 0 if ( exists $versions{$entry}{Essential} );
             return 0 if ( $versions{$entry}{newSuffix} );
             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) )
+        {
+        #
         calcRippleGroups();
+    }
+    #
+    #   Want some versions to be forced to tip trunk
+    #
+    foreach my $name ( keys %ukHopsTip )
+    {
+        foreach my $entry ( keys(%versions) )
+        {
+            next unless ( $versions{$entry}{name} eq $name  );
+            next unless ( exists $versions{$entry}{Releases}{$ukHopsTip{$name}} );
+            #
+            #   Force this suffix to be the trunk
+            #   Remove all others
+            #
+            foreach my $suffix ( keys %Projects )
+            {
+                delete $Projects{$suffix}{Trunk};
+            }
+            my $suffix = $versions{$entry}{suffix};
+            $Projects{$suffix}{Trunk} = 1;
+        }
+    }
+    #
     #   Calculate best through-path for branches in the tree
     #   Attempt to keep that 'max' version on the mainline
     #   May be modified by -tip=nnnn
+    #
     #   For each leaf (end point), walk backwards and mark each node with the
     #   be recalculated
+    #
     Message ("Calculate Max Version");
     my $maxVersion;
     foreach my $entry ( @endPoints )
+    {
         my $lastSuffix;
         my $forceTip;
         while ( $entry )
             if (!defined($lastSuffix) || ($versions{$entry}{suffix} ne $lastSuffix) )
+            {
                 $maxVersion = '0';
                 $visitId++;
                 $forceTip = ( exists $tipVersions{$versions{$entry}{vname}} );
+                $forceTip = 1 if $versions{$entry}{ukTrunk};
                 delete $tipVersions{$versions{$entry}{vname}};
                 $maxVersion = '999.999.999.999.zzz' if ( $forceTip );
                 $lastSuffix = $versions{$entry}{suffix};
 #print "---Tip Found\n" if $forceTip;
+            }
     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          :
             $createBranch = 1;
             $createSuffix = 1 if $versions{$entry}{newSuffix};
+        }
         newPackageVersion( $entry );
+        unless ( $globalError )
+        {
+            getSvnData();
+            createImages();
+        }
 no warnings "recursion";
         processBranch (@{$versions{$entry}{next}});
+    }
+}
     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 ( $opt_resume )
+    {
         return
         unless ( $opt_resume eq $versions{$entry}{vcsTag} );
         $opt_resume = '';
+    }
+    #
     #   If we have a global error,then we pretend to process, but we
     #   report errors for the logging system
+    #
-    unless ( $globalError )
+    if ( $globalError )
+    {
+        Message ("Global error prevents futher importation");
+    }
+    else
+    {
+        #
         #   Call worker function
         #   It will exist on any error so that it can be logged
+        #
     $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 && ($rv != 4 && $rv != 12 )) )
+        {
+            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: $data{ViewRoot}");
+    }
+    #
     #   If this version has any 'ripples' then process them while we have the
     #   main view. Note the ripple list may contain entries that do not
     #   exist - they will have been pruned.
+    #
+if(1) {
     foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+    {
         next unless( exists $versions{$rentry} );
         if ($versions{$rentry}{Processed})
         Message ("Proccessing associated Ripple: " . GetVname($rentry));
         newPackageVersion($rentry);
+    }
+}
+}
 #-------------------------------------------------------------------------------
 # Function        : newPackageVersionBody
+#
 # Description     : Perform the bulk of the work in creating a new PackageVersion
+{
     my ($data, $entry) = @_;
     my $rv;
     my $cc_label;
     my $cc_path;
+    my $cc_path_original;
+    #
     #   Init Data
+    #
     $data->{rmRef} = 'ERROR';
     $data->{tag} =~ m~^(.+?)::(.*?)(::(.+))?$~;
     $cc_label = $4;
     $cc_path = $2;
     $cc_path = '/' . $cc_path;
     $cc_path =~ tr~\\/~/~s;
+    $cc_path_original = $cc_path;
+    #
     #   Correct well known path mistakes
+    #
+    $cc_path =~ s~/build.pl$~~i;
+    $cc_path =~ s~/src$~~i;
+    $cc_path =~ s~/cpp$~~i;
+    $cc_path =~ s~/MASS_Dev/Infra/~/MASS_Dev_Infra/~i;
+    $cc_path =~ s~/MASS_Dev/Tools/~/MASS_Dev_Tools/~i;
     $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;
+    $cc_path =~ s~/MREF_../MREF_Package/~/MREF_Package/~i;
+    $cc_path =~ s~/MREF_Package/mass_ergocdp/~/MREF_Package/ergocdp/~i;
+    $cc_path =~ s~/MASS_Dev_Bus/CBP/systemCD.ejb~/MASS_Dev_Bus/CBP/systemCD/ejb~i;
+    $cc_path =~ s~/MASS_Dev_Bus/Financial/cpp/paymentmanager~/MASS_Dev_Bus/Financial/cpp/paymentmanager~i;
+    $cc_path =~ s~/MASS_Dev_Bus/WebServices~/MASS_Dev_Bus/WebServices~i;
+    $cc_path =~ s~/MASS_Dev_Bus/CBP/nullAdapter~//MASS_Dev_Bus/CBP/nullAdaptor~i;
+    $cc_path = '/MASS_Dev_Bus' if ( $cc_path =~ m~/MASS_Dev_Bus/ImageCapture(/|$)~i );
+    $cc_path = '/MASS_Dev_Bus/CBP/enquiry' if ( $versions{$entry}{name} eq 'EJBEnqPxyConnector');
+    $cc_path = '/MASS_Dev_Bus/CBP/enquiry' if ( $versions{$entry}{name} eq 'proxyif4j');
+    $cc_path = '/MASS_Dev_Bus' if ( $versions{$entry}{name} eq 'ImageCaptureTomcatDeployment');
+    $cc_path = '/MASS_Dev_Bus/WebServices/MassWS' if ( $versions{$entry}{name} eq 'MassWebServicesImpl');
+    if (   $versions{$entry}{name} =~ m/^ERGagency$/i
+        || $versions{$entry}{name} =~ m/^ERGavm$/i
+        || $versions{$entry}{name} =~ m/^ERGboi$/i
+        || $versions{$entry}{name} =~ m/^ERGcallcenter$/i
+        || $versions{$entry}{name} =~ m/^ERGcardholder$/i
+        || $versions{$entry}{name} =~ m/^ERGcdaimports$/i
+        || $versions{$entry}{name} =~ m/^ERGcda$/i
+        || $versions{$entry}{name} =~ m/^ERGcscedit$/i
+        || $versions{$entry}{name} =~ m/^ERGcs$/i
+        || $versions{$entry}{name} =~ m/^ERGofs$/i
+        || $versions{$entry}{name} =~ m/^ERGols$/i
+        || $versions{$entry}{name} =~ m/^ERGtpf$/i
+        || $versions{$entry}{name} =~ m/^ERGorasys$/i
+        || $versions{$entry}{name} =~ m/^ERGoracs$/i
+        || $versions{$entry}{name} =~ m/^ERGpxyif$/i
+        || $versions{$entry}{name} =~ m/^ERGtp5upg$/i
+        || $versions{$entry}{name} =~ m/^ERGinstitutional$/i
+        || $versions{$entry}{name} =~ m/^ERGinfra$/i
+        || $versions{$entry}{name} =~ m/^ERGcrrpts$/i
+        || $versions{$entry}{name} =~ m/^ERGmiddle$/i
+        || $versions{$entry}{name} =~ m/^ERGmiddleapi$/i
+        || $versions{$entry}{name} =~ m/^ERGwebapi$/i
+        || $versions{$entry}{name} =~ m/^ERGwebtestui$/i
+        || $versions{$entry}{name} =~ m/^ERGwebesbui$/i
+        || $versions{$entry}{name} =~ m/^ERGwspiv$/i
+        || $versions{$entry}{name} =~ m/^ERGwscst$/i
+        || $versions{$entry}{name} =~ m/^sposMUG$/i
+        || $versions{$entry}{name} =~ m/^ERGfinman$/i
+        || $versions{$entry}{name} =~ m/^ERGkm$/i
+        || $versions{$entry}{name} =~ m/^ERGxml$/i
+        || $versions{$entry}{name} =~ m/^ERGoradacw$/i
+        || $versions{$entry}{name} =~ m/^ERGtru$/i
+        )
+    {
+        $cc_path = '/MREF_Package';
+    }
+    if (   $versions{$entry}{name} =~ m/^tp5000_MUG$/i )
+    {
+        if ( $versions{$entry}{version} =~ m~vtk$~ )
+        {
+            $cc_path = '/MREF_Package';
+        }
+    }
+    if ( $cc_path_original ne $cc_path )
+    {
+            Message ("Package: $versions{$entry}{name}. Forcing CC path to: $cc_path" );
+    }
 #print "--- Path: $cc_path, Label: $cc_label\n";
+    #
     #   Create CC view
     #   Import into Subversion View
+    #
-    $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
+    $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label );
-    $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
-    if ( $opt_preserveProjectBase )
-    {
-        my $cc_vob = $cc_path;
-        $cc_vob =~ s~^/~~;
-        $cc_vob =~ s~/.*~~;
-        $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
-        Message ("Preserving Project Base");
-    }
-    $data->{ViewPath} =~  tr~/~/~s;
-    if ( $opt_reuse && -d $data->{ViewPath}  )
-    {
-        Message ("Reusing view: $cc_label");
-    }
-    else
-    {
-        my @args;
-        push (@args, '-view', $opt_name ) if ( defined $opt_name );
-        $rv = JatsToolPrint ( 'jats_ccrelease', '-extractfiles', '-root=.' , '-noprefix',
-                    "-label=$cc_label" ,
-                    "-path=$cc_path",
-                    @args
-                    );
+    return $rv if ( $rv );
-        unless ( -d $data->{ViewPath}  )
-        {
-            $data->{errStr} = 'Failed to extract files from CC';
-            return 2;
-        }
-    }
+    #
     #   Some really ugly packages make use of a Jats feature called 'SetProjectBase'
     #   Detect such packages as we will need to handle them differently
     #   Can't really handle it on the fly
-    #   All we can do is detct it and report it - at the moment
+    #   All we can do is detect it and report it - at the moment
+    #
     if (detectProjectBaseUsage($data, $cc_path) )
+    {
         unless ( $opt_ignoreProjectBaseErrors )
+        {
             $data->{BadProjectBase}++;
             $data->{errStr} = 'Bad usage of ProjectBase detected';
+            return 4;           # Lets see what the others look like too
-            return 14;
+#            return 14;
+        }
+    }
+    #
+        #
         #   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;
+        }
+    }
+    #
+    #   Some packages have filenames that are need to be converted
+    #
+    if ( $mustConvertFileNames || 1  )
+    {
+        $rv = system ( '/home/dpurdie/svn/tools/convmv-1.15/convmv',
+                 '-fiso-8859-1',
+                 '-tutf8',
+                 '-r',
+                 '--notest',
+                 $data->{ViewPath} );
+        if ( $rv )
+        {
+            $data->{errStr} = 'Failed to convert filenames to UTF8';
+            return 14;
+        }
+    }
+    #
     #   Have a CC view
     #   Now we can create the SVN package and branching point before we
+    {
         $data->{errStr} = 'Failed to import to SVN';
         return 12;
+    }
+    $versions{$entry}{TagCreated} = 1;
+    $firstVersionCreated = $entry unless ( $firstVersionCreated );
+    #
     #   Read in the Rm Reference
     #   Retain entries in a global file
+    #
     if ( -f $datafile  )
+    {
         $data->{errStr} = 'Failed to determine Rm Reference';
         return 13;
+    }
+######################## Deleted ###############################################
+#
+#
+#    #
+#    #   Add supplemental tags if this version is in a 'Release'
+#    #   But only for some packages - else looks like a mess
+#    #   Just a solution for the ITSO guys
+#    #
+#    foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  )
+#    {
+#        next unless ( $svnRepo =~ m~/ITSO_TRACS(/|$)~);
+#
+#        my $prog_id = $versions{$entry}{Releases}{$rtag_id}{proj_id};
+#        Message ("Adding Release Tag:$prog_id:$rtag_id");
+#
+#        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rtag_id}{rname});
+#        my @comment;
+#        push @comment, "Tagged by ClearCase to Subversion import";
+#        push @comment, "Project:$prog_id:$versions{$entry}{Releases}{$rtag_id}{pname}";
+#        push @comment, "Release:$rtag_id:$versions{$entry}{Releases}{$rtag_id}{rname}";
+#
+#        $data->{ReleaseTag}{$prog_id}{$rtag_id}{name} = $rtext;
+#
+#        $rv = JatsToolPrint ( 'jats_svnlabel' ,
+#                    '-comment', encode('UTF-8', join("\n", @comment), Encode::FB_DEFAULT),
+#                    $data->{rmRef},
+#                    '-clone',
+#                    $rtext,
+##                    @args,
+#                    '-author=buildadm',
+#                     );
+#        $data->{ReleaseTag}{$prog_id}{$rtag_id}{eState} = $rv;
+#        $data->{ReleaseTag}{tCount}++;
+#
+#        if ( $rv )
+#        {
+#            $data->{ReleaseTag}{eCount}++;
+#            Warning("Failed to add Release Tag: $rtext");
+#        }
+#    }
+#
+######################## Deleted ###############################################
     Message ("RM Ref: $data->{rmRef}");
     unlink $datafile;
-    # Detect empty packages
-    unless ( $data->{rmRef} =~ m~\@~ )
-    {
-        $data->{errStr} = 'Looks like empty source - version saved';
-        return 3;
-    }
+    #
     #   All is good
+    #
-    $versions{$entry}{TagCreated} = 1;
-    $firstVersionCreated = $entry unless ( $firstVersionCreated );
     $data->{errStr} = '';
     return 0;
+}
+    #
     #   Perform the branch
+    #
     if ( defined $src_label )
+    {
+        #
+        #   The 'clone' operation will backtrack the branch point
+        #   to the source of the label. This will make the output version
+        #   tree much prettier
+        #
         my @opts;
         push (@opts, '-date', $date) if ( $date );
         push (@opts, '-author', $author) if ( $author );
         JatsToolPrint ( 'jats_svnlabel',
+#
 # Returns         :
+#
 sub endPackage
+{
+    Message ("-- Import Summary ------------------------------------------------" );
     RmDirTree ('SvnImportDir');
+    #
     #   Display versions that did get captured
+    #
+    #
     foreach my $entry ( @processOrder )
+    {
         $versions{$entry}{Scanned} = 1;
         next if ( $versions{$entry}{TagCreated} );
+        my $reason = $versions{$entry}{data}{errStr} || '';
+        my $tag = $versions{$entry}{vcsTag}|| 'No Tag';
-        Warning ("Not Processed: " . GetVname($entry) );
+        Warning ("Not Processed: " . GetVname($entry) . ':' . $tag . ' : ' . $reason );
+    }
     foreach my $entry ( keys(%versions) )
+    {
         next if ( $versions{$entry}{Scanned} );
         Warning ("(E) INTERNAL ERROR. Package Not Processed: " . GetVname($entry) );
+    }
+    Message ("Packages Relabled: $packageReLabelCount") if ( $packageReLabelCount );
     Message ("All Done");
+}
 #-------------------------------------------------------------------------------
+# Function        : extractFilesFromClearCase
+#
+# Description     : Extract files from ClearCase
+#                   May take a while as we handle nasty errors
+#
+# Inputs          : $data           - Hash of good stuff from newPackageVersionBody
+#                   $cc_path
+#                   $cc_label
+#
+# Returns         : exit code
+#                   Sets up
+#                       $data->{errStr}
+#                       $data->{errCode}
+#                   As per newPackageVersionBody
+#
+sub extractFilesFromClearCase
+{
+    my ($data, $cc_path, $cc_label) = @_;
+    my $tryCount = 0;
+    my $rv = 99;
+    $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
+    $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+    if ( $opt_preserveProjectBase )
+    {
+        my $cc_vob = $cc_path;
+        $cc_vob =~ s~^/~~;
+        $cc_vob =~ s~/.*~~;
+        $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
+        Message ("Preserving Project Base");
+    }
+    $data->{ViewPath} =~  tr~/~/~s;
+    if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
+        Message ("Reusing view: $cc_label");
+        return 0;
+    }
+    while ( $rv == 99 ) {
+        my @args;
+        push (@args, '-view', $opt_name ) if ( defined $opt_name );
+        $rv = JatsToolPrint ( 'jats_ccrelease', '-extractfiles', '-root=.' , '-noprefix',
+                    "-label=$cc_label" ,
+                    "-path=$cc_path",
+                    @args
+                    );
+        if ( $rv == 10 ) {
+            #
+            #   No files found
+            #   If this is the first time then try really hard to find them
+            #
+            unless ( $tryCount++ )
+            {
+                if ( $opt_relabel )
+                {
+                    $packageReLabelCount++;
+                    $rv = JatsToolPrint('cc2svn_labeldirs',
+                                            '-vob', $cc_path,
+                                            $cc_label,
+                                            );
+                    $data->{DirsLabled} = 100 + $rv;
+                }
+                #
+                #   Second attempt - massage the users path
+                #   We should have labled up to the VOB root so lets
+                #   just use the VOB and not the path
+                #
+                #   If we are not relabeling then we can still do this
+                #   in an attempt to fix user stupidity
+                #
+                $cc_path =~ s~^/~~;
+                $cc_path =~ s~/.*~~;
+                $cc_path = '/' . $cc_path;
+                $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+                redo;
+            }
+            $data->{errStr}  = 'No Files in the extracted view';
+            $data->{errCode} = '0';
+            return 2;
+        }
+        elsif ( $rv == 11 ) {
+            $data->{errStr} = 'Label not found';
+            $data->{errCode} = 'L';
+            return 2;
+        }
+        unless ( -d $data->{ViewPath}  )
+        {
+            $data->{errStr} = 'Failed to extract files from CC';
+            return 2;
+        }
+        #
+        #   Looks good
+        #
+        return 0;
+    };
+    $data->{errStr}  = 'No Files in the extracted view after labeling dirs';
+    $data->{errCode} = '0';
+    return 2;
+}
+#-------------------------------------------------------------------------------
 # Function        : detectProjectBaseUsage
+#
 # Description     : Detect and report usage of the SetProjectBase directive
+#
 # Inputs          : $data               - Ref to a hash of bits
                 if ( m~^SetProjectBase~ )
+                {
                     $definesProjectBase++;
                     $data->{DefinesProjectBase}++;
-                    Warning ("Package uses SetProjectBase:",
+                    Warning ("Package initialises SetProjectBase:",
                              "Line: " . $_,
                              "Root: " . "$data->{ViewRoot}",
                              "File: " . "$data->{ViewRoot}/$file",
                             );
                         pop @bpaths;
+                    }
                     unless (defined $blevel)
+                    {
                         Warning ("SetProjectBase$eSuf calculation failed - can't find build.pl");
-                        $retval = 1;
+#                        $retval = 1;
+                         $definitionError++;
+                    }
                     else
+                    {
+                        #
                         #   Determine the depth of the view root
 #-------------------------------------------------------------------------------
 # Function        : findDirWithStuff
+#
 # Description     : Find a directory that contains more than just another subdir
+#                   Note: don't use 'glob' it doesn't work if the name has a space in it.
+#
 # Inputs          : $base               - Start of the scan
+#
 # Returns         : Path to dir with more than just a single dir in it
+#
     while ( $base )
+    {
     my $fileCount = 0;
     my $dirCount = 0;
+    my $firstDir;
+    opendir (my $dh, $base ) || Error ("Cannot opendir $base. $!");
-    my @list = glob( $base . '/*');
+    my @list =readdir $dh;
+    closedir $dh;
     foreach ( @list )
+    {
         next if ( $_ eq '.' );
         next if ( $_ eq '..' );
+        $_ = $base . '/' . $_;
         if ( -d $_ )
+        {
             $dirCount++;
+            $firstDir = $_ unless ( defined $firstDir );
+            return $base
-            return $base if ( $dirCount > 1  );
+                if ( $dirCount > 1  )
+        }
-        else
+        elsif ( -e $_ )
+        {
             return $base;
+        }
+        # else its probably a dead symlink
+    }
+    return $base
-    return $base unless ( $dirCount == 1  );
+        unless ( $dirCount == 1  );
-    $base = $list[0];
+    $base = $firstDir;
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : JatsToolPrint
+#
 # Description     : Print and Execuate a JatsTool command
+#
+        }
+    }
     return $me;
+}
+#-------------------------------------------------------------------------------
+# Function        : saneLabel
+#
+# Description     : Generate a sane version label
+#                   Handle suplicates (due to character squishing)
+#                   Cache results for repeatability
+#
+# Inputs          : $entry          - Version info
+#                   $pkgname        - Alternate pkgname (branching)
+#
+# Returns         : Sane string
+#
 sub saneLabel
+{
     my ($entry, $pkgname) = @_;
     my $me;
+    $me = $versions{$entry}{vname};
+    $pkgname = $versions{$entry}{name} unless ( defined $pkgname );
+    #
+    #   If we have calculated it, then reuse it.
+    #
-    if ( $versions{$entry}{realLabel} )
+    if ( exists $versions{$entry}{saneLabel}{$pkgname} )
+    {
-        $me = $versions{$entry}{realLabel};
+        return $versions{$entry}{saneLabel}{$pkgname};
-        return $me;
+    }
-    $me = $versions{$entry}{vname};
-    $pkgname = $versions{$entry}{name} unless ( defined $pkgname );
     Error ("Package does have a version string: pvid: $entry")
         unless ( defined $me );
+    #
     $me = $pkgname . '_' . $me;
     $me =~ tr~ ~-~s;
     $me =~ tr~-~-~s;
     $me =~ tr~_~_~s;
+    #
+    #   Due to some sillyness ( package version starting with _ )
+    #   we may get duplicates. Detect and allocate different numbers
+    #
+    if ( exists $saneLabels{$me} )
+    {
+        $saneLabels{$me}++;
+        $me = $me . '.' . $saneLabels{$me};
+        Message ("Duplicate SaneLabel resolved as: $me");
+    }
+    else
+    {
+        $saneLabels{$me} = 0;
+    }
+    #
+    #   Cache value
+    #
+    $versions{$entry}{saneLabel}{$pkgname} = $me;
     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;
 #-------------------------------------------------------------------------------
     connectRM(\$RM_DB) unless ( $RM_DB );
+    #
     #   Extract data from Release Manager
+    #
+    my $m_sqlstr = "SELECT " .
+                       "pkg.PKG_NAME, " .                                       # row[0]
+                       "pv.PKG_VERSION, " .                                     # row[1]
+                       "pkg.PKG_ID, " .                                         # row[2]
+                       "pv.PV_ID, " .                                           # row[3]
+                       "pv.LAST_PV_ID, " .                                      # row[4]
+                       "pv.MODIFIED_STAMP, " .                                  # row[5]
-    my $m_sqlstr = "SELECT pkg.PKG_NAME, pv.PKG_VERSION, pkg.PKG_ID, pv.PV_ID, pv.LAST_PV_ID, pv.MODIFIED_STAMP, release_manager.PK_RMAPI.return_vcs_tag(pv.PV_ID), amu.USER_NAME, pv.COMMENTS, pv.DLOCKED, pv.CREATOR_ID ".
+                       "release_manager.PK_RMAPI.return_vcs_tag(pv.PV_ID), " .  # row[6]
-                   " FROM RELEASE_MANAGER.PACKAGES pkg, RELEASE_MANAGER.PACKAGE_VERSIONS pv, ACCESS_MANAGER.USERS amu" .
+                       "amu.USER_NAME, " .                                      # row[7]
+                       "pv.COMMENTS, " .                                        # row[8]
+                       "pv.DLOCKED, " .                                         # row[9]
+                       "pv.CREATOR_ID, ".                                       # row[10]
-                   " WHERE pv.PKG_ID = \'$pkg_id\' AND pkg.PKG_ID = pv.PKG_ID AND amu.USER_ID (+) = pv.CREATOR_ID";
+                       "pv.BUILD_TYPE ".                                        # row[11]
+                   " FROM " .
+                        "RELEASE_MANAGER.PACKAGES pkg, " .
+                        "RELEASE_MANAGER.PACKAGE_VERSIONS pv, " .
+                        "ACCESS_MANAGER.USERS amu" .
+                   " WHERE " .
+                        "pv.PKG_ID = \'$pkg_id\' " .
+                        "AND pkg.PKG_ID = pv.PKG_ID " .
+                        "AND amu.USER_ID (+) = pv.CREATOR_ID";
     my $sth = $RM_DB->prepare($m_sqlstr);
     if ( defined($sth) )
+    {
         if ( $sth->execute( ) )
+        {
                     my $vcstag =  $row[6] || 'Unknown';
                     my $created_id =  $row[7] || ($row[10] ? "Userid_$row[10]" :'Unknown');
                     my $comment =  $row[8] || '';
                     my $locked =  $row[9] || 'N';
+                    my $manual = $row[11] || 'M';
+                    #
                     #   Some developers have a 'special' package version
                     #   We really need to ignore them
+                    #
                     $versions{$pv_id}{comment} = $comment;
                     $versions{$pv_id}{locked} = $locked;
                     $versions{$pv_id}{TimeStamp} = str2time( $created );
                     $versions{$pv_id}{Age} = ($now - $versions{$pv_id}{TimeStamp}) / (60 * 60 * 24);
                     $versions{$pv_id}{TooOld} = 1 if ( $opt_age && $opt_age <= $versions{$pv_id}{Age} );
+                    $versions{$pv_id}{BuildType} = $manual;
                     examineVcsTag($pv_id);
+                    #
                     #   Process version number
+                    #
                     my ($suffix, $version, $isaR, $isaWip, $buildVersion ) = massageVersion($pkg_ver, $pkg_name);
                     $versions{$pv_id}{version} = $version;
                     $versions{$pv_id}{buildVersion} = $buildVersion;
-                    $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
                     $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
+                    #
+                    #   New methof for detecting a ripple
+                    #       Don't look at the version number
+                    #       Use RM data
+                    #       Inlude the comment - there are some cases where the comment
+                    #       appears to have been user modified.
+                    #
+#                    $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
+#                    $versions{$pv_id}{isaRipple} = 1 if ( uc($manual) eq 'Y' );
+                    $versions{$pv_id}{isaRipple} = ( $comment =~ m~^Rippled Build~i && ( uc($manual) eq 'Y' ));
+                    #
                     #   Process suffix
+                    #
                     $suffix = 'Unknown' unless ( $suffix );
                     $suffix = lc ($suffix);
                     $versions{$pv_id}{suffix} = $suffix;
+{
     my ($tag) = @_;
     $tag =~ tr~\\/~/~;
     if ( $tag =~ m~^CC::~ )
+    {
+        $tag =~ s~CC::load\s+~CC::~;                # Load rule
+        $tag =~ s~CC::\s+~CC::~;                    # Leading white space
+        $tag =~ s~CC::[A-Za-z]\:/~CC::/~;           # Leading driver letter
+        $tag =~ s~CC::/+~CC::/~;                    # Multiple initial /'s
+        $tag =~ s~/build.pl::~::~i;
-        $tag =~ s~CC::\s+~CC::~;
+        $tag =~ s~/src::~::~i;
         $tag =~ s~MASS_Dev_Bus/Cbp/~MASS_Dev_Bus/CBP/~i;
         $tag =~ s~MASS_Dev_Bus~MASS_Dev_Bus~i;
         $tag =~ s~/MASS_Dev/Infra~MASS_Dev_Infra~i;
         $tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;
+#
 sub createImages
+{
     my $filebase = "${packageNames}";
-    open (FH, '>', "$filebase.dot" ) or die "Cannot open output";
+    open (FH, '>', $cwd . "/$filebase.dot" ) or die "Cannot open output";
     print FH "digraph \"${packageNames}\" {\n";
     #print FH "rankdir=LR;\n";
     print FH "node[fontsize=16];\n";
     print FH "node[target=_graphviz];\n";
 #    print FH "subgraph cluster_A {\n";
         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, '|';
             push @text, 'Subversion';
             push @text, 'Trunk used' if exists $svnData{branches}{trunk} ;
             push @text, 'Labels: ' . scalar keys %{$svnData{tags}} ;
             push @text, 'Branches: ' . scalar keys %{$svnData{branches}} ;
+            push @text, 'Relabled Packages : ' . $packageReLabelCount;
+        }
         push @text, '';
         my $text = join '\l', @text;
         $text =~ s~\|\\l~|~g;
         push @text, 'd: A dependency';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
         push @text, 'e: Essential BOM Version';
         push @text, 'E: Essential Release Version';
+        push @text, 'F: Package directories labled';
         push @text, 'G: Glued into Version Tree';
+        push @text, 'L: Label not in VOB';
+        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';
+        push @text, '0: Zero files extracted';
         push @text, '}}';
         push @text, '|';
         push @text, 'Outline';
         push @text, 'Red: Dead or Bad VCS Tag';
         push @text, 'Orange: Project Branch Root';
         push @text, 'Green: Ripple Build Version';
         push @text, 'Blue: Essential Version';
         push @text, 'Darkmagenta: Entry Glued into tree';
         push @text, 'Magenta: Entry added to project tree';
+        push @text, 'DeepPink: Label not in VOB';
+        push @text, 'DarkViolet: Zero files extracted';
         push @text, '|';
         push @text, 'Fill';
         push @text, 'PowderBlue: Essential Version';
         $stateText .= 'G' if (exists $versions{$entry}{GluedIn});
         $stateText .= 't' if (exists $versions{$entry}{MakeTree});
 #        $stateText .= 'E' if (exists $versions{$entry}{Essential});
         $stateText .= $reason if ( $reason );
         $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} );
+        $stateText .= '0' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq '0');
+        $stateText .= 'L' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq 'L');
+        $stateText .= 'F' if ($versions{$entry}{data}{DirsLabled});
 #        $stateText .= 's' if (exists $versions{$entry}{branchPoint} );
 #        $stateText .= ' T='. $versions{$entry}{threadId} if (exists $versions{$entry}{threadId});
 #        $stateText .= ' EssentalPath' if (exists $versions{$entry}{EssentialPath});
 #        $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 );
+        push @label, "(${stateText})" if ( length($stateText) );
+##       Insert Release Names
+        foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
+            next unless ( exists $ukHopsReleases{$rtag_id} );
+            push @label, "Release: $versions{$entry}{Releases}{$rtag_id}{rname}";
+        }
         return join ('\n', @label );
+    }
     sub genAttributes
            $color = 'color=orange style=bold' if ( $versions{$entry}{newSuffix} );
            $color = 'color=red style=bold' if ( $versions{$entry}{DeadWood} || $versions{$entry}{badVcsTag} );
            $color = 'color=blue style=bold' if ( $versions{$entry}{Essential} );
            $color = 'color=darkmagenta style=bold' if ( $versions{$entry}{GluedIn} );
            $color = 'color=magenta style=bold' if ( $versions{$entry}{MakeTree} );
+           $color = 'color=DeepPink style=bold' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq 'L');
+           $color = 'color=DarkViolet style=bold' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq '0');
            $fill = 'style=filled fillcolor=powderblue' if ( $versions{$entry}{Essential} );
            $fill = 'style=filled fillcolor=red' if ( $versions{$entry}{Essential} && $versions{$entry}{badVcsTag} );
            $fill = 'style=filled fillcolor="#99FF99"' if ( exists $versions{$entry}{svnVersion} );
         push @EssentialPackages, $_;
         Error ("Essential Package Version not in extracted Release Manager Data: $_")
             unless ( exists $versions{$_} );
         $versions{$_}{Essential} = 1;
         $versions{$_}{Reason} = $ScmPackages{$_}{Reason};
+        # Retain which RM Release this package-version is the tip
+        # Release of
+        foreach my $rtag_id ( @{$ScmPackages{$_}{'release'}} )
+        {
+            $versions{$_}{Releases}{$rtag_id}{rname}   = $ScmReleases{$rtag_id}{name};
+            $versions{$_}{Releases}{$rtag_id}{pname}   = $ScmReleases{$rtag_id}{pName};
+            $versions{$_}{Releases}{$rtag_id}{proj_id} = $ScmReleases{$rtag_id}{proj_id};
+        }
-#print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname} $versions{$_}{Reason}\n";
+        #print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname}\n";
+    }
+    #
     #   Free memory
+    #
             $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        : saveData
+#
 # Description     : Save essential data
+#
             my $pkg_name = $1;
             my $pkg_ver = $2;
             $pkg_ver =~ s~^[a-zA-Z]\.*~~;
 print "$data[2] : $pkg_name, $pkg_ver\n";
-#           Expecting Clearcase format: 2011-08-30T13:49:21+08
+#           Expecting Clearcase format:
+#               2011-08-30T13:49:21+08
+#               2010-11-16T03:24:34Z
 #           Need 'YYYY-MM-DDTHH:MM:SS.M'
             my $cdate = $data[0];
             $cdate =~ s~ ~T~;
             $cdate =~ s~\+.*~~;
+            $cdate =~ s~Z+.*~~;
             $cdate .= '.00';
             $pv_id++;
 #            $versions{$pv_id}{fileListEntry} = $_;
             $versions{$pv_id}{name} = $pkg_name;
     -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
+    -[no]relabel       - Attempt to relabel dirs in packages that don't extract
+    -filelist=path     - Use named list of files
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage3.pl – Rev 2026 → 2429