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

 my $opt_vobMap;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_ignoreMakeProjectErrors;
 my $opt_forceProjectBase;
+my $opt_limitProjectBase;
 my $opt_ignoreBadPaths;
 my $opt_delete;
 my $opt_recentAge = 14;             # Days
 my $opt_relabel = 0;
 my $opt_protected;
 my $opt_useSvn = 1;
 my $opt_testRmDatabase;
 my $opt_extractFromSvn;
+my $opt_AllowMuliplePaths;
+my $opt_resume;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     'db_cda'              => ',utf8,',
     'CommandServer'       => ',IgnoreMakeProject,',
     'TDSExporterControl'  => ',IgnoreMakeProject,',
     'cdagui'              => ',IgnoreMakeProject,',
+    'ftp'                   => ',SetProjectBase,',
+    'ddu_app_manager'       => ',SetProjectBase,IgnoreMakeProject,',
+    'ddu_afc'               => ',SetProjectBase,IgnoreMakeProject,',
+    'ddu_dog'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',
+    'ddu_management'        => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode,',
-    'daf_bvt'                 => ',IgnoreMakeProject,',  # Look OK
+    'ddu_fim'               => ',IgnoreMakeProject,',
+    'ddu_mccain'            => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',
+    'ddu_mon'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle,',
+    'ddu_rcu'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode,',
+    'ddu_status_logging'    => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle,',
+    'ddu_logging_lib'       => ',SetProjectBase,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',
+    'verifone'              => ',ForceProjectBase=/DPG_SWCode/products/verifone,',
+    'dm_devcdfile'          => 'AllowMultiPath',
+    'daf_ct_mcr_unified'    => 'AllowMultiPath',
+    'cst-rms-db'            => 'AllowMultiPath',
+    'daf_common'            => 'IgnoreProjectBase',
+    'devcd'                 => 'AllowMultiPath',
-    'daf_dll'                 => ',IgnoreMakeProject,',  # MakeProject not in used makefile
+    'daf_dll'                   => 'AllowMultiPath,IgnoreMakeProject',  # MakeProject not in used makefile
+    'daf_transap_proxyman_edf'  => 'AllowMultiPath,IgnoreProjectBase',
+    'devrelease'                => 'AllowMultiPath',
+    'dm_devrelease'             => 'AllowMultiPath',
+    'dm_rtswis'                 => 'AllowMultiPath',
+    'dm_devcd'                  => 'AllowMultiPath',
+    'dm_documentation'          => 'AllowMultiPath,IgnoreBadPath',
+    'dm_eventhdr'               => 'AllowMultiPath',
+    'dm_javaenums'              => 'AllowMultiPath',
+    'dm_solidbasetypes'         => 'AllowMultiPath',
+    'dm_swismetadata'           => 'AllowMultiPath',
+    'dm_cuttables'              => 'AllowMultiPath',
+    'dm_devudapi'               => 'AllowMultiPath',
+    'buscdapi'                  => 'AllowMultiPath',
-    'PFTPi'                   => ',IgnoreMakeProject,',  # Looks OK
+    'daf_bvt'                   => 'AllowMultiPath,IgnoreMakeProject,',  # Look OK
+    'daf_cd_transap'            => 'AllowMultiPath,IgnoreBadPath,IgnoreProjectBase',
+    'cdref'                     => 'AllowMultiPath',
+    'dm_sysbasetypes'           => 'AllowMultiPath',
+    'dm_sysswis'                => 'AllowMultiPath',
+    'dm_syscd'                  => 'AllowMultiPath',
+    'dm_udtypes'                => 'AllowMultiPath',
+    'dm_systemcdtables'         => 'AllowMultiPath',
+    'dm_utils'                  => 'AllowMultiPath',
+    'dm_udxml'                  => 'AllowMultiPath',
+    'HCP5000_resources'         => 'AllowMultiPath',
+    'massrtswis'                => 'AllowMultiPath',
+    'pcp5000'                   => 'AllowMultiPath,ForceProjectBase=/DPG_SWCode',
+    'PFTPi'                   => 'AllowMultiPath,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',  # Looks OK
-    'PFTPu'                   => ',IgnoreMakeProject,',  # Looks OK
+    'PFTPu'                   => 'AllowMultiPath,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',  # Looks OK
     'WinCEBlocker'            => ',IgnoreMakeProject,',  # Looks OK
     'WinCEDeviceAutoInject'   => ',IgnoreMakeProject,',  # Looks OK
     'WinCEReboot'             => ',IgnoreMakeProject,',  # Looks OK
