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

         $uref = NewSessionByWS($opt_path, 0, 1);
         my $ws_root = $uref->SvnLocateWsRoot(1);
         $uref->CalcRmReference($uref->FullWs());
+    }
-    Message ("Tag is: " . $uref->RmRef() );
+    Message ("Tag is  : " . $uref->RmRef() );
+    Message ("Vcs Tag : " . $uref->SvnTag  );
     $opr_done = 1;
+}
 #-------------------------------------------------------------------------------
 # Function        : ShowUrl
+#
                 "verbose:+"     => \$opt_verbose,
                 "import=s"      => \$opt_import,
                 "new"           => \$opt_new,
                 "branch=s"      => \$opt_branch,
                 "trunk"         => \$opt_trunk,
-                "tag=s"         => \$opt_tag,
+                "tags=s"        => \$opt_tag,
                 "label=s"       => \$opt_label,
                 "replace"       => \$opt_replace,
                 'author=s'      => \$opt_author,
                 'date=s'        => \$opt_date,
     Error ("Nothing imported to be labeled") if ( $count && !$opt_import );
     Error ("Import path does not exist: $opt_import") if ( $opt_import && ! -d $opt_import );
     Error ("Conflicting options: new and replace") if ( $opt_new && $opt_replace );
     Error ("Too many command line arguments") if ( exists $ARGV[1] );
-    ($type, $opt_label) = ('tags', $opt_tag)            if ( $opt_tag);
+    $type = 'tags/' . $opt_tag          if ( $opt_tag);
-    ($type, $opt_label) = ('branches', $opt_branch)     if ( $opt_branch );
+    $type = 'branches/' . $opt_branch   if ( $opt_branch );
-    ($type, $opt_label) = ('trunk', $opt_label)         if ( $opt_trunk);
+    $type = 'trunk'                     if ( $opt_trunk);
+    #
     #   Do all the hard work
     #       Create
     #       Import
                       'replace' => $opt_replace,
                       );
+    #
     # Report RmPath as using a pegged version of a new package is a bit silly
+    #
-    Message ("Repository Ref: " . $uref->RmPath);
+#    Message ("Repository Ref: " . $uref->RmPath);
+#    Message ("Vcs Tag       : " . $uref->SvnTag);
     if ( $uref->{REVNO} )
+    {
         $uref->setRepoProperty('svn:author', $opt_author) if (defined ($opt_author));
         $uref->setRepoProperty('svn:date', $opt_date) if (defined ($opt_date));
+    }
     my $opt_author;
     my $opt_date;
     my $opt_log = '';
     my $opt_branch;
     my $opt_datafile;
+    my $opt_printfiles;
+    #
     #   Other globals
+    #
     my $url_label;
                     'branch=s'      => \$opt_branch,
                     'replace'       => \$opt_replace,
                     'reuse'         => \$opt_reuse,
                     'workspace=s'   => \$opt_workdir,
                     'delete!'       => \$opt_delete,
+                    'printfiles=i'  => \$opt_printfiles,
                     'author=s'      => \$opt_author,
                     'date=s'        => \$opt_date,
                     'log=s'         => \$opt_log,
                     'datafile=s'    => \$opt_datafile,
                             'target' => $svn->Full,
                             'require' => 1,
                             );
         my $url_co = $opt_branch ? $url_branch : $svn->Full . '/trunk';
-        $svn->SvnCo ( $url_co, $opt_workdir, $opt_verbose ? '--Print' : '--NoPrint' );
+        $svn->SvnCo ( $url_co, $opt_workdir, 'print' => $opt_printfiles );
         Error ("Cannot locate the created Workspace")
             unless ( -d $opt_workdir );
+    }
     else
+    {
                        '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));
+    }
+    #
+    {
         my $data = JatsProperties::New();
         $data->setProperty('Command'        , 'ImportPackage');
         $data->setProperty('Label'          , $opt_label);
-        $data->setProperty('subversion.tag' , $svn->RmRef);
+        $data->setProperty('subversion.url' , $svn->RmRef);
+        $data->setProperty('subversion.tag' , $svn->SvnTag);
         $data->Dump('InfoFile') if ($opt_verbose);
         $data->store( $opt_datafile );
+    }
     -man                    - Full documentation [-help=3]
     -verbose[=n]            - Verbose command operation
  Command Options
     -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
+    -import=nnn             - Import directory tree
+    -label=nnn              - Label imported package
-    -trunk                  - Import to trunk
+    -trunk                  - Import to trunk (default)
     -tags=nnn               - Import to tags
     -branch=nnn             - Import to branches
 =head2 ARGUMENTS
 Print a help message and exit. The level of help may be either 1, 2 or 3.
 This option may be specified multiple times to increment the help level, or
 the help level may be directly specified as a number.
-=item -import=nnn
-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 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, tags or
 branches.
+=item -import=nnn
+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 specifies a label to place the imported source.
 =item -trunk
 This option specifies that imported source will be placed on the trunk of the
 package. This is the default mode of import.

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_svn.pl – Rev 1329 → 1403