WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/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 );
+    }
 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
     -[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/branches/dpurdie_devl/TOOLS/jats_svn.pl – Rev 2354 → 2424