Subversion Repositories DevTools

Rev

Rev 4074 | Rev 5709 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4074 Rev 4086
Line 405... Line 405...
405
    'MOS'      => 'MOSVersions,RetainCompressed,IgnoreProjectBase,SetProjectBase,noVCS,'.
405
    'MOS'      => 'MOSVersions,RetainCompressed,IgnoreProjectBase,SetProjectBase,noVCS,'.
406
                  ',mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
406
                  ',mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
407
 
407
 
408
# jats -t -log dml.importlog cc2svn_importpackage3 -repo=Import_Test SEADML -filelist dml_labels.txt -ccbase MASS_Dev_Bus -reuse=1
408
# jats -t -log dml.importlog cc2svn_importpackage3 -repo=Import_Test SEADML -filelist dml_labels.txt -ccbase MASS_Dev_Bus -reuse=1
409
 
409
 
-
 
410
 
-
 
411
 
-
 
412
    'SEADML'      => 'ArchiveName=oracs,'.
-
 
413
                     'xxflatTime,'.
-
 
414
                     'xxRetainCompressed,'.
-
 
415
                     'IgnoreProjectBase,'.
-
 
416
                     'SetProjectBase,'.
-
 
417
                     'noVCS,'.
-
 
418
                     'xxForceSuck,'.
-
 
419
                     'xxForceProjectBase=/MASS_Dev_Bus,'.
-
 
420
                     'IgnoreBadSourcePath,'.
-
 
421
                     'NoProcessRipples,'.
410
    'SEADML'      => 'ArchiveName=oracs,flatTime,RetainCompressed,IgnoreProjectBase,SetProjectBase,',
422
                     'xxSelectProjectBase=MASS_Dev_Bus/web/patches/oracs:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
-
 
423
 
411
 
424
 
412
);
425
);
413
 
426
 
414
 
427
 
415
my %mergePathExtended = (
428
my %mergePathExtended = (
Line 550... Line 563...
550
 
563
 
551
                # File list support
564
                # File list support
552
                'filelist:s'        => \$opt_fileList,      # A list of CC tags
565
                'filelist:s'        => \$opt_fileList,      # A list of CC tags
553
                'subdir:s'          => \$opt_repoSubdir,    # Subdir within repo
566
                'subdir:s'          => \$opt_repoSubdir,    # Subdir within repo
554
                'ccbase:s'          => \$opt_ccbase,        # ClearCase Base for CC Tags
567
                'ccbase:s'          => \$opt_ccbase,        # ClearCase Base for CC Tags
-
 
568
                'fromSvn!'          => \$opt_extractFromSvn,
555
                'testRepo!'         => \$opt_useTestRepo,
569
                'testRepo!'         => \$opt_useTestRepo,
556
                'novcs'             => \$opt_noVCS,
570
                'novcs'             => \$opt_noVCS,
557
                
571
                
558
                );
572
                );
559
 
573
 
Line 1361... Line 1375...
1361
 
1375
 
1362
        #
1376
        #
1363
        #   True Patches show up as singletons - they have no parent
1377
        #   True Patches show up as singletons - they have no parent
1364
        #   Need to create strands of patches to be glued onto the base
1378
        #   Need to create strands of patches to be glued onto the base
1365
        #
1379
        #
1366
        unless( $opt_fileList ){
1380
        ##### unless( $opt_fileList )
-
 
1381
        {
1367
            my %patchTree;
1382
            my %patchTree;
1368
            my $patchSeen;
1383
            my $patchSeen;
1369
            Message ("Creating patch threads");
1384
            Message ("Creating patch threads");
1370
            foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} @startPoints )
1385
            foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} @startPoints )
1371
            {
1386
            {
Line 2251... Line 2266...
2251
        {
2266
        {
2252
            newProject();
2267
            newProject();
2253
            $createBranch = 1;
2268
            $createBranch = 1;
2254
            $createSuffix = 1 if $versions{$entry}{newSuffix};
2269
            $createSuffix = 1 if $versions{$entry}{newSuffix};
2255
        }
2270
        }
2256
 
-
 
2257
        newPackageVersion( $entry );
2271
        newPackageVersion( $entry );
2258
 
2272
 
2259
no warnings "recursion";
2273
no warnings "recursion";
2260
        processBranch (@{$versions{$entry}{next}});
2274
        processBranch (@{$versions{$entry}{next}});
2261
    }
2275
    }
Line 2306... Line 2320...
2306
    #   If we have a global error,then we pretend to process, but we
