Subversion Repositories DevTools

########################################################################

# Copyright (C) 1998-2012 Vix Technology, All rights reserved

#

# Module name   : cc2svn_importpackage.pl

# Module type   : Makefile system

# Compiler(s)   : Perl

# Environment(s): jats

#

# Description   : Get package information for a package name specified on the

#                 command line.

#

#                 Determine the package id

#                 Locate all packages that have the same package name

#                 Determine essential packages

#                 Prune uneeded packages

#

#                 Pump it into SVN

#

#                 Project Based Pumping, creating branches as needed

#

#......................................................................#

require 5.006_001;

use strict;

use warnings;

use JatsError;

use JatsRmApi;

use FileUtils;

use JatsSystem;

use HTTP::Date;

use JatsProperties;

use JatsEnv;

use ConfigurationFile;

use JatsSvn qw(:All);

use JatsLocateFiles;

use Encode;

#use Data::Dumper;

use Fcntl ':flock'; # import LOCK_* constants

use Cwd;

use DBI;

use Getopt::Long;

use Pod::Usage;                             # required for help support

use Encode;

#

#   Options

#

my $opt_help = 0;

my $opt_manual = 0;

my $opt_verbose = 0;

my $opt_repo_base = 'AUPERASVN01/';

my $opt_repo = '';

my $opt_repoSubdir = '';

my $opt_flat;

my $opt_test;

my $opt_reuse = 0;

my $opt_age;

my $opt_dump = 0;

my $opt_images = 0;

my $opt_retaincount = 2;

my $opt_pruneModeString;

my $opt_listTags;

my $opt_name;

my $opt_log = 0;

my @opt_tip;

my $opt_postimage = 1;

my $opt_workDir = '/work';

my $opt_vobMap;

my $opt_preserveProjectBase;

my $opt_ignoreProjectBaseErrors;

my $opt_ignoreMakeProjectErrors;

my $opt_forceProjectBase;

my @opt_limitProjectBase;

my @opt_mergePaths;

my $opt_ignoreBadPaths;

my $opt_delete;

my $opt_recentAge = 14;             # Days

my $opt_relabel = 0;

my $opt_protected;

my $opt_useSvn = 1;

my $opt_testRmDatabase;

my $opt_extractFromSvn;

my $opt_AllowMuliplePaths = 1;      #29-Nov-2012

my $opt_resume;

my $opt_processRipples = 1;

my $opt_mergePackages;

################################################################################

#   List of Projects Suffixes and Branch Names to be used within SVN

#

#       Name        - Name of branch for the project

#       Trunk       - Can be a trunk project

#                     First one seen will be placed on the trunk

#                     Others will create project branches

#

my $ProjectTrunk;

my %ProjectsBaseCreated;

my %Projects = (

    '.sea'      => { Name => 'Seattle' },

    '.coct'     => { Name => 'CapeTown' },

    '.sls'      => { Name => 'Stockholm' },

    '.syd'      => { Name => 'Sydney' },

    '.vtk'      => { Name => 'Vasttrafik' },

    '.bei'      => { Name => 'Beijing' },

    '.bkk'      => { Name => 'Bangkok' },

    '.ndl'      => { Name => 'NewDelhi' },

    '.nzs'      => { Name => 'NewZealandStageCoach' },

    '.wdc'      => { Name => 'Washington' },

    '.oso'      => { Name => 'Oslo' },

    '.lvs'      => { Name => 'LasVegas' },

    '.mlc'      => { Name => 'BeijingMlc' },

    '.sfo'      => { Name => 'SanFrancisco' },

    '.sg'       => { Name => 'Singapore' },

    '.gmp'      => { Name => 'GmpteProject' },

    '.ssw'      => { Name => 'UkStageCoach' },

    '.uk'       => { Name => 'UkProject' },

    '.pmb'      => { Name => 'Pietermaritzburg' },

    '.vps'      => { Name => 'VixPayments' },

    '.ncc'      => { Name => 'NSWClubCard' },

    '.rm'       => { Name => 'Rome' },

    '.vss'      => { Name => 'SmartSite' },

    'unknown'   => { Name => 'UnknownProject' },

    '.ebr'      => { Name => 'eBrio' , Trunk => 1 },

    '.mas'      => { Name => 'Mass'  , Trunk => 1 },

    '.cr'       => { Name => 'Core'  , Trunk => 1 },

    '.cots'     => { Name => 'Cots'  , Trunk => 1 },

    '.tool'     => { Name => 'Tools' , Trunk => 1 },

);

