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

+    #
     my $uref;
     my $url;
     if ( $opt_tag )
+    {
+        my $path = $opt_tag;
+        my $label;
+        $path =~ s~^SVN::~~;
+        if ( $path =~ m~(.+)::(.+)~ )
+        {
+            $path = $1;
+            $label = $2;
+        }
-        $url = SvnPath2Url($opt_tag);
+        $url = SvnPath2Url($path);
+        if ( $label && $label =~ m~^\d+$~ )
+        {
+            $url .= '@' . $label;
+        }
+        elsif ( $label )
+        {
+            $url =~ m~(.+)(/(tags|branches|trunk)(/|$|@))~;
+            $url = $1 . '/tags/'. $label;
+        }
+    }
     else
+    {
         $uref = NewSessionByWS($opt_path, 0, 1);
         my $ws_root = $uref->SvnLocateWsRoot(1);
     my $opt_date;
     my $opt_log = '';
     my $opt_branch;
     my $opt_datafile;
     my $opt_printfiles;
+    my $opt_commit = 1;
+    #
     #   Other globals
+    #
     my $url_label;
                     'printfiles=i'  => \$opt_printfiles,
                     'author=s'      => \$opt_author,
                     'date=s'        => \$opt_date,
                     'log=s'         => \$opt_log,
                     'datafile=s'    => \$opt_datafile,
+                    'commit!'       => \$opt_commit,
+                    #
                     #   Update documentation at the end of the file
+                    #
                     ) || Error ("Invalid command line" );
     #   Configure the error reporting process now that we have the user options
+    #
     Error ("No package URL specified") unless ( $opt_package );
     Error ("No base directory specified") unless ( $opt_dir );
     Error ("Invalid base directory: $opt_dir") unless ( -d $opt_dir );
+    Error ("Cannot label if not committing") if ( $opt_label && ! $opt_commit );
+    #
     #   Create an SVN session
+    #
     my $svn = NewSessionByUrl ( $opt_package );
+    #
     #   Commit the workspace
     #   This will go back onto the trunk
+    #
-    $svn = NewSessionByWS( $opt_workdir );
-    my $pkgPath = $svn->Path();
-    my $ciComment = "$pkgPath: Checkin by Svn Import";
-    $ciComment .= "\n" . $opt_log if ( $opt_log );
-    $ciComment =~ s~\r\n~\n~g;
-    $ciComment =~ s~\r~\n~g;
-    $ciComment = encode('UTF-8', $ciComment, Encode::FB_DEFAULT);
-    $svn->SvnCi ('comment' => $ciComment, 'allowSame' => 1 );
-    Message ("Repository Ref: " . $svn->RmRef) unless( $opt_label );
-    $svn->setRepoProperty('svn:author', $opt_author) if (defined ($opt_author));
-    $svn->setRepoProperty('svn:date', $opt_date) if (defined ($opt_date));
-    #
-    #   Label the result
-    #   The workspace will have been updated, so we can use it as the base for
-    #   the labeling process
-    #
-    if ( $opt_label )
+    if ( $opt_commit )
+    {
-        $svn->SvnCopyWs (
+        $svn = NewSessionByWS( $opt_workdir );
-                       target => $url_label,
+        my $pkgPath = $svn->Path();
-                       'noswitch' => 1,
+        my $ciComment = "$pkgPath: Checkin by Svn Import";
-                       'replace' => $opt_replace,
+        $ciComment .= "\n" . $opt_log if ( $opt_log );
-                       'comment' => "$pkgPath: Tagged by Jats Svn Import",
+        $ciComment =~ s~\r\n~\n~g;
-                       );
+        $ciComment =~ s~\r~\n~g;
+        $ciComment = encode('UTF-8', $ciComment, Encode::FB_DEFAULT);
-        Message ("Repository Ref: " . $svn->RmRef);
+        $svn->SvnCi ('comment' => $ciComment, 'allowSame' => 1 );
-        Message ("Vcs Tag       : " . $svn->SvnTag);
+        Message ("Repository Ref: " . $svn->RmRef) unless( $opt_label );
         $svn->setRepoProperty('svn:author', $opt_author) if (defined ($opt_author));
         $svn->setRepoProperty('svn:date', $opt_date) if (defined ($opt_date));
+        #
+        #   Label the result
+        #   The workspace will have been updated, so we can use it as the base for
+        #   the labeling process
+        #
+        if ( $opt_label )
+        {
+            $svn->SvnCopyWs (
+                           target => $url_label,
+                           'noswitch' => 1,
+                           'replace' => $opt_replace,
+                           'comment' => "$pkgPath: Tagged by Jats Svn Import",
+                           );
+            Message ("Repository Ref: " . $svn->RmRef);
+            Message ("Vcs Tag       : " . $svn->SvnTag);
+            $svn->setRepoProperty('svn:author', $opt_author) if (defined ($opt_author));
+            $svn->setRepoProperty('svn:date', $opt_date) if (defined ($opt_date));
+        }
+    }
+    else
+    {
+        Message ("Workspace not commited","Workspace: $opt_workdir");
+    }
+    #
     #   Clean up