2320
    #   If we have a global error,then we pretend to process, but we
2307
    #   report errors for the logging system
2321
    #   report errors for the logging system
2308
    #
2322
    #
2309
    if ( $globalError )
2323
    if ( $globalError )
2310
    {
2324
    {
2311
        Message ("Global error prevents futher importation");
2325
        Message ("Global error prevents futher importation. ($globalError)");
2312
    }
2326
    }
2313
    else
2327
    else
2314
    {
2328
    {
2315
        #
2329
        #
2316
        #   Call worker function
2330
        #   Call worker function
2317
        #   It will exit on any error so that it can be logged
2331
        #   It will exit on any error so that it can be logged
2318
        #
2332
        #
2319
        $rv = newPackageVersionBody( \%data, @_ );
2333
        $rv = newPackageVersionBody( \%data, @_ );
2320
        $globalError = 1 if ( $rv >= 10 );
2334
        if ( $rv >= 10 )
-
 
2335
        {
-
 
2336
            $globalError = 2; 
-
 
2337
            Message("Global errror: ", $data{errStr});
-
 
2338
        }
2321
    }
2339
    }
2322
 
2340
 
2323
    #
2341
    #
2324
    #   Highlight essential packages that failed to transfer
2342
    #   Highlight essential packages that failed to transfer
2325
    #
2343
    #
Line 2522... Line 2540...
2522
            Message("SvnVersion check: $isInSvn");
2540
            Message("SvnVersion check: $isInSvn");
2523
 
2541
 
2524
            $rv = testSvnLabel( "$svnRepo/$packageNames", $import_label );
2542
            $rv = testSvnLabel( "$svnRepo/$packageNames", $import_label );
2525
            unless ( $rv )
2543
            unless ( $rv )
2526
            {
2544
            {
2527
                Message ("Skip import - resume detected presense");
2545
                Message ("Skip import - resume detected presence");
2528
                $firstVersionCreated = $entry unless ( $firstVersionCreated );
2546
                $firstVersionCreated = $entry unless ( $firstVersionCreated );
2529
                $versions{$entry}{TagCreated} = 2;
2547
                $versions{$entry}{TagCreated} = 2;
2530
                foreach  ( keys %{$restoreData{$entry}} )
2548
                foreach  ( keys %{$restoreData{$entry}} )
2531
                {
2549
                {
2532
                    $data->{$_} = $restoreData{$entry}{$_};
2550
                    $data->{$_} = $restoreData{$entry}{$_};
Line 4243... Line 4261...
4243
#                        $retval = 1;
4261
#                        $retval = 1;
4244
                         $definitionError++;
4262
                         $definitionError++;
4245
                    }
4263
                    }
4246
                    else
4264
                    else
4247
                    {
4265
                    {
4248
                        #
-
 
4249
                        #   Determine the depth of the view root
-
 
4250
                        #
-
 
4251
                        Warning ("Build: $buildFile");
4266
                        Warning ("Build: $buildFile");
4252
                        #
4267
                        #
4253
                        #   Whats the file for
4268
                        #   Whats the file for
4254
                        #
4269
                        #
4255
                        if (open (BF, '<', $buildFile ))
4270
                        if (open (BF, '<', $buildFile ))
Line 6089... Line 6104...
6089
            examineVcsTag($pv_id);
6104
            examineVcsTag($pv_id);
6090
 
6105
 
6091
            #
6106
            #
6092
            #   Process version number
6107
            #   Process version number
6093
            #
6108
            #
6094
            my ($suffix, $version, $isaR, $isaWip, $buildVersion ) = massageVersion($pkg_ver, $pkg_name);
6109
            my ($suffix, $version, $isaR, $isaWip, $buildVersion, $isaPatch ) = massageVersion($pkg_ver, $pkg_name);
6095
 
6110
 
6096
            $versions{$pv_id}{version} = $version;
6111
            $versions{$pv_id}{version} = $version;
6097
            $versions{$pv_id}{buildVersion} = $buildVersion;
6112
            $versions{$pv_id}{buildVersion} = $buildVersion;
6098
            $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
6113
            $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
6099
            $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
6114
            $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
-
 
6115
            $versions{$pv_id}{isaPatch} = 1 if ( $isaPatch );
6100
 
6116
 
6101
            #
6117
            #
6102
            #   Process suffix
6118
            #   Process suffix
6103
            #
6119
            #
6104
            $suffix = 'Unknown' unless ( $suffix );
6120
            $suffix = 'Unknown' unless ( $suffix );