my %suffixFixup = (

    '.sf'           => '.sfo',

    '.vt'           => '.vtk',

    '.lv'           => '.lvs',

    '.was'          => '.wdc',

    '.uk.1'         => '.uk',

    '.ssts.demo'    => '.ssts',

    '.u244.syd'     => '.syd',

    '.pxxx.sea'     => '.sea',

    '.pxxx.syd'     => '.syd',

    '.pxxx.sydddd'  => '.syd',

    '.oslo'         => '.oso',

    '.osl'          => '.oso',

);

my %specialPackages = (

    'core_devl'           =>  ',all,protected,',

    'daf_utils_mos'       => ',flat,',

    'mos_packager'        => ',all,',

    'cfmgr-cfmgr'         => ',flat,',

    'daf_utils_button_st' => ',flat,',

    'ReleaseName'         => ',flat,',

    'reports'             => ',utf8,',

    'cda_imports'         => ',utf8,',

    'cdxforms'            => ',utf8,',

    'db_cda'              => ',utf8,',

    'CommandServer'       => ',IgnoreMakeProject,',

    'TDSExporterControl'  => ',IgnoreMakeProject,',

    'cdagui'              => ',IgnoreMakeProject,',

    'daf_bvt'                 => ',IgnoreMakeProject,',  # Look OK

    'daf_dll'                 => ',IgnoreMakeProject,',  # MakeProject not in used makefile

    'PFTPi'                   => ',IgnoreMakeProject,',  # Looks OK

    'PFTPu'                   => ',IgnoreMakeProject,',  # Looks OK

    'WinCEBlocker'            => ',IgnoreMakeProject,',  # Looks OK

    'WinCEDeviceAutoInject'   => ',IgnoreMakeProject,',  # Looks OK

    'WinCEReboot'             => ',IgnoreMakeProject,',  # Looks OK

    'ftp'                   => ',SetProjectBase,',

    'ddu_app_manager'       => ',SetProjectBase,IgnoreMakeProject,',

    'ddu_afc'               => ',SetProjectBase,IgnoreMakeProject,',

    'ddu_dog'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',

    'ddu_management'        => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode,',

    'ddu_fim'               => ',IgnoreMakeProject,',

    'ddu_mccain'            => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',

    'ddu_mon'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle,',

    'ddu_rcu'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode,',

    'ddu_status_logging'    => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle,',

    'ddu_logging_lib'       => ',SetProjectBase,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',

    'verifone'              => ',ForceProjectBase=/DPG_SWCode/products/verifone,',

    'dm_devcdfile'          => 'AllowMultiPath',

    'daf_ct_mcr_unified'    => 'AllowMultiPath',

    'cst-rms-db'            => 'AllowMultiPath',

    'daf_common'            => 'IgnoreProjectBase',

    'devcd'                 => 'AllowMultiPath',

    'daf_dll'                   => 'AllowMultiPath,IgnoreMakeProject',  # MakeProject not in used makefile

    'daf_transap_proxyman_edf'  => 'AllowMultiPath,IgnoreProjectBase',

    'devrelease'                => 'AllowMultiPath',

    'dm_devrelease'             => 'AllowMultiPath',

    'dm_rtswis'                 => 'AllowMultiPath',

    'dm_devcd'                  => 'AllowMultiPath',

    'dm_documentation'          => 'AllowMultiPath,IgnoreBadPath',

    'dm_eventhdr'               => 'AllowMultiPath',

    'dm_javaenums'              => 'AllowMultiPath',

    'dm_solidbasetypes'         => 'AllowMultiPath',

    'dm_swismetadata'           => 'AllowMultiPath',

    'dm_cuttables'              => 'AllowMultiPath',

    'dm_devudapi'               => 'AllowMultiPath',

    'buscdapi'                  => 'AllowMultiPath',

    'daf_bvt'                   => 'AllowMultiPath,IgnoreMakeProject,',  # Look OK

    'daf_cd_transap'            => 'AllowMultiPath,IgnoreBadPath,IgnoreProjectBase',

    'cdref'                     => 'AllowMultiPath',

    'dm_sysbasetypes'           => 'AllowMultiPath',

    'dm_sysswis'                => 'AllowMultiPath',

    'dm_syscd'                  => 'AllowMultiPath',

    'dm_udtypes'                => 'AllowMultiPath',

    'dm_systemcdtables'         => 'AllowMultiPath',

    'dm_utils'                  => 'AllowMultiPath',

    'dm_udxml'                  => 'AllowMultiPath',

    'HCP5000_resources'         => 'AllowMultiPath',

    'massrtswis'                => 'AllowMultiPath',

    'pcp5000'                   => 'AllowMultiPath,ForceProjectBase=/DPG_SWCode',

    'PFTPi'                     => 'AllowMultiPath,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',  # Looks OK

    'PFTPu'                     => 'AllowMultiPath,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',  # Looks OK

    'WinCEBlocker'              => ',IgnoreMakeProject,',  # Looks OK

    'WinCEDeviceAutoInject'     => ',IgnoreMakeProject,',  # Looks OK

    'WinCEReboot'               => ',IgnoreMakeProject,',  # Looks OK

    'rsmaint'                   => 'AllowMultiPath',

    'sysbasetypes'              => 'AllowMultiPath',

    'syscd'                     => 'AllowMultiPath',

    'sysswis'                   => 'AllowMultiPath',

    'udserialiser'              => 'AllowMultiPath',

    'systemcdtables'            => 'AllowMultiPath',

    'udxml'                     => 'AllowMultiPath',

    'ERGoracs'                  => 'AllowMultiPath',

    'daf_cd_desfireparams'      => 'AllowMultiPath',

    'daf_ct_mag_virtual'        => 'AllowMultiPath',

    'daf_br_applets'            => 'AllowMultiPath',

    'daf_paper_variables'       => 'AllowMultiPath',

    'daf_transap_api'           => 'AllowMultiPath,ForceProjectBase=/DPG_SWBase/transap',

    'daf_br_applets'            => 'AllowMultiPath,IgnoreProjectBase',  # Not used

    'daf_udlib_api'             => 'AllowMultiPath,ForceProjectBase=/DPG_SWBase/ud',

    'daf_ct_mcr_14443'          => 'LimitProjectBase=/DPG_SWBase/ct',

    'daftestcd_sales'               => 'AllowMultiPath,ForceProjectBase=/ProjectCD/seattle',

    'daftestcd_vanpool'             => 'AllowMultiPath,ForceProjectBase=/ProjectCD',

    'daf_transap_edf'               => 'AllowMultiPath,IgnoreProjectBase',

    'daf_transap_extensions'        => 'AllowMultiPath',

    'daf_transap_proxyman_rkf_mag'  => 'AllowMultiPath',

    'daf_utils_appupgrade'          => 'AllowMultiPath',

    'dc5000'                        => 'AllowMultiPath,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',

    'uiconv'                        => 'AllowMultiPath',

    'daf_ct_api'                    => 'AllowMultiPath',

    'ocpsupport'                    => 'AllowMultiPath,IgnoreMakeProject', # MakeProject Tested on at least one

    'emv_cs_test_ingenico'          => 'AllowMultiPath,IgnoreMakeProject', # MakeProject Tested on at least one

    'deviceicons'                   => 'AllowMultiPath,LimitProjectBase=/DPG_SWBase/resources:/DPG_SWCode/resources',

    'pcv_final_wce'                 => 'IgnoreMakeProject', # MakeProject Tested on at least one

    'pcv_wce'                       => 'IgnoreMakeProject', # MakeProject Tested on at least one

    'WinCEDeviceUpgrade'            => 'IgnoreMakeProject', # MakeProject Tested on at least one

    'scil'                          => 'LimitProjectBase=/DPG_SWCode/projects/seattle/tvm',

    'daf_br_compiler_support'       => 'ForceProjectBase=/DPG_SWBase/daf_br_compiler/support',

    'daf_br_th'                     => 'IgnoreBadPath,all,IgnoreMakeProject', # MakeProject Tested. Bad Paths not used

    'linux_kernel_bcp4600'          => 'ForceProjectBase=/LMOS/linux/kernel',

    'linux_kernel_viper'            => 'ForceProjectBase=/LMOS/linux/kernel',

    'linux_kernel_cobra'            => 'ForceProjectBase=/LMOS/linux/kernel',

    'LinuxDrivers'                  => 'flatTime,LimitProjectBase=/LMOS/linux/drivers'.

                                       ',mergePaths=modules:bcp4600:cobra:eb5600:etx86:tp5600:viper',

    'flashCopier'                   => 'flatTime,LimitProjectBase=/LMOS/tools/flashCopier'.

                                       ',mergePaths=+:src:pcp5700:eb5600:tp5600',

    'u-boot'                        => 'flatTime,LimitProjectBase=/LMOS/linux/bootstrap/u-boot'.

                                       ',mergePaths=+:src:u-boot:u-boot-hk',

    'dams5000'                      => 'flatTime,LimitProjectBase=/LMOS/apps/dams'.

                                       ',mergePaths=+:tp5600:eb5600:pcp5700:core:doc'.

                                       ',processRipples',

    'linux_day0fs_5000'            => 'flatTime,LimitProjectBase=/LMOS/linux/filesystems/day0-fs'.

                                       ',mergePaths=+:tp5600:eb5600:pcp5700:etx86:common'.

                                       ',processRipples',

    'linux_kernel_gen1'               => 'flatTime,mergePaths=,processRipples,LimitProjectBase=/LMOS/linux/kernel',

    'rt3070'                          => 'flatVersion',

    'icl'                   => 'IgnoreProjectBase,',

    'itso'                  => 'IgnoreProjectBase,',

#    'daf_osa_mos'           => 'IgnoreProjectBase,',

    'daf_utils_mos'         => 'IgnoreProjectBase,',

    'itso_ud'               => 'IgnoreProjectBase,',

#    'mos_api'               => 'IgnoreProjectBase,',

#    'mos_fonts'             => 'IgnoreProjectBase,',

#    'sntp'                  => 'IgnoreProjectBase,',

#    'time_it'               => 'IgnoreProjectBase,',

);