+    'rsmaint'                 => 'AllowMultiPath',
+    'sysbasetypes'            => 'AllowMultiPath',
+    'syscd'                   => 'AllowMultiPath',
+    'sysswis'                 => 'AllowMultiPath',
+    'udserialiser'                 => 'AllowMultiPath',
+    'systemcdtables'          => 'AllowMultiPath',
+    'udxml'          => 'AllowMultiPath',
-    'ftp'                   => ',SetProjectBase,',
-    'ddu_app_manager'       => ',SetProjectBase,IgnoreMakeProject,',
-    'ddu_afc'               => ',SetProjectBase,IgnoreMakeProject,',
+    'daf_ct_mcr_14443'          => 'LimitProjectBase=/DPG_SWBase/ct',
-    'ddu_dog'               => ',SetProjectBase,IgnoreMakeProject,',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
 my $processTotal = 0;
 my $recentCount = 0;
 my $packageReLabelCount = 0;
 my %saneLabels;
 my $adjustedPath = 0;
+my $forceImportFlush = 0;
+my %restoreData;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
-                "help+"         => \$opt_help,          # flag, multiple use allowed
+                "help+"             => \$opt_help,          # flag, multiple use allowed
-                "manual:3"      => \$opt_help,
+                "manual:3"          => \$opt_help,
-                "verbose:+"     => \$opt_verbose,       # Versose
+                "verbose:+"         => \$opt_verbose,       # Versose
-                "repository:s"  => \$opt_repo,          # Name of repository
+                "repository:s"      => \$opt_repo,          # Name of repository
-                'rbase:s'       => \$opt_repo_base,     # Base of the repo
+                'rbase:s'           => \$opt_repo_base,     # Base of the repo
-                "flat!"         => \$opt_flat,          # Flat structure
+                "flat!"             => \$opt_flat,          # Flat structure
-                "test!"         => \$opt_test,          # Test operations
+                "test!"             => \$opt_test,          # Test operations
-                "reuse!"        => \$opt_reuse,         # Reuse ClearCase views
+                "reuse!"            => \$opt_reuse,         # Reuse ClearCase views
-                "age:i"         => \$opt_age,           # Only recent versions
+                "age:i"             => \$opt_age,           # Only recent versions
-                "dump:1"        => \$opt_dump,          # Dump Data
+                "dump:1"            => \$opt_dump,          # Dump Data
-                "images:1"      => \$opt_images,        # Create DOT images
+                "images:1"          => \$opt_images,        # Create DOT images
-                "retain:i"      => \$opt_retaincount,   # Retain N packages
+                "retain:i"          => \$opt_retaincount,   # Retain N packages
-                "pruneMode:s"   => \$opt_pruneModeString,
+                "pruneMode:s"       => \$opt_pruneModeString,
-                "listtags:i"    => \$opt_listTags,
+                "listtags:i"        => \$opt_listTags,
-                "name:s"        => \$opt_name,          # Alternate output
+                "name:s"            => \$opt_name,          # Alternate output
-                "tip:s"         => \@opt_tip,           # Force tip version(s)
+                "tip:s"             => \@opt_tip,           # Force tip version(s)
-                "log!"          => \$opt_log,
+                "log!"              => \$opt_log,
-                "delete!"       => \$opt_delete,
+                "delete!"           => \$opt_delete,
-                "postimage!"    => \$opt_postimage,
+                "postimage!"        => \$opt_postimage,
-                'workdir:s'     => \$opt_workDir,
+                'workdir:s'         => \$opt_workDir,
-                'relabel!'      => \$opt_relabel,
+                'relabel!'          => \$opt_relabel,
-                'svn!'          => \$opt_useSvn,
+                'svn!'              => \$opt_useSvn,
                 'testRmDatabase'    => \$opt_testRmDatabase,
                 'fromSvn!'          => \$opt_extractFromSvn,
