WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/jats_svn.pl

     my $opt_log = '';
     my $opt_branch;
     my $opt_datafile;
     my $opt_printfiles;
     my $opt_commit = 1;
+    my $opt_mergePaths;
+    #
     #   Other globals
+    #
     my $url_label;
     my $url_branch;
+    my $filesBase = 0;                  # Files in Base workspace
+    my $filesDeleted = 0;               # Files Deleted
+    my $filesAdded = 0;                 # Files Added
+    my $filesTransferred = 0;           # Files Copied
+    my $dirsDeleted = 0;                # Directories Deleted
+    my $dirsAdded = 0;                  # Directories Added
+    my $dirsTransferred = 0;            # Directories Copied
+    #
     #   Configuration options
+    #
     my $result = GetOptions (
                     'help:+'        => \$opt_help,
                     'author=s'      => \$opt_author,
                     'date=s'        => \$opt_date,
                     'log=s'         => \$opt_log,
                     'datafile=s'    => \$opt_datafile,
                     'commit!'       => \$opt_commit,
+                    'mergePaths=s'  => \$opt_mergePaths,
+                    #
                     #   Update documentation at the end of the file
+                    #
                     ) || Error ("Invalid command line" );
+    #
     #   Scan for a source file
     #   Trying to detect empty views
     #   Look for file, not directory