+    #
-    if ( $opt_delete && ! $opt_reuse )
+    if ( $opt_delete && ! $opt_reuse  && $opt_commit )
+    {
         Message ("Delete Workspace");
         rmtree( $opt_workdir );
+    }
     SubCommandHelp( $opt_help, "Delete Branch") if ($opt_help);
+    #
     #   Sanity Tests
+    #
-    Message ("Delete Workspace Branch" );
+    Message ("Delete Workspace Branchs" );
-    Error ("Too many arguments: @ARGV") if ( $#ARGV >= 0 );
+    #
     #   Do all the hard work
+    #
     $opt_path = '.' unless ( defined $opt_path );
     my $uref = NewSessionByWS($opt_path, 0, 1);
     my $ws_root = $uref->SvnLocateWsRoot(1);
     my $ws_url = $uref->FullWs();
+    #
-    #   Must be a branch
+    #   What we do depends what aruments the user provided
+    #
+    unless ( @ARGV )
+    {
+        #
+        #   If no branch was specified - then display the workspace branch
+        #
-    Error ("Workspace is not based on a branch")
+        Error ('The workspace is not based on a branch')
-        unless ( $ws_url =~ m ~/branches/~ );
+            unless ( $ws_url =~ m ~/branches/(.*)~ );
+        Message('The workspace is based on the branch: '. $1);
+    }
+    else
+    {
+        #
+        #   Delete all specified branches
+        #
+        foreach my $branch ( @ARGV )
+        {
-    Message ("Deleting: " . $uref->{WSURL} );
+            Message ("Deleting: " . $branch );
+            my $target = join( '/', $uref->FullPath(), 'branches', $branch);
-    $uref->SvnDelete (
+            if ( $uref->SvnDelete (
-                      'target'    => $ws_url,
+                              'target'    => $target,
-                      'comment'   => [$uref->Path().": Delete Branch",'Deleted by user command: jats svn delete-branch'],
+                              'comment'   => [$uref->Path().": Delete Branch",'Deleted by user command: jats svn delete-branch'],
+                              'noerror'   => 1,
-                      );
+                              )
+               )
+            {
+                Warning ("Branch deletion failed: $branch");
+            }
+        }
+    }
     $opr_done = 1;
+}
 #-------------------------------------------------------------------------------
 # Function        : CreateBranch
 =item B<-man>
 This is the same as '-help=3'.
 The complete help is produced in a man page format.
-=item B<--verbose[=n]>
+=item B<-verbose[=n]>
 This option will increase the level of verbosity of the commands.
 If an argument is provided, then it will be used to set the level, otherwise the
 existing level will be incremented. This option may be specified multiple times.
 This command will convert a TAG or a PATH to a full URL that can be used
 directly by Subversion. If no PATH or TAG is provided, then the command uses a
 path of the current directory.
