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

     my $opt_dir;
     my $opt_label;
     my $opt_replace = 0;
     my $opt_reuse;
     my $opt_workdir = "SvnImportDir";
+    my $opt_delete = 1;
+    #
     #   Other globals
+    #
     my $url_label;
                     "package=s"     => \$opt_package,
                     "dir=s"         => \$opt_dir,
                     "label=s"       => \$opt_label,
                     "replace"       => \$opt_replace,
                     "reuse"         => \$opt_reuse,
-                    "workspace"     => \$opt_workdir,
+                    "workspace=s"   => \$opt_workdir,
+                    "delete!"       => \$opt_delete,
+                    #
                     #   Update documentation at the end of the file
+                    #
                     ) || Error ("Invalid command line" );
         $svn->SvnCo ( $svn->Full . '/trunk', $opt_workdir );
         Error ("Cannot locate the created Workspace")
             unless ( -d $opt_workdir );
+    }
+    else
+    {
+        Message ("Reusing Workspace");
+    }
+    #
     #   Determine differences between the two folders
     #       Create structures for each directory
+    #
     my $search = JatsLocateFiles->new("--Recurse=1",
                                        "--DirsToo",
                                        "--FilterOutRe=/\.svn/",
                                        "--FilterOutRe=/\.svn\$",
+                                       "--FilterOutRe=^/${opt_workdir}\$",
+                                       "--FilterOutRe=^/${opt_workdir}/",
                                        );
     my @ws = $search->search($opt_workdir);
     my @dir = $search->search($opt_dir);
     #Information ("WS Results", @ws);
                        'replace' => $opt_replace,
                        'comment' => 'Created by Jats Svn Import',
                        );
         Message ("Repository Ref: " . $svn->RmRef);
+    }
+    #
+    #   Clean up
+    #
+    if ( $opt_delete && ! $opt_reuse )
+    {
+        Message ("Delete Workspace");
+        rmtree( $opt_workdir );
+    }
     $opr_done = 1;
+}
 #-------------------------------------------------------------------------------
 # Function        : SubCommandHelp
     -man                   - Full documentation [-help=3]
     -verbose[=n]           - Verbose command operation
 =head2 ARGUMENTS
-The command takes one argument: The URL of the desirecd package.
+The command takes one argument: The URL of the desired package.
 This may be be:
 =over
 =item * A full URL
     -help[=n]               - Help message, [n=1,2,3]
     -man                    - Full documentation [-help=3]
     -verbose[=n]            - Verbose command operation
  Command Options
-    -help[=n]               - Provide comand specific help
+    -help[=n]               - Provide command specific help
     -import=nnn             - Import directory tree
     -label=nnn              - Label it (trunk import only)
     -new                    - Package must not exist
     -replace                - Replace any existing versions
     -trunk                  - Import to trunk
     -tags=nnn               - Import to tags
     -branch=nnn             - Import to branches
 =head2 ARGUMENTS
-The command takes one argument: The URL of the desirecd package.
+The command takes one argument: The URL of the desired package.
 This may be be:
 =over
 =item * A full URL
 This option specifies the path of a subdirectory tree to import into the newly
 created package. In not provided, then only a package skeleton will be created.
 =item -label=nnn
-This option specifes a label to place the imported source, if the source is
+This option specifies a label to place the imported source, if the source is
 being imported to the 'trunk' of the package.
 =item -new
 This option specifies that the named package MUST not exist at all.
 =item -replace
 This option allows the program to replace any existing versions of the
-imported source. It will allow the deletion of any existing trunk, trags or
+imported source. It will allow the deletion of any existing trunk, tags or
 branches.
 =item -trunk
 This option specifies that imported source will be placed on the trunk of the
 package. This is the default mode of import.
-The options -trunk, -tags and -branch are mutally exclusive.
+The options -trunk, -tags and -branch are mutually exclusive.
 =item -tags=nnn
 This option specifies that imported source will be placed directly on the
-named tag of ther package.
+named tag of the package.
-The options -trunk, -tags and -branch are mutally exclusive.
+The options -trunk, -tags and -branch are mutually exclusive.
 =item -branch=nnn
 This option specifies that imported source will be placed directly on the
-named branch of ther package.
+named branch of the package.
-The options -trunk, -tags and -branch are mutally exclusive.
+The options -trunk, -tags and -branch are mutually exclusive.
 =back
 =head2 DESCRIPTION
 The command will, optionally, import a directory tree into the repository and,
 optionally, label the package.
 The package body may be imported to the 'trunk' or to a branch or a tag.
-By default the data will be imported to the trunk and may be labled (tagged).
+By default the data will be imported to the trunk and may be labeled (tagged).
-Options allow the targets to be deleletd if they exist or to ensure that they
+Options allow the targets to be deleted if they exist or to ensure that they
 are not present.
 The command does not attempt to merge file versions within the repository. It
 may result in multiple instances of a file within the repository. Use only for
 simple imports.
     -dir=path               - Path to new version
     -label                  - Label the result
     -replace                - Allow the label to be replaced
     -reuse                  - Reuse the import directory
     -workspace=path         - Path and name of alternate workspace
+    -[no]delete             - Deletes workspace after use. Default:yes
 =head2 ARGUMENTS
-The command takes one argument: The URL of the desirecd package.
+The command takes one argument: The URL of the desired package.
 This may be be:
 =over
 =item * A full URL
 existing level will be incremented. This option may be specified multiple times.
 =item -package=name
-This option is mandatory. It specifies the repository and package to be used as a
+Either this option or a bare URL on the command line must be provided. It
-basis for the work.
+specifies the repository and package to be used as a basis for the work.
 =item -dir=path
 This option is mandatory. It specifies the path to a local directory that
 contains a version of the software to be checked in.
 =item -label=name
-The resulting software version will be labled with this tag, if it is provided.
+The resulting software version will be labeled with this tag, if it is provided.
 =item -replace
 This option, if provided, allows the label to be replaced.
 =item -reuse
 This option can be used to speed the creation of multiple versions in a scripted
-environment. The option allows the utility to reuse the workspace if it exists
+environment. The option allows the utility to reuse the workspace if it exists.
-=item -workpspace=path
+=item -workspace=path
 This option specifies an alternate workspace directory to create and use. The
 default directory is "SvnImportDir" within the users current directory.
+=item [no]delete
+This option control the deletion of the workspace directory. By default he
+directory will be deleted, unless re-use is also used.
 =back
 =head2 DESCRIPTION
 Import a new version of a package to the trunk of the package. The utility
 This utility is used import software from another version control system
 The utility will:
 =over
-=item * Create a Work Space based on the current pakage version
+=item * Create a Work Space based on the current package version
-The 'trunk' of the named package will be used as the baes for the workspace.
+The 'trunk' of the named package will be used as the base for the workspace.
 =item * Update files and directories
 Determines the files and directories that have been added and deleted and
 update the Workspace to reflect the new structure.
 =item * Label the new version
 =back
+The utility can optionally perform other operations including:
+=over
+=item * Import directly to a branch. This does not affect the 'trunk'.
+=item * Import directly to a tag. This does not affect the 'trunk'
+=back
 =cut

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_svn.pl – Rev 297 → 299