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

 my $rippleCount = 0;
 my $svnRepo;
 my $processCount = 0;
 my $processTotal = 0;
 my $recentCount = 0;
+my $packageReLabelCount = 0;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
+    #
     #   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 );
-        if ( $rv == 10 ) {
-            $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;
-        }
-    }
+    #
     #   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
+    {
         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++ )
+            {
+                $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
+                #
+                $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
             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, '|{N: Not Locked';
         push @text, 'b: Bad Singleton';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
         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';
         $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});

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 2393 → 2401