-The command will convert either a TAG or a URL. It will not do both.
+The command will convert either a TAG or a PATH. It will not do both.
 The command will use the configured Subversion URL prefixes to expand the TAG.
 If a PATH is to be converted, then the PATH must address a Subversion workspace.
 The conversion will return a URL to the root of the Workspace and Peg it to
 If a TAG is to be converted, then the resultant value should be used with
 caution. The result is only as good as the provided URL and may not address
 the root of a package.
+=head3 Examples
+To display the URL of the current workspace
+    jats svn url
+To display the URL of a known workspace
+    jats svn url -path=myWorkSpace
+To convert a TAG from Release Manager or other JATS commands
+    jats svn url AUPERASVN01/COTS
+    jats svn url SVN::AUPERASVN01/COTS/bouncycastle/trunk::bouncycastle_1.3.1.cots@502
 =head1 Create a Package Version
 =head2 NAME
 Create a Package Version
  Command Options
     -help[=n]               - Provide command specific help
     -new                    - Package must not exist
     -replace                - Replace any existing versions
-    -import=nnn             - Import directory tree
+    -import=path            - Import directory tree
     -label=nnn              - Label imported package
     -trunk                  - Import to trunk (default)
     -tags=nnn               - Import to tags
     -branch=nnn             - Import to branches
 This option allows the program to replace any existing versions of the
 imported source. It will allow the deletion of any existing trunk, tags or
 branches.
-=item -import=nnn
+=item -import=path
 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.
+All files and directories below, but not including, the named path will be
+imported into the package.
 =item -label=nnn
 This option specifies a label to place the imported source.
 =item -trunk
 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. Use the 'import' command for more sophisticated import requirements.
+=head3 Examples
+To create a package skeleton in the Perth MREF_Package repository for a package
+called 'VIXmyPackage':
+    jats svn create-package AUPERASVN01/MREF_Package/VIXmyPackage
+To create a package skeleton in the Perth MREF_Package repository, import code
+into the trunk of the package and label (tag) it:
+    jats svn create-package \
+           AUPERASVN01/MREF_Package/VIXmyPackage \
+           -import=VIXmyNewPackage \
+           -label=VIXmyPackage.WIP
 =head1 Delete a Package
 =head2 NAME
 Delete a Package
 =item   2. Switch to the named branch.
 The named branch must exists otherwise the command will fail.
-There are two spcial variants of the branch name:
+There are two special variants of the branch name:
 =over 4
 =item trunk
 Delete the Workspace Branch
 =head2 SYNOPSIS
-jats svn delete-branch [options]
+jats svn delete-branch [options] [branch-list]
  Options:
     -help[=n]              - Help message, [n=1,2,3]
     -man                   - Full documentation [-help=3]
     -verbose[=n]           - Verbose command operation
     -path=path             - Target workspace
 =head2 ARGUMENTS
+The command may take zero or more arguments. If provided the arguments will be
-The command takes no arguments.
+branch names to be deleted.
 =head2 OPTIONS
 =over
 =back
 =head2 DESCRIPTION
-This command will delete the branch associated with the workspace in the
+This command can display the branch associated with the workspace or it can
-specified path. It is intended to simplify the deletion of Private or
+delete one or more branches. It is intended to simplify the deletion of Private
-Development branches.
+or Development branches.
+=over 4
+=item 1 Arguments are provided
+The command will delete all the named branches. If a named branch does not exist
+then the command will issue a warning message.
+=item 2 No arguments provided
+The command will display the branch associated with the workspace
 If the workspace is not linked to a 'branch' then the command will fail.
+=back
 =head1 Import directory to a Package
 =head2 NAME
 Import directory to a Package
     -[no]delete             - Deletes workspace after use. Default:yes
     -author=name            - Force author of changes
     -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
 =head2 ARGUMENTS
 The command takes one argument: The URL of the desired package.
 This may be be:
 =item -datafile=path
 This option will cause the utility to create a data file to record the import
 tag. It is used for automation of the import process.
+=item -[no]commit
+This option will prevent the final workspace from being committed to the
+Repository. This allows inspection of the results.
+The default operation is to commit and label the results of the import.
+=item -printfiles=n
+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).
 =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 2054 → 2429