+    #       Keep a count for reporting
+    #
+    {
+        foreach ( @ws )
+        {
+            $filesBase++ unless ( m~/$~ );
+        }
         my $fileFound = 0;
         foreach ( @dir )
+        {
             next if ( m~/$~ );
-            $fileFound++;
+            $fileFound = 1;
             last;
+        }
         unless ( $fileFound )
+        {
         $common{$_} = 1;
         delete $ws{$_};
         delete $dir{$_};
+    }
+    #
+    #   Now have:
+    #       %ws     - Hash of paths that are only in the Workspace
+    #       %dir    - Hash of paths that are only in New Import
+    #       %common - Hash of paths that are common to both
+    #
     #DebugDumpData( 'WS', \%ws );
     #DebugDumpData( 'DIR', \%dir );
     #DebugDumpData( 'COMMON', \%common );
+    #
     #   Need to consider the case where a file has been replaced with a directory
     #   and visa-versa. Delete files and directories first.
+    #
+    #
     #   Remove files
     #   Sort in reverse. This will ensure that we process directory
     #   contents before directories
+    #
     my @rm_files = reverse sort keys %ws;
     if ( @rm_files )
+    {
+        #
+        #   Calculate new top level paths
+        #   These are of the form xxxxx/
+        #
+        my @newTldPaths;
+        if ( $opt_mergePaths )
+        {
+            foreach  ( @rm_files)
+            {
+                push (@newTldPaths, $1 ) if ( m~^([^/]+)/$~ );
+            }
+        }
+        my @processedFiles;
         foreach my $file ( @rm_files  )
+        {
+            #
+            #   Detect items that are to be retained
+            #   Do not delete items that are a part of a top level path that
+            #   is not present in the New Import
+            #
+            if ( $opt_mergePaths )
+            {
+                my $keep = 0;
+                foreach ( @newTldPaths )
+                {
+                    if ( $file =~ m~^$_/~ )
+                    {
+                        Verbose("Not deleting: $file");
+                        $keep = 1;
+                        last;
+                    }
+                }
+                next if ($keep);
+            }
             Verbose ("Removing $file");
+            $filesDeleted++ unless ( $file =~ m~/$~ );
+            $dirsDeleted++ if ( $file =~ m~/$~ );
             unlink "$opt_workdir/$file";
+            push @processedFiles, $file;
+        }
+        @rm_files = @processedFiles;
+        #
         #   Inform Subversion about the removed files
+        #
         my $base = 0;
         my $num = $#rm_files;
-        Message ("Update the workspace: Removed " . ($num + 1) . " Files");
+        Message ("Update the workspace: Removed $filesDeleted Files, $dirsDeleted directories");
         while ( $base <= $num )
+        {
             my $end = $base + 200;
             $end = $num if ( $end > $num );
     #   This will ensure we process parent directories first
+    #
     my @added = sort keys %dir;
     if ( @added )
+    {
+        my @processedFiles;
         foreach my $file ( @added  )
+        {
+            #
+            #   Detect items that are to be merged
+            #   Only specified top level paths are to be imported
+            #
+            if ( $opt_mergePaths )
+            {
+                my $discard = 1;
+                foreach ( split(',', $opt_mergePaths) )
+                {
+                    if ( $_ eq '+' )
+                    {
+                        if ( ($file =~ tr~/~/~) eq 0 )
+                        {
+                            $discard = 0;
+                            last;
+                        }
+                    }
+                    elsif ( $file =~ m~^$_/~ )
+                    {
+                        $discard = 0;
+                        last;
+                    }
+                }
+                Verbose0("Not Importing: $file") if ( $discard ) ;
+                next if ( $discard );
+            }
             my $src = "$opt_dir/$file";
             my $target = "$opt_workdir/$file";
+            $filesAdded++ unless ( $file =~ m~/$~ );
+            $dirsAdded++ if ( $file =~ m~/$~ );
+            push @processedFiles, $file;
             if ( -d $src )
+            {
                 Verbose ("Adding directory: $file");
                 mkdir ( $target ) unless (-d $target);
+                {
                     Error("Failed to transfer file [$file]: $!");
+                }
+            }
+        }
+        @added = @processedFiles;
+        #
         #   Inform Subversion about the added files
         #   The command line does have a finite length, so add them 200 at a
         #   time.
+        #
         my $base = 0;
         my $num = $#added;
-        Message ("Update the workspace: Added " . (1 + $num) . " files");
+        Message ("Update the workspace: Added $filesAdded Files, $dirsAdded directories");
         while ( $base <= $num )
+        {
             my $end = $base + 200;
             $end = $num if ( $end > $num );
     foreach my $file ( sort keys %common  )
+    {
         my $src = "$opt_dir/$file";
         my $target = "$opt_workdir/$file";
+        $filesTransferred++ unless ( $file =~ m~/$~ );
+        $dirsTransferred++ if ( $file =~ m~/$~ );
         next if ( -d $src );
         if ( File::Compare::compare ($src, $target) )
+        {
             Verbose ("Transfer $file");
             unlink $target;
                       "Src: $src",
                       "Tgt: $target");
+            }
+        }
+    }
+    Message ("Update the workspace: Transferred $filesTransferred Files, $dirsTransferred directories")
+        if ($filesTransferred);
+    #
     #   Commit the workspace
     #   This will go back onto the trunk
+    #
         $data->setProperty('Command'        , 'ImportPackage');
         $data->setProperty('Label'          , $opt_label);
         $data->setProperty('subversion.url' , $svn->RmRef);
         $data->setProperty('subversion.tag' , $svn->SvnTag);
+        $data->setProperty('files.base'     , $filesBase);
+        $data->setProperty('files.removed'  , $filesDeleted);
+        $data->setProperty('files.added'    , $filesAdded);
         $data->Dump('InfoFile') if ($opt_verbose);
         $data->store( $opt_datafile );
+    }
     $opr_done = 1;
     -date=dateString        - Force date of changes
     -log=text               - Append text to the commit message
     -datafile=path          - Export tag data for automation
     -[no]commit             - Prevent chnages being commited. Default:Yes
     -printfiles=n           - Control commit verbosity
+    -mergePaths=dirList     - Comma separated list of directores to merge
 =head2 ARGUMENTS
 The command takes one argument: The URL of the desired package.
 This may be be:
 This option controls commit verbosity. The default operation is to display
 the files added and removed during the commit.
 Suitable numbers are: None, 0 (No Display) and 1 (Full Display).
+=item -mergePaths=dirList
+This option specifies a Comma separated list of directores to be merged
+during the import process. This works as via the following mechanism:
+If the named directory exists in the 'new' image it will replace that in the
+'initial' workspace.
+If the named directory does not exist in the 'new' image, but does exist in the
+'initial' image then it will be retained in the 'final' image.
+Directories other than those named will not be imported.
 =back
 =head2 DESCRIPTION
 Import a new version of a package to the trunk of the package. The utility

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_svn.pl – Rev 2429 → 2764