my %mergePathExtended = (

    'linux_kernel_gen1' => {

            'linux_kernel_eb5600_2.6.21.1.0.cots' => '+:TP5600:EB5600:ETX86:common:packager.sflash:www.kernel.org:packager.grub',

            'linux_kernel_tp5600_2.6.21.1.0.cots' => '+:tp5600:eb5600:etx86:bcp4600:common:packager.sflash:www.kernel.org:packager.grub',

            },

);

my %notCots = (

    'isl'       => 1,

);

my $ukHopsMode = 0;

my %ukHopsReleases = (

    '6222'      => { name => 'MainLine', 'trunk' => 1 },

    '14503'     => { name => 'Hops3' },

    '21864'     => { name => 'Hops3.6' },

    '22303'     => { name => 'Hops3.7' },

    '17223'     => { name => 'Hops4' },

);

# The following packages will have the version in the specified release forced to be on the trunk

# A trunk will be forced and the version will be on it.

#   May only work if the version in the release is also a TIP

my %ukHopsTip = (

    'ItsoMessaging'         => '6222',

    'MessageProcessor'      => '6222',

    'StrongNameKey'         => '6222',

);

################################################################################

#   Global data

#

my $VERSION = "1.0.0";

my $RM_DB;

my $last_pv_id;

my %pkg_ids;