+                'resume'            => \$opt_resume,
                 );
+#
 #   Process help and manual options
+#
 smartPackageType();                 # Determine special prune mode
 ReportPathVariance();
 massageData();
 getSvnData();
 smartPackageType();                 # Have another go
+restoreData() if ( $opt_resume );
 my @missedTips = keys %tipVersions;
 Error ("Specified tip version not found: @missedTips") if ( @missedTips );
 if ( $opt_flat )
       $opt_flat = 1 unless defined $opt_flat;
+    }
     if ( exists $specialPackages{$packageNames[0]} )
+    {
-        my $data = $specialPackages{$packageNames[0]};
+        my $data = ',' . $specialPackages{$packageNames[0]} . ',';
         if ( index( $data, ',all' ) >= 0) {
             setPruneMode('none') unless (defined $opt_pruneModeString);
+        }
         if ( index( $data, 'protected,' ) >= 0) {
             $opt_preserveProjectBase = 1;
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Preserving ProjectBase");
+        }
+        if ( index( $data, 'AllowMultiPath,' ) >= 0) {
+            $opt_AllowMuliplePaths = 1;
+            Message ("Allowing Multiple Paths");
+        }
+        if ( $data =~ m~,ForceProjectBase=(.*?),~ ) {
+            $opt_forceProjectBase = $1;
+            $opt_AllowMuliplePaths = 1;
+            Message ("Force Project Base: $opt_forceProjectBase");
+        }
+        if ( $data =~ m~,LimitProjectBase=(.*),~ ) {
+            $opt_limitProjectBase = $1;
+            $opt_AllowMuliplePaths = 1;
+            Message ("Limit Project Base: $opt_forceProjectBase");
+        }
         if ( index( $data, 'IgnoreProjectBase,' ) >= 0) {
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Ignore ProjectBase Errors");
+        }
             Message ("Ignore MakeProject Usage");
+        }
         if ( index( $data, 'IgnoreBadPath,' ) >= 0) {
             $opt_ignoreBadPaths = 1;
-            Message ("Ignore Bad Paths in makefilest Usage");
+            Message ("Ignore Bad Paths in makefile Usage");
+        }
         if ( index( $data, 'utf8,' ) >= 0) {
             $mustConvertFileNames = 1;
             Message ("Convert filenames to UTF8");
     logToFile( $cwd . '/importsummary.txt', ";$line;");
+    #
     #   Sava data
+    #
+    if ( $rv != 6 )
+    {
-    $data{errFlags} = $flags;
+        $data{errFlags} = $flags;
-    $data{duration} = $duration;
+        $data{duration} = $duration;
+    }
     $versions{$entry}{rmRef} = $data{rmRef};
     delete $data{rmRef};
     delete $data{tag};
     ##delete $data{ViewRoot};
     $versions{$entry}{data} = \%data;
 #                                   No Files in the extracted view after labeling dirs
 #                               3 - Deadwood
 #                               4 - Bad usage of ProjectBase detected
 #                                   Use of MakeProject detected
 #                               5  - Subversion Import disabled
+#                               6  - Restored via resume
 #                       >10 - Fatal error
+#
 sub newPackageVersionBody
+{
     my ($data, $entry) = @_;
     SystemConfig ('ExitOnError' => 0);
     push @processOrder, $entry;
     return 0 if ( $opt_test );
+    #
+    #   Calculate the label for the target package
+    #   Use format <packageName>_<PackageVersion>
+    #   Need to handle WIPs too.
+    #
+    my $import_label = saneLabel($entry);
+    #
+    #   If resuming - then test existence
+    #
+    if ( $opt_resume )
+    {
+        if ( exists $restoreData{$entry}  )
+        {
+            #
+            #   May be able to test existence by looking at $versions{$entry}{svnVersion}
+            #   The hard work may have been done
+            #
+            my $isInSvn = 0;
+            if ( exists $versions{$entry}{svnVersion} && $versions{$entry}{svnVersion}  )
+            {
+                $isInSvn = 1;
+            }
+            Message("SvnVersion check: $isInSvn");
+            $rv = testSvnLabel( "$svnRepo/$packageNames", $import_label );
+            unless ( $rv )
+            {
+                Message ("Skip import - resume detected presense");
+                $firstVersionCreated = $entry unless ( $firstVersionCreated );
+                $versions{$entry}{TagCreated} = 2;
+                foreach  ( keys %{$restoreData{$entry}} )
+                {
+                    $data->{$_} = $restoreData{$entry}{$_};
+                }
+                $forceImportFlush = 1;
+DebugDumpData('Data', $data );
+                return 6;
+            }
+        }
+        else
+        {
+            Warning ("Resume data missing");
+        }
+    }
 #   Keep DeadWood. May be a WIP
 #    if ( exists $versions{$entry}{DeadWood} && $versions{$entry}{DeadWood} )
 #    {
 #        $data->{errStr} = 'Package is DeadWood';
 #        return 3;
+    {
         Warning ("Error: Bad VcsTag for: " . GetVname($entry),
                  "Tag: $data->{tag}" );
         $data->{errStr} = 'VCS Tag Marked as Bad';
         return 1;
+    }
     $data->{tag} =~ m~^(.+?)::(.*?)(::(.+))?$~;
     $vcs_type = $1;
         $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');
-        $cc_path = '/DPG_SWCode/projects/seattle/ddu' if ( $versions{$entry}{name} eq 'ddu_dog');
         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
+            {
                 $cc_path = '/MREF_Package';
+            }
+        }
+        $cc_path = $opt_forceProjectBase
+            if ( $opt_forceProjectBase );
+        if ( $opt_limitProjectBase )
+        {
+            if ( $cc_path =~ m~$opt_limitProjectBase~ )
+            {
+                $cc_path = $opt_limitProjectBase;
+            }
+        }
         if ( $cc_path_original ne $cc_path )
+        {
                 Message ("Package: $versions{$entry}{name}. Forcing CC path to: $cc_path" );
+        }
+    }
         $data->{errStr} = 'Failed to create Package';
         return 10;
