Subversion Repositories DevTools

Rev

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

Rev 2026 Rev 2429
Line 161... Line 161...
161
    require $fname;
161
    require $fname;
162
 
162
 
163
    Error "Data in $fname is not valid\n"
163
    Error "Data in $fname is not valid\n"
164
        unless ( keys(%ScmVersions) >= 0 );
164
        unless ( keys(%ScmVersions) >= 0 );
165
 
165
 
-
 
166
    my %packageVcsRemaining = %packageVcs;
166
 
167
 
167
    my $essentialCount = 0;
168
    my $essentialCount = 0;
168
    my $errorCount = 0;
169
    my $errorCount = 0;
169
    my $ecount = 0;
170
    my $ecount = 0;
170
    my $transferred = 0;
171
    my $transferred = 0;
Line 174... Line 175...
174
    my $rippleProcessed = 0;
175
    my $rippleProcessed = 0;
175
    my $globalErrors = 0;
176
    my $globalErrors = 0;
176
    my $notProcessed = 0;
177
    my $notProcessed = 0;
177
    my $pkgBase = 0;
178
    my $pkgBase = 0;
178
    my $adjustedPath = 0;
179
    my $adjustedPath = 0;
-
 
180
    my $postMigrationUpdate = 0;
179
 
181
 
180
    foreach my $entry (sort {$a <=> $b}  keys(%ScmVersions) )
182
    foreach my $entry (sort {$a <=> $b}  keys(%ScmVersions) )
181
    {
183
    {
182
        $totalCount ++;
184
        $totalCount ++;
183
        $notProcessed++ unless $ScmVersions{$entry}{Scanned};
185
        $notProcessed++ unless $ScmVersions{$entry}{Scanned};
Line 217... Line 219...
217
            my $include = 1;
219
            my $include = 1;
218
            if ( exists $packageVcs{$entry} )
220
            if ( exists $packageVcs{$entry} )
219
            {
221
            {
220
#                $include = 0 if ( ($packageVcs{$entry} eq $rmRef) );
222
#                $include = 0 if ( ($packageVcs{$entry} eq $rmRef) );
221
                $include = 0 if ( ($packageVcs{$entry} eq $ccTag) );
223
                $include = 0 if ( ($packageVcs{$entry} eq $ccTag) );
-
 
224
                delete $packageVcsRemaining{$entry};
222
            }
225
            }
223
            else
226
            else
224
            {
227
            {
225
                $missingPVID++;
228
                $missingPVID++;
226
                $done = ' < Missing' unless $done;
229
                $done = ' < Missing' unless $done;
Line 237... Line 240...
237
            Verbose ("Processed: " . $ScmVersions{$entry}{vname} . ' :: ' . ($ccTag || '???') . $done );
240
            Verbose ("Processed: " . $ScmVersions{$entry}{vname} . ' :: ' . ($ccTag || '???') . $done );
238
            
241
            
239
        }
242
        }
240
    }
243
    }
241
 
244
 
-
 
245
    #
-
 
246
    #   Process versions that are not a part of the backout data
-
 
247
    #
-
 
248
    foreach my $entry ( keys %packageVcsRemaining )
-
 
249
    {
-
 
250
        my $vcsTag = $packageVcsRemaining{$entry};
-
 
251
        if ( $vcsTag =~ m~SVN::~ )
-
 
252
        {
-
 
253
            $postMigrationUpdate++;
-
 
254
            print "Modified after migration: $entry: $vcsTag\n";
-
 
255
        }
-
 
256
    }
-
 
257
 
242
    if ( $opt_report )
258
    if ( $opt_report )
243
    {
259
    {
244
        return unless ($globalErrors || $pkgBase ||  $errorCount || $notProcessed);
260
        return unless ($globalErrors || $pkgBase ||  $errorCount || $notProcessed || $postMigrationUpdate);
245
    }
261
    }
246
 
262
 
247
    sub highlight
263
    sub highlight