my $first_pkg_id;

my %versions;

my %suffixes;

my @processOrder;

my @startPoints;

my @allStartPoints;

my @endPoints;

my $now = time();

my $logSummary;

my $firstVersionCreated;

my @EssentialPackages;

my $createBranch;

my $createSuffix;

my $currentBranchName;

my $singleProject;

my $pruneCount = 0;

my $trimCount = 0;

my $badVcsCount = 0;

my $ProjectCount = 0;

my $totalVersions = 0;

my $initialTrees = 0;

my $globalError;

my @unknownProjects;

my %knownProjects;

my $badSingletonCount = 0;

my @flatOrder;

my $flatMode = 0;

my $pruneMode;

my $pruneModeString;

my $threadId = 0;

my $threadCount;

my %tipVersions;

my $allSvn;

my @multiplePaths;

my @badEssentials;

my %svnData;

my $cwd;

my $mustConvertFileNames;

my $workDir;

my $packageNames;

my @packageNames;

my $multiPackages = -1;

my $visitId = 0;

my $noTransfer;

my $rippleCount = 0;

my $svnRepo;

my $processCount = 0;

my $processTotal = 0;

my $recentCount = 0;

my $packageReLabelCount = 0;

my %saneLabels;

my $adjustedPath = 0;

my $forceImportFlush = 0;

my %restoreData;

our $GBE_RM_URL;

my $UNIX = $ENV{'GBE_UNIX'};