+    }
+    #
-    #   Calculate the label for the target package
-    #   Use format <packageName>_<PackageVersion>
-    #   Need to handle WIPs too.
-    #
-    my $import_label = saneLabel($entry);
-    #
     #   May need to create the branchpoint
     #   The process is delayed until its needed so avoid creating unneeded
     #   branch points
+    #
     if ( $createBranch )
+        {
             $data->{errStr} = 'Failed to create Branch Point';
             return 11;
+        }
+    }
-    push @args, "-branch=$currentBranchName" if ( defined $currentBranchName );
+    #
+    #   If we are in resume mode then we MUST kill the import directory
+    #   if we have skipped anything
+    #
+    if ( $forceImportFlush )
+    {
+        $forceImportFlush = 0;
+        RmDirTree ('SvnImportDir');
+    }
+    push @args, "-branch=$currentBranchName" if ( defined $currentBranchName );
     my $datafile = "importdata.$import_label.properties";
     $rv = JatsToolPrint ( 'jats_svn', 'import', '-reuse' ,
                     "-package=$svnRepo/$packageNames",
                     "-dir=$data->{ViewPath}",
                     "-label=$import_label",
                     "-datafile=$datafile",
     #   Retain entries in a global file
+    #
     if ( -f $datafile  )
+    {
         my $rmData = JatsProperties::New($datafile);
+        if ( $rmData->getProperty('subversion.tag') )
+        {
-        $data->{rmRef} = 'SVN::' . $rmData->getProperty('subversion.tag');
+            $data->{rmRef} = 'SVN::' . $rmData->getProperty('subversion.tag');
+        }
+        else
+        {
+            Warning ("Property files has no subversion.tag");
+        }
+        $data->{fileCount}    = $rmData->getProperty('files.base', 0);
+        $data->{filesRemoved} = $rmData->getProperty('files.removed',0);
+        $data->{filesAdded}   = $rmData->getProperty('files.added',0);
+    }
     unless ( $data->{rmRef}  )
+    {
         $data->{errStr} = 'Failed to determine Rm Reference';
     push (@opts, '-author', $author) if ( $author );
+    #
     #   Only do once
+    #
     return unless ( $createPackageDone );
+    return if ( $opt_resume );
     $createPackageDone = 0;
+    #
     #   Real import
     #       Do not Delete package if it exists
+    #
     #   Perform the branch
+    #
     if ( defined $src_label )
+    {
+        if ( $opt_resume )
+        {
+            my $rv = JatsToolPrint ( 'jats_svnlabel',
+                        '-check',
+                        '-packagebase', "$svnRepo/$packageNames",
+                        '-branch',
+                        $tgt_label );
+            return unless ( $rv );
+        }
+        #
         #   The 'clone' operation will backtrack the branch point
         #   to the source of the label. This will make the output version
         #   tree much prettier
+        #
         $inernalErrorCount++;
+    }
     if ( $adjustedPath || 1 )
+    {
-        Information ("Package Paths");
+        Information ("Package Info: Files, Removed, Added, Version, ViewPath");
         foreach my $entry ( @processOrder )
+        {
             my $viewPath = $versions{$entry}{data}{ViewPath} || '';
+            Information (sprintf "%4s, %4s, %4s, %20s : %s",
+                        $versions{$entry}{data}{fileCount} || '-',
+                        $versions{$entry}{data}{filesRemoved} || '-',
+                        $versions{$entry}{data}{filesAdded} || '-',
-            Information (sprintf "ViewPath: %20s : %s", GetVname($entry), $viewPath);
+                        GetVname($entry), $viewPath);
+        }
+    }
     Message ("Packages processed: $processedCount");
     Warning ("Packages not processed: $notProcessedCount") if ( $notProcessedCount );
     my $rv = 99;
     $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
     $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
-    if ( $opt_preserveProjectBase )
+    if ( $opt_preserveProjectBase && !$opt_forceProjectBase )
+    {
         my $cc_vob = $cc_path;
         $cc_vob =~ s~^/~~;
         $cc_vob =~ s~/.*~~;
         $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
+                    #
                     my @myArgs;
                     my $myProjectDir;
                     my $myProject = "$data->{ViewRoot}/$file";
                     $myProject =~ s~/[^/]+$~~;
-                    $line =~ s~MakeProject~push \@myArgs,~;
+                    unless ($line =~ m~\s*(\w+)\s*\((.*)\)\s*;\s*$~ )
-                    eval $line;
+                    {
-                    Error("Line did not compiler: $line", "Err: $@" ) if ($@);
+                        Error("Could not detect arguments: $line");
+                    }
+                    my $args = $2;
+                    $args =~ tr~'" ~ ~s;
+                    @myArgs = split (/\s*,\s*/, $args);
                     shift @myArgs;
                     foreach ( @myArgs )
+                    {
                         next if ( m~^--~ );
                         $myProject .= '/' . $_;
+                    #
                     my @myArgs;
                     my $myProjectDir;
                     my $myProject = "$data->{ViewRoot}/$file";
                     $myProject =~ s~/[^/]+$~~;
-                    $line =~ s~.*\(~push \@myArgs, (~;
+                    unless ($line =~ m~\s*(\w+)\s*\((.*)\)\s*;\s*$~ )
-                    eval $line;
+                    {
-                    Error("Line did not compiler: $line", "Err: $@" ) if ($@);
+                        Error("Could not detect arguments: $line");
+                    }
+                    my $args = $2;
+                    $args =~ tr~'" ~ ~s;
+                    @myArgs = split (/\s*,\s*/, $args);
                     shift @myArgs;
                     foreach ( @myArgs )
+                    {
                         next if ( m~^--~ );
                         next unless ( m~^\.\./~ );
 # Returns         : Cleaned up vcs tag
+#
 sub vcsCleanup
+{
     my ($tag) = @_;
-    $tag =~ tr~\\/~/~;
+    $tag =~ tr~\\/~/~;                              # Force use of /
+    $tag =~ s~/+$~~;                                # Trailing /
     if ( $tag =~ m~^CC::~ )
+    {
+        $tag =~ s~CC::/VOB:/~CC::/~;                # Kill stuff
         $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;
         $bad = 1 if ( $path =~ m~^/devl/~ || $path  =~ m~^devl/~ );
         $bad = 1 if ( $path =~ m~^CVS~ );
         $bad = 1 if ( $path =~ m~^http:~i );
         $bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );
         $bad = 1 if ( $path =~ m~^//~ );
+        $bad = 1 if ( $path =~ m~^/blade1/~ );
+        $bad = 1 if ( $path =~ m~^/devl/~ );
         $bad = 1 if ( $path =~ m~^/*none~i );
         $bad = 1 if ( $path =~ m~^/*NoWhere~i );
         $bad = 1 if ( $path =~ m~^-$~i );
         $bad = 1 if ( $path =~ m~^cvsserver:~ );
         $bad = 1 if ( $path =~ m~,\s*module:~ );
+        $bad = 1 if ( $path =~ m~[()]~ );
 #        $bad = 1 unless ( $path =~ m~^/~ );
+    }
     else
+    {
         $bad = 1;
         my $vcsType = $1;
         my $cc_label = $4;
         my $cc_path = $2;
         $cc_path = '/' . $cc_path;
         $cc_path =~ tr~\\/~/~s;
+        $cc_path =~ s~/+$~~;
         $VobPaths{$cc_path}++;
+    }
     @multiplePaths = sort keys %VobPaths;
     if ( scalar @multiplePaths > 1 )
+    {
         Warning ("Multiple Paths:" . $_ ) foreach (@multiplePaths);
+        # Kill SVN import
+        # User will need to configure one path
+        unless ( $opt_AllowMuliplePaths )
+        {
+            Warning ("Multiple Paths detected: Import supressed");
+            $opt_useSvn = 0
+        }
+        else
+        {
+            Message ("Multiple Paths detected: Allowed");
+        }
+    }
+}
 sub isSet
+{
     #   Close out the file
+    #
     $fh->Close();
+}
+#-------------------------------------------------------------------------------
+# Function        : restoreData
+#
+# Description     : Read in essential information
+#                   Used during a resume operation
+#
+# Inputs          :
+#
+# Returns         :
+#
+our %ScmVersions;
+sub restoreData
+{
+    my $file = $cwd . "/${packageNames}.data";
+    Message ("Restoring: $file");
+    Error "Cannot locate restoration file: $file" unless ( -f $file );
+    require $file;
+    Error "Resume Data in $file is not valid\n"
+        unless ( keys(%ScmVersions) >= 0 );
+    foreach  ( keys %ScmVersions )
+    {
+        $restoreData{$_} = $ScmVersions{$_}{data};
+        $restoreData{$_}{rmRef} = $ScmVersions{$_}{rmRef};
+    }
+    %ScmVersions = ();
+}
+#-------------------------------------------------------------------------------
+# Function        : testSvnLabel
+#
+# Description     : Test existence of an SVN label
+#
+# Inputs          :     Package
+#                       Label to test
+#
+# Returns         : 0   - Tag in place
+#                   1   - Not in place
+#
+sub testSvnLabel
+{
+    my ($svnPkg, $svnTag) = @_;
+    my $rv = JatsToolPrint ( 'jats_svnlabel',
+                    '-check',
+                    "-packagebase=$svnPkg",
+                    "$svnTag",
+                     );
+    Message ("testSvnLabel: $svnTag - $rv");
+    return $rv;
+}
 #-------------------------------------------------------------------------------
 #   Documentation
+#

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 2489 → 2548