248
    {
264
    {
249
        my ($value) = @_;
265
        my ($value) = @_;
Line 253... Line 269...
253
    my $rmTotal = scalar keys %packageVcs;
269
    my $rmTotal = scalar keys %packageVcs;
254
    Message ("Transfer Stats",
270
    Message ("Transfer Stats",
255
            ,"Package                   : $pname"
271
            ,"Package                   : $pname"
256
            ,"Total RM Versions         : $rmTotal"
272
            ,"Total RM Versions         : $rmTotal"
257
            ,"Total Packages Processed  : $totalCount"
273
            ,"Total Packages Processed  : $totalCount"
258
            ,"Packages NOT Processed    : $notProcessed" . highlight($notProcessed)
274
            ,"Packages NOT Processed    : $notProcessed"
259
            ,"Packages pruned           : " . ($rmTotal - $totalCount)
275
            ,"Packages pruned           : " . ($rmTotal - $totalCount)
260
            ,"Essential Packages        : $essentialCount"
276
            ,"Essential Packages        : $essentialCount"
261
            ,"Essential Packages Errors : $errorCount" . highlight($errorCount)
277
            ,"Essential Packages Errors : $errorCount"
262
            ,"Global Import Errors      : $globalErrors" . highlight($globalErrors)
278
            ,"Global Import Errors      : $globalErrors"
263
            ,"PackageBase Error         : $pkgBase" . highlight($pkgBase)
279
            ,"PackageBase Error         : $pkgBase"
264
            ,"Adjusted Paths            : $adjustedPath" . highlight($transferred - $adjustedPath)
280
            ,"Adjusted Paths            : $adjustedPath"
265
            ,"Not Transferred Packages  : $ecount"
281
            ,"Not Transferred Packages  : $ecount"
266
            ,"Transferred Packages      : $transferred"
282
            ,"Transferred Packages      : $transferred"
267
            ,"Transfer to RM            : $diffCount"
283
            ,"Transfer to RM            : $diffCount"
268
            ,"Missing PackageVersions   : $missingPVID" . highlight($missingPVID)
284
            ,"Missing PackageVersions   : $missingPVID" . highlight($missingPVID)
269
            ,"Ripple Processed Early    : $rippleProcessed" . highlight($rippleProcessed)
285
            ,"Ripple Processed Early    : $rippleProcessed"
-
 
286
            ,"Post Migration in SVN     : $postMigrationUpdate" . highlight($postMigrationUpdate)
270
            );
287
            );
271
 
288
 
272
    if ( $opt_report )
289
    if ( $opt_report )
273
    {
290
    {
274
        return;
291
        return;
Line 285... Line 302...
285
    {
302
    {
286
        Message ('Release Manager entries are all upto date');
303
        Message ('Release Manager entries are all upto date');
287
        return;
304
        return;
288
    }
305
    }
289
 
306
 
-
 
307
    if ( $postMigrationUpdate )
-
 
308
    {
-
 
309
        Error ("Packages have been modified in SVN",
-
 
310
                "Reverting this package will lose data");
-
 
311
    }
-
 
312
 
290
    #
313
    #
291
    #   Now do the RM Update
314
    #   Now do the RM Update
292
    #
315
    #
293
    Message('Updating Release Manager: ' . $opt_rm);
316
    Message('Updating Release Manager: ' . $opt_rm);
294
    foreach my $entry ( @updateList )
317
    foreach my $entry ( @updateList )
Line 323... Line 346...
323
        $new_tag =~ s~CC::([^/])~CC::/$1~;
346
        $new_tag =~ s~CC::([^/])~CC::/$1~;
324
print "Modified tag $pvid: $new_tag\n";
347
print "Modified tag $pvid: $new_tag\n";
325
    }
348
    }
326
 
349
 
327
 
350
 
328
    my $m_sqlstr =  "begin release_manager.update_vcs_details($pvid, '$new_tag', $user); end;";
351
    my $m_sqlstr =  "begin release_manager.PK_RMAPI.update_vcs_details($pvid, '$new_tag', $user); end;";
329
    my $sth = $RM_DB->prepare($m_sqlstr);
352
    my $sth = $RM_DB->prepare($m_sqlstr);
330
    if ( defined($sth) )
353
    if ( defined($sth) )
331
    {
354
    {
332
        if ( $sth->execute( ) )
355
        if ( $sth->execute( ) )
333
        {
356
        {