my $result = GetOptions (

                'help+'             => \$opt_help,          # flag, multiple use allowed

                'manual:3'          => \$opt_help,

                'verbose:+'         => \$opt_verbose,       # Versose

                'repository:s'      => \$opt_repo,          # Name of repository

                'rbase:s'           => \$opt_repo_base,     # Base of the repo

                'flat!'             => \$opt_flat,          # Flat structure

                'test!'             => \$opt_test,          # Test operations

                'reuse:1'           => \$opt_reuse,         # Reuse ClearCase views 0:None, 1=Retain, 2=Use+Delete

                'age:i'             => \$opt_age,           # Only recent versions

                'dump:1'            => \$opt_dump,          # Dump Data

                'images:1'          => \$opt_images,        # Create DOT images

                'retain:i'          => \$opt_retaincount,   # Retain N packages

                'pruneMode:s'       => \$opt_pruneModeString,

                'listtags:i'        => \$opt_listTags,

                'name:s'            => \$opt_name,          # Alternate output

                'tip:s'             => \@opt_tip,           # Force tip version(s)

                'log!'              => \$opt_log,

                'delete!'           => \$opt_delete,

                'postimage!'        => \$opt_postimage,

                'workdir:s'         => \$opt_workDir,

                'relabel!'          => \$opt_relabel,

                'svn!'              => \$opt_useSvn,

                'testRmDatabase'    => \$opt_testRmDatabase,

                'fromSvn!'          => \$opt_extractFromSvn,

                'resume'            => \$opt_resume,

                'mergePackages:s'   => \$opt_mergePackages,

                'subdir:s'          => \$opt_repoSubdir,    # Subdir within repo

                'svn!'          => \$opt_useSvn,

                'testRmDatabase'    => \$opt_testRmDatabase,

                'fromSvn!'          => \$opt_extractFromSvn,

                );

#

#   Process help and manual options

#

pod2usage(-verbose => 0, -message => "Version: $VERSION")  if ($opt_help == 1  || ! $result);

pod2usage(-verbose => 1)  if ($opt_help == 2 );

pod2usage(-verbose => 2)  if ($opt_manual || ($opt_help > 2));

#

#   Configure the error reporting process now that we have the user options

#

SystemConfig ('ExitOnError' => 1);

ErrorConfig( 'name'    =>'CC2SVN_IMPORT',

             'verbose' => $opt_verbose,

              );

Error("Workdir does not exist" ) unless ( -d $opt_workDir );

Error("Specify a package as 'name'" ) unless ( defined $ARGV[0] );

EnvImport('GBE_RM_URL');

$cwd = Getcwd();

#

#   Allow use of the test database

#   Defaut is live data, but some error recovery stuff can be done via

#   the test database.

#

if ( $opt_testRmDatabase )

{

    Warning ("Using Test Database");

    $ENV{GBE_RM_USERNAME} = 'RELEASE_MANAGER';

    $ENV{GBE_RM_PASSWORD} = 'RELEASE_MANAGER';

    $ENV{GBE_RM_LOCATION} = 'jdbc:oracle:thin:@auperaora07.vix.local:1521:RELMANU1';

}

#

#   Init the pruning mode

#

setPruneMode( $opt_pruneModeString || 'ripple');

#

#   Detect Merge Package Request

#   These use pre-configured bits

#

if ( $opt_mergePackages )

{

    if ( $opt_mergePackages eq 'LinuxDrivers' )

    {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (linux_drivers_eb5600

                    linux_drivers_viper

                    linux_drivers_cobra

                    linux_drivers_etx86

                    linux_drivers_tp5600);

#                    linux_drivers_bcp4600

    } elsif ( $opt_mergePackages eq 'flashCopier' ) {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (

                flash_copier_eb5600

                flash_copier_pcp5700

                flash_copier_tp5600

                );

    } elsif ( $opt_mergePackages eq 'u-boot' ) {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (

                u-boot

                u-boot-hk

                );

    } elsif ( $opt_mergePackages eq 'dams5000' ) {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (

                    dams_eb5600

                    dams_pcp5700

                    dams_tp5600

                );

    } elsif ( $opt_mergePackages eq 'linux_day0fs_5000' ) {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (

                    linux_day0fs_eb5600

                    linux_day0fs_tp5600

                    linux_day0fs_etx86

                );

    } elsif ( $opt_mergePackages eq 'linux_kernel_gen1' ) {

        $opt_name = $opt_mergePackages;

        @ARGV = qw (

                    linux_kernel_etx86

                    linux_kernel_tp5600

                    linux_kernel_eb5600

                    linux_kernel_bcp4600

                );

    } else

    {

        Error ("Unknown Merge Package Name: $opt_mergePackages");

    }

}

