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

 my $opt_deleteLinks;
 my $count_BadPaths = 0;
 my $opt_IgnoreBadSourcePath;
 my $opt_forceSuck;
 my $opt_noVCS;
+my $opt_onlyOneBranch;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     'oracs'                 => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oracs:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
     'oradacw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oradacw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
     'orabocw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/orabocw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
+    'boi-issuer'            => 'OnlyOneBranch=.vtk,noVCS',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
     'itso_ud'               => 'IgnoreProjectBase,',
         if ( index( $data, ',NoProcessRipples,' ) >= 0) {
             $opt_processRipples = 0;
             Message ("Disable Processing of ripples");
+        }
+        #
+        #   This is a real kludge. The user MUST make sure that the branch AND all related
+        #   branches ( xxx_for_yyy.zzz ) have been deleted from the repository.
+        #
+        if ( $data =~ m~,OnlyOneBranch=(.*?),~ ) {
+            $opt_onlyOneBranch = $1;
+            Message ("Limiting the import to one branch: $opt_onlyOneBranch");
+            unless (exists $Projects{$opt_onlyOneBranch})
+            {
+                Error("The specified branch does not map to a configured project");
+            }
+        }
         if ( index( $data, ',noVCS,' ) >= 0) {
             $opt_noVCS = 1;
             Message ("Use of ClearCase disabled.");
+        }
     #   If we have a global error,then we pretend to process, but we
     #   report errors for the logging system
+    #
     if ( $globalError )
+    {
-        Message ("Global error prevents futher importation");
+        Message ("Global error prevents futher importation. ($globalError)");
+    }
     else
+    {
+        #
         #   Call worker function
         #   It will exit on any error so that it can be logged
+        #
         $rv = newPackageVersionBody( \%data, @_ );
-        $globalError = 1 if ( $rv >= 10 );
+        if ( $rv >= 10 )
+        {
+            $globalError = 2;
+            Message("Global errror: ", $data{errStr});
+        }
+    }
+    #
     #   Highlight essential packages that failed to transfer
+    #
 #                               3 - Deadwood
 #                               4 - Bad usage of ProjectBase detected
 #                                   Use of MakeProject detected
 #                               5  - Subversion Import disabled
 #                               6  - Restored via resume
+#                               7  - Not imported. not on Onle One Branch
 #                       >10 - Fatal error
+#
 sub newPackageVersionBody
+{
     my ($data, $entry) = @_;
             Message("SvnVersion check: $isInSvn");
             $rv = testSvnLabel( "$svnRepo/$packageNames", $import_label );
             unless ( $rv )
+            {
-                Message ("Skip import - resume detected presense");
+                Message ("Skip import - resume detected presence");
                 $firstVersionCreated = $entry unless ( $firstVersionCreated );
                 $versions{$entry}{TagCreated} = 2;
                 foreach  ( keys %{$restoreData{$entry}} )
+                {
                     $data->{$_} = $restoreData{$entry}{$_};
         else
+        {
             Warning ("Resume data missing");
+        }
+    }
+    #
+    #   If we are only processing Only One Branch then skip versions that are not a part of that branch
+    #
+    if ($opt_onlyOneBranch)
+    {
+        if ($versions{$entry}{'suffix'} eq $opt_onlyOneBranch)
+        {
+            Message("Version on selected branch");
+        }
+        else
+        {
+            Message("Skip import. Version NOT on selected branch");
+            return 7;
+        }
+    }
 #   Keep DeadWood. May be a WIP
 #    if ( exists $versions{$entry}{DeadWood} && $versions{$entry}{DeadWood} )
 #    {
 #        $data->{errStr} = 'Package is DeadWood';
         $forceImportFlush = 0;
         RmDirTree ('SvnImportDir');
+    }
     push @args, "-branch=$currentBranchName" if ( defined $currentBranchName );
+    push @args, "-replace" if ( defined $opt_onlyOneBranch );
     my $datafile = "importdata.$import_label.properties";
     my @mergeArg;
     push (@mergeArg, "-mergePaths", join(',', @opt_mergePaths) ) if ( @opt_mergePaths );
     #   Only do once
+    #
     return unless ( $createPackageDone );
     return if ( $opt_resume );
     $createPackageDone = 0;
+    if ( $opt_onlyOneBranch )
+    {
+        JatsToolPrint ( 'jats_svn', 'create', "$svnRepo/$packageNames", @opts );
+        return;
+    }
+    #
     #   Real import
     #       Do not Delete package if it exists
     #       Package must NOT exist
         #   tree much prettier
+        #
         my @opts;
         push (@opts, '-date', $date) if ( $date );
         push (@opts, '-author', $author) if ( $author );
+        push (@opts, '-replace') if ( $opt_onlyOneBranch );
         JatsToolPrint ( 'jats_svnlabel',
                         '-packagebase', "$svnRepo/$packageNames",
                         'tags/' . $src_label,
                         '-branch',
+    #
     #   Only allow import from SVN if asked nicely
     #   May be used if we are correcting a package - and some have been
     #   placed in SVN
+    #
-    unless ( $opt_extractFromSvn )
+    unless ( $opt_extractFromSvn || $opt_onlyOneBranch )
+    {
         $data->{errStr} = 'Some Packages are in SVN';
         return 15;
+    }

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 3967 → 4077