Subversion Repositories DevTools

Rev

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

Rev 4022 Rev 4030
Line 135... Line 135...
135
    '.ncc'      => { Name => 'NSWClubCard' },
135
    '.ncc'      => { Name => 'NSWClubCard' },
136
    '.rm'       => { Name => 'Rome' },
136
    '.rm'       => { Name => 'Rome' },
137
    '.vss'      => { Name => 'SmartSite' },
137
    '.vss'      => { Name => 'SmartSite' },
138
    '.ssts'     => { Name => 'SydneySchoolbus' },
138
    '.ssts'     => { Name => 'SydneySchoolbus' },
139
    'unknown'   => { Name => 'UnknownProject' },
139
    'unknown'   => { Name => 'UnknownProject' },
-
 
140
    'brussels'  => { Name => 'Brussels' },
140
 
141
 
141
    '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
142
    '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
142
    '.mas'      => { Name => 'Mass'  , Trunk => 1 },
143
    '.mas'      => { Name => 'Mass'  , Trunk => 1 },
143
    '.cr'       => { Name => 'Core'  , Trunk => 1 },
144
    '.cr'       => { Name => 'Core'  , Trunk => 1 },
144
    '.cots'     => { Name => 'Cots'  , Trunk => 1 },
145
    '.cots'     => { Name => 'Cots'  , Trunk => 1 },
145
    '.tool'     => { Name => 'Tools' , Trunk => 1 },
146
    '.tool'     => { Name => 'Tools' , Trunk => 1 },
-
 
147
    'perth'     => { Name => 'Perth' , Trunk => 1 },
146
);
148
);
147
 
149
 
148
my %suffixFixup = (
150
my %suffixFixup = (
149
    '.sf'           => '.sfo',
151
    '.sf'           => '.sfo',
150
    '.vt'           => '.vtk',
152
    '.vt'           => '.vtk',
Line 397... Line 399...
397
#    'mos_api'               => 'IgnoreProjectBase,',
399
#    'mos_api'               => 'IgnoreProjectBase,',
398
#    'mos_fonts'             => 'IgnoreProjectBase,',
400
#    'mos_fonts'             => 'IgnoreProjectBase,',
399
#    'sntp'                  => 'IgnoreProjectBase,',
401
#    'sntp'                  => 'IgnoreProjectBase,',
400
#    'time_it'               => 'IgnoreProjectBase,',
402
#    'time_it'               => 'IgnoreProjectBase,',
401
 
403
 
402
    'MOS'      => 'RetainCompressed,IgnoreProjectBase,SetProjectBase'.
404
    'MOS'      => 'MOSVersions,RetainCompressed,IgnoreProjectBase,SetProjectBase,zzznoVCS,'.
403
                  'mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
405
                  ',mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
404
);
406
);
405
 
407
 
406
 
408
 
407
my %mergePathExtended = (
409
my %mergePathExtended = (
408
 
410
 
Line 1084... Line 1086...
1084
            $opt_flat = 1;
1086
            $opt_flat = 1;
1085
            $flatMode = 2;          # By Version
1087
            $flatMode = 2;          # By Version
1086
            $opt_processRipples = 0;
1088
            $opt_processRipples = 0;
1087
        }
1089
        }
1088
 
1090
 
-
 
1091
        if ( index( $data, ',MOSVersions,' ) >= 0) {
-
 
1092
            Message ("Sort import tree. Sort by Time and MOS Version");
-
 
1093
            $opt_flat = 0;
-
 
1094
            $flatMode = 3;          # By MOS
-
 
1095
            $opt_processRipples = 0;
-
 
1096
        }
-
 
1097
 
1089
        if ( index( $data, ',processRipples,' ) >= 0) {
1098
        if ( index( $data, ',processRipples,' ) >= 0) {
1090
            $opt_processRipples = 1;
1099
            $opt_processRipples = 1;
1091
        }
1100
        }
1092
 
1101
 
1093
        if ( index( $data, ',NoProcessRipples,' ) >= 0) {
1102
        if ( index( $data, ',NoProcessRipples,' ) >= 0) {
Line 1251... Line 1260...
1251
    }
1260
    }
1252
}
1261
}
1253
 
1262
 
1254
sub massageData
1263
sub massageData
1255
{
1264
{
-
 
1265
    if ( $flatMode == 3 ) {
-
 
1266
        my $lastBru;
-
 
1267
        my $lastMain;
-
 
1268
        
-
 
1269
        Message ("Sorted by Time and extract BRUSSELS branch");
-
 
1270
        @flatOrder = sort {$versions{$a}{TimeStamp} cmp $versions{$b}{TimeStamp}} keys(%versions);
-
 
1271
        foreach my $entry (@flatOrder ) {
-
 
1272
            if ( $versions{$entry}{realLabel} =~ m~_BRU_~ ) {
-
 
1273
                $versions{$entry}{suffix} = 'brussels';
-
 
1274
                if ( $lastBru ) {
-
 
1275
                    push @{$versions{$lastBru}{next}}, $entry;
-
 
1276
                }
-
 
1277
                $lastBru = $entry;
-
 
1278
            } else {
-
 
1279
                $versions{$entry}{suffix} = 'perth';
-
 
1280
                if ( $lastMain ) {
-
 
1281
                    push @{$versions{$lastMain}{next}}, $entry;
-
 
1282
                }
-
 
1283
                $lastMain = $entry;
-
 
1284
            }
-
 
1285
        }
-
 
1286
    }
-
 
1287
 
1256
    #
1288
    #
1257
    #   Report unknown suffixes
1289
    #   Report unknown suffixes
1258
    #   Handle bad, or little known project suffixes by creating them
1290
    #   Handle bad, or little known project suffixes by creating them
1259
    #
1291
    #
1260
    foreach my $suffix ( keys %suffixes )
1292
    foreach my $suffix ( keys %suffixes )