#   Get data for all packages

#

foreach my $packageName ( @ARGV )

{

    next unless ( $packageName );

    Verbose( "Base Package: $packageName");

    my $pkg_id = GetPkgIdByName ( $packageName );

    GetData_by_pkg_id ( $pkg_id, $packageName  );

    $pkg_ids{$pkg_id} = 1;

    $first_pkg_id = $pkg_id unless ( $first_pkg_id );

    push @packageNames, $packageName;

    $multiPackages++;

}

{

    #

    #   Delete entries that have been created as we read in

    #   data, but don't exist in RM. They will not have a pvid.

    #

    foreach my $entry ( keys(%versions) )

    {

        delete $versions{$entry}

            unless ( exists $versions{$entry}{pvid} );

    }

}

$totalVersions = scalar keys %versions;

Error ("No packages specified") unless ( $multiPackages >= 0 );

Warning ("Multiple Packages being processed") if ( $multiPackages > 1 );

$packageNames = join ('_', @packageNames );

$packageNames = $opt_name if ( defined $opt_name );

Message ("PackageName: $packageNames" );

#

#   Save logging data

#

if ( $opt_log )

{

    my $opt_logfile = $packageNames . '.import';

    Message ("Logging outout: $opt_logfile" );

    open STDOUT, '>', $opt_logfile  or die "Can't redirect STDOUT: $!";

    open STDERR, ">&STDOUT"         or die "Can't dup STDOUT: $!";

}

#

#   Prepare tip version hash

#

$tipVersions{$_} = 1 foreach ( @opt_tip );

#

#   Read in external data and massage it all

#

getEssenialPackageVersions();

getVobMapping();

smartPackageType();                 # Determine special prune mode

ReportPathVariance();

massageData();

getSvnData();

smartPackageType();                 # Have another go

restoreData() if ( $opt_resume );

my @missedTips = keys %tipVersions;

Error ("Specified tip version not found: @missedTips") if ( @missedTips );

if ( $opt_flat )

{

#    @flatOrder = sort {$versions{$a}{version} cmp $versions{$b}{version}} keys(%versions);

#    @flatOrder = sort {$versions{$a}{created} cmp $versions{$b}{created}} keys(%versions);

    if ( $flatMode == 1 ) {

        Message ("Flat import. Sorted by TimeStamp");

        @flatOrder = sort {$versions{$a}{TimeStamp} cmp $versions{$b}{TimeStamp}} keys(%versions);

    } elsif ( $flatMode == 2 ) {

        Message ("Flat import. Sorted by Version");

        # Only iff all the bits are numeric

        sub sortCotsVersion

        {

            my @va = split '\.', $versions{$a}{vname};

            my @vb = split '\.', $versions{$b}{vname};

            my $rv = scalar @va <=> scalar @vb;

            return $rv if ( $rv );

            foreach my $ii ( 0 .. scalar @va )

            {

                $rv = $va[$ii] <=> $vb[$ii];

                return $rv if ( $rv );

            }

            return $rv;

        }

        @flatOrder = sort sortCotsVersion keys(%versions);

#        @flatOrder = sort {$versions{$a}{vname} cmp $versions{$b}{vname}} keys(%versions);

    } else {

        @flatOrder = sort {$a <=> $b} keys(%versions);

    }

    my $tip = $flatOrder[-1];

    $versions{$tip}{Tip} = 1 if $tip;

}

#

#   Generate dumps and images

#

if ( $opt_images )

{

    createImages();

}

if ( $opt_dump )

{

    DebugDumpData ("Versions", \%versions );

    DebugDumpData ("Starts", \@startPoints );

    DebugDumpData ("Ends", \@endPoints );

    DebugDumpData ("Suffixes", \%suffixes );

}

#   Display VCS tags

#

if ( $opt_listTags )

{

    foreach my $entry (sort {$versions{$a}{version} cmp $versions{$b}{version}} keys(%versions) )

    {

        print $versions{$entry}{vcsTag} || '-' ,"\n";

    }

}

exit if ( ($opt_dump > 1) || ($opt_images > 1) );

transferPackageToSvn();

if ( $opt_postimage )

{

    getSvnData();

    createImages();

}

exit 0;

#-------------------------------------------------------------------------------

# Function        : transferPackageToSvn

#

# Description     : Transfer the package to SVN

#

# Inputs          : 

#

# Returns         : 

#

sub transferPackageToSvn

{

    Error ("Repository Path not setup")

        unless ( $svnRepo );

    #

    #   Going to do serious work

    #   Need to ensure we have more arguments

    #

    if ( $opt_protected )

    {

        Warning("Protected Package not transferred: $packageNames - $opt_protected",

                "See cc2svn_protected.txt for details");

        exit 0;

    }

    if ( $noTransfer )

    {

        Warning("Protected Package not transferred: $packageNames",

                "Configured within this program");

        exit 0;

    }

    #

    #   Perform all the work in a package specific subdirectory

    #

    $workDir = $opt_workDir . '/' . $packageNames;

    mkdir $workDir unless ( -d $workDir );

    chdir $workDir || Error ("Cannot cd to $workDir");

    #

    #   Process all packages

    #       Going to create versions based on RM structure

    #       May have several starting points: Process each

    #

    newPackage();

    if ( $opt_flat )

    {

        newProject();

        foreach my $entry (@flatOrder )

        {

            newPackageVersion( $entry, $versions{$entry}{suffix} );

        }

    }

    else

    {

        processBranch(@allStartPoints);

    }

    endPackage();

    chdir $cwd || Error ("Cannot cd back to $cwd");

    rmdir $workDir;

    Warning ("Work Directory still exists: $workDir");

    saveData();

}

#-------------------------------------------------------------------------------

# Function        : setPruneMode

#

# Description     : Set the pruning mode

#

# Inputs          : mode                    - Text mode value

#

# Returns         : Nothing

#

sub setPruneMode

{

    my ($mode) = @_;

    my $value;

    if ( $mode )

    {

        if ( $mode =~ m/none/i) {

            $value = 0;

        } elsif ( $mode =~ m/ripple/i) {

            $value = 1;

        } elsif ( $mode =~ m/retain/i) {

            $value = 2;

        } elsif ( $mode =~ m/severe/i) {

            $value = 3;

        } else {

            Error ("Unknown pruning mode", "Use: none, ripple, retain or severe");

        }

        $pruneModeString = $mode;

        $pruneMode = $value;

    }

}

#-------------------------------------------------------------------------------

# Function        : smartPackageType

#

# Description     : Have a look at the projects in the package set and

#                   attempt to determine what sort of mechanism to use

#

# Inputs          : Uses %suffixes data

#

# Returns         : 

#

my $packageType = 'UNKNOWN';

sub smartPackageType

{

    #

    #   Rebuild suffixes hash based on  post massaged versions

    #

    my %suffixes;

    my @unknown;

    foreach my $entry ( keys %versions )

    {

        my $suffix = $versions{$entry}{suffix} || '';

        push (@unknown, $entry) if ($suffix eq 'unknown');

        next if ( exists $suffixes{$suffix} );

        next if ( $versions{$entry}{badSingleton} );

        next if ( $versions{$entry}{locked} eq 'N' || $versions{$entry}{isaWip} );

        $suffixes{$suffix} = 1;

        $knownProjects{$suffix}{seen} = 1;

    }

    #

    #   The 'unknown' suffix is really an 'empty' suffix

    #   Try to be clever

    #       Map unknown to 'cr' or 'mas' if present

    #

    #

    if ( exists $suffixes{'unknown'}  )

    {

        my $new_suffix;

        if ( exists $suffixes{'.cr'} ) {

            $new_suffix = '.cr';

        } elsif ( exists $suffixes{'.mas'} ) {

            $new_suffix = '.mas';

        }

        if ( $new_suffix )

        {

            foreach my $entry ( @unknown )

            {

                $versions{$entry}{suffix} = $new_suffix;

            }

            delete $suffixes{'unknown'};

            delete $knownProjects{'unknown'}{seen};

        }

    }

    if ( exists $suffixes{'.cots'} && !exists ($notCots{$packageNames}) ) {

        $packageType = 'COTS';

        $Projects{'.cots'}{Trunk} = 1;

        $singleProject = 1;

        $opt_flat = 1 unless defined $opt_flat;

        setPruneMode('none') unless (defined $opt_pruneModeString);

    } elsif ( exists $suffixes{'.tool'} ) {

        $packageType = 'TOOL';

        $Projects{'.tool'}{Trunk} = 1;

        $singleProject = 1;

        setPruneMode('none') unless (defined $opt_pruneModeString);

#        $opt_flat = 1;

    } elsif ( scalar (keys %suffixes ) == 1 ) {

        $packageType = 'SINGLE_PROJECT';

        $singleProject = 1;

    } else {

        $packageType = 'MULTIPLE_PROJECT';

    }

    #

    #   Some packages are special

    #

    if ( $svnRepo =~ m~/Manufacturing(/|$)~ )

    {

        Message ("Set Manufacturing Repo style");

        $opt_flat = 1;

        setPruneMode('none') unless (defined $opt_pruneModeString);

    }

    if ( $packageNames =~ m'^br_applet_' )

    {

      $opt_flat = 1 unless defined $opt_flat;

    }

    if ( exists $specialPackages{$packageNames} )

    {

        my $data = ',' . $specialPackages{$packageNames} . ',';

        if ( index( $data, ',all' ) >= 0) {

            setPruneMode('none') unless (defined $opt_pruneModeString);

        }

        if ( index( $data, ',protected,' ) >= 0) {

            $noTransfer = 1;

        }

        if ( index( $data, ',flat,' ) >= 0) {

            $opt_flat = 1;

        }

        if ( index( $data, ',flatTime,' ) >= 0) {

            Message ("Flatten import tree. Sort by Time");

            $opt_flat = 1;

            $flatMode = 1;          # By Time

            $opt_processRipples = 0;

        }

        if ( index( $data, ',flatVersion,' ) >= 0) {

            Message ("Flatten import tree. Sort by Version");

            $opt_flat = 1;

            $flatMode = 2;          # By Version

            $opt_processRipples = 0;

        }

        if ( index( $data, ',processRipples,' ) >= 0) {

            $opt_processRipples = 1;

        }

        if ( index( $data, ',SetProjectBase,' ) >= 0) {

            $opt_preserveProjectBase = 1;

            $opt_ignoreProjectBaseErrors = 1;

            Message ("Preserving ProjectBase");

        }

        if ( index( $data, ',AllowMultiPath,' ) >= 0) {

            $opt_AllowMuliplePaths = 1;

            Message ("Allowing Multiple Paths");

        }

        if ( $data =~ m~,ForceProjectBase=(.*?),~ ) {

            $opt_forceProjectBase = $1;

            $opt_AllowMuliplePaths = 1;

            Message ("Force Project Base: $opt_forceProjectBase");

        }

        if ( $data =~ m~,LimitProjectBase=(.*?),~ ) {

            $opt_AllowMuliplePaths = 1;

            @opt_limitProjectBase = split(':', $1);

            Message ("Limit Project Base: @opt_limitProjectBase");

        }

        if ( $data =~ m~,mergePaths=(.*?),~ ) {

            @opt_mergePaths = split(':', $1);

            Message ("Merge Paths: @opt_mergePaths");

        }

        if ( index( $data, ',IgnoreProjectBase,' ) >= 0) {

            $opt_ignoreProjectBaseErrors = 1;

            Message ("Ignore ProjectBase Errors");

        }

        if ( index( $data, ',IgnoreMakeProject,' ) >= 0) {

            $opt_ignoreMakeProjectErrors = 1;

            Message ("Ignore MakeProject Usage");

        }

        if ( index( $data, ',IgnoreBadPath,' ) >= 0) {

            $opt_ignoreBadPaths = 1;

            Message ("Ignore Bad Paths in makefile Usage");

        }

        if ( index( $data, ',utf8,' ) >= 0) {

            $mustConvertFileNames = 1;

            Message ("Convert filenames to UTF8");

        }

    }

    Message("Package Type: $packageType, $pruneModeString");

}

#-------------------------------------------------------------------------------

# Function        : massageData

#

# Description     : Massage all the data to create a tree of package versions

#                   that can be used to create images as well as an import order

#

# Inputs          : 

#

# Returns         : 

#

my $reprocess=0;

sub calcLinks

{

    #

    #   Process the 'versions' hash and:

    #   Add back references

    #   Find starts and ends

    #       Entry with no previous

    #       Entry with no next

    #

    $reprocess = 0;

    foreach my $entry ( keys(%versions) )

    {

        foreach ( @{ $versions{$entry}{next}} )

        {

            $versions{$_}{last} = $entry;

        }

    }

    @allStartPoints = ();

    @startPoints = ();

    @endPoints = ();

    foreach my $entry ( keys(%versions) )

    {

        push @startPoints, $entry

            unless ( exists $versions{$entry}{last} || $versions{$entry}{badSingleton} );

        push @allStartPoints, $entry

            unless ( exists $versions{$entry}{last} );

        push @endPoints, $entry