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

 my $opt_beta;                               # Create beta release
 my $opt_merge;                              # Merge release
 my $opt_path;                               # Path for view spec
 my $opt_runtests = 1;                       # Run unit tests after build
 my $opt_branch;                             # Create config spec with branch
+my $opt_mkbranch;                           # Create branch
 my $opt_debug_build = 0;                    # Build Debug Only
 my $opt_prod_build = 0;                     # Build ion Only
 my $opt_view_root = $ENV{'GBE_VIEWBASE'};   # Root of the view
 my $opt_prefix = 1;                         # Prefix the view tag with user-name
 my $opt_tag;                                # View tag insert (build or export or user)
                 'beta!'         => \$opt_beta,                  # [no]flag
                 'merge'         => \$opt_merge,                 # [no]flag
                 'path=s'        => \$opt_path,                  # string
                 'runtests!'     => \$opt_runtests,              # [no]flag
                 'branch=s'      => \$opt_branch,                # String
-                'mkbranch=s'    => \$opt_branch,                # String
+                'mkbranch=s'    => \$opt_mkbranch,              # String
                 'prodOnly'      => \$opt_prod_build,            # flag
                 'debugOnly'     => \$opt_debug_build,           # flag
                 'root=s'        => \$GBE_VIEWBASE,              # string
                 'prefix!'       => \$opt_prefix,                # flag
                 'tag=s'         => \$opt_tag,                   # string
+#
 Error ("Cannot mix -extractfiles and -branch")
     if ( $opt_branch && $opt_extract_files );
 Error ("Unexpected command line arguments present.","Cannot mix -label and command line label" )
     if ( $#opt_spec >= 0 && $#ARGV >= 0);
+Error ("Cannot specify both '-mkbranch' and '-branch'")
+    if ( $opt_mkbranch && $opt_branch );
 push @opt_spec, @ARGV;
 unless(  @opt_spec  )
+{
     Error ("Need a workspace or a label. -help for options") if ( $opt_delete  && ! $opt_viewname );
     Error ("Need a Subversion Reference or URL. -help for options") unless $opt_delete;
+}
+#
+#   Set up branching values
+#       mkbranck    - Create if not exists. Error if it exists
+#       branch      - Error if not exists
+#
+if ( $opt_mkbranch ) {
+    $opt_branch = $opt_mkbranch;
+    $opt_mkbranch = 1;
+}
+$opt_branch = SvnIsaSimpleLabel($opt_branch) if ( $opt_branch );
 #   Determine extraction mode
 #       Working- Default
 #               Extract point on development branch were tag was taken
 #               Update build files
 #               Warn about files that have changed
         $noReleaseWs = 0;
     } elsif ( $opt_devModeStr =~ m/^Exact$/i) {
         $opt_devMode = 'exact';
         $checkDelta = 1;
         $noReleaseWs = 0;
-        Error ('Cannot mix -branch and -devMode=' . $opt_devModeStr ) if ( $opt_branch );
+        Error ('Cannot mix -[mk]branch and -devMode=' . $opt_devModeStr ) if ( $opt_branch );
     } elsif ( $opt_devModeStr =~ m/^escrow$/i) {
         # JATS internal use only. Not advertised
         $opt_devMode = 'exact';
         $checkDelta = 0;
         $noReleaseWs = 0;
         $traceBack = 1;
-        Error ('Cannot mix -branch and -devMode=' . $opt_devModeStr ) if ( $opt_branch );
+        Error ('Cannot mix -[mk]branch and -devMode=' . $opt_devModeStr ) if ( $opt_branch );
     } else {
         Error ("Unknown development mode: $opt_devModeStr");
+    }
+}
 parseSubversionRef($opt_spec[0]);
 Error ("INTERNAL: initialUrl not set") unless ( $initialUrl );
 Error ("Cannot interprete the URL or Subversion Reference: $opt_spec[0]") unless ( $srcPathPkg  );
+#
-#   Check branch name
-#
-if ( $opt_branch )
-{
-    $opt_branch = SvnIsaSimpleLabel($opt_branch);
-}
-#
 #   User has specified both debug and production
 #   Then set both to 0 : ie default
+#
 if ( $opt_debug_build + $opt_prod_build > 1 )
+{
+}
 $workSpace = $VIEWDIR . $opt_path;
 Verbose( "workSpace : $workSpace" );
+#
+#   Operation
-#   If the view currently exists then it will be deleted if allowed
+#   If all we are doing is deleting the view then do it now
-#
-delete_view()
-    unless ( $opt_reuse );
+#   If we are going to extract stuff, then we will delay the deletion
-#
-#   If the user is simply deleting the view then all has been done
+#   as long as possible - incase we decide we can't
+#
-exit 0
+if ( $opt_delete )
+{
+    delete_view()
-    if ( $opt_delete );
+        unless ( $opt_reuse );
+    exit 0;
+}
+#
 #   Ensure that the label is present within the specified Repository
+#
 Verbose("Ensure Labels can be found in a Repository");
     $view_tag = $svnSession->FullPath() . '/' .$view_tag;
     Verbose("Creating Workspace:", $view_tag);
+    #
     #   If a branch is required ...
+    #   Two modes:
+    #       mkbranch    - Ensure that the branch does not exist
+    #                     Make a new one
+    #       branch      - Ensure that the branch does exist
+    #                     Use existing branch
     #   Ensure that the branch is NOT in the Repository
+    #
     if ( $opt_branch )
+    {
         $branch = $svnSession->BranchName($opt_branch, 'branches' );
         $svnSession->SvnValidateTarget (
                         'cmd'    => 'SvnRelease: Validate Branch',
                         'target' => $branch,
+                        'require' =>   (! $opt_mkbranch),
-                        'available' => 1,
+                        'available' => (  $opt_mkbranch),
                         );
+        #
+        #   If using an existing branch, then set up the name
+        #   of the source.
+        #
+        $view_tag = $branch if ( ! $opt_mkbranch );
+    }
+    #
+    #   Perform delayed delete of any existign view
+    #   The process has been delayed as much as possible - incase other tests
+    #   fail
+    #
+    delete_view();
+    #
     #   Create the workspace
+    #
     $svnSession->SvnCo ( $view_tag, $workSpace );
     Error ("Cannot locate the created Workspace")
     #       Copy the WS to URL
     #       Switch to new URL
     #   The bulk of the copy will be done on the server-side
     #   and not over the network. This is  good.
+    #
-    if ( $opt_branch )
+    if ( $opt_mkbranch )
+    {
+        #
         #   Branch does not exist
         #   Create it be copying the base view
+        #
             SvnRmView ('path'     => $workSpace,
                        'force'    => ($opt_delete > 1) || ($opt_extract > 1),
                        'modified' => [ 'local_dpkg_archive' ] );
+        }
-        Error ("View was not deleted. Will Delete view directory")
+        Warning ("View was not deleted. Will Delete view directory")
             if ( -d $workSpace );
         RmDirTree( $VIEWDIR ) if $opt_path;
+    }
     Error ("View was not deleted")
 # Returns         : Will not return if changes are not allowed
+#
 sub determineChangedFiles
+{
     my @msgText;
+    my $onlyWarn = ($checkDelta == 1);
+    #
     #   No checking required
     #   Skip the hard bit if running on a build machine
+    #
     my $rv = $svn_check->SvnInfo( $svn_check->Full, 'InfoRepo' );
     if ( $rv )
+    {
         push (@msgText, "Cannot read information for the head of the development branch",
                         "Branch may not exist: $baseBranch");
+        $onlyWarn = 1;
+    }
     else
+    {
         $devBranchHead = $svn_check->{'InfoRepo'}{'Last Changed Rev'};
         Verbose2("devBranchHead: $devBranchHead");
         push (@msgText, "Changed file count: $rv") if ( $rv );
         push (@msgText, "More than 10 files have changed. First 10 are:") if ( $rv > 10);
         push (@msgText, @{$svn_check->{tmp}{files}} );
+    }
-    if ( $checkDelta == 1) {
+    if ($onlyWarn) {
         push @messageText, @msgText;
     } else {
         Error ( @msgText );
+    }
+}
     -spec=xxx          - Same as -label=xxx
     -path=xxx          - Source Path
     -view=xxx          - Modify the name of the created view
     -build=xxx         - Package Name to build
     -root=xxx          - Root directory for generated view
-    -[mk]branch=xxx    - Will create a view with a branch rule
+    -[mk]branch=xxx    - Will create/use a branch
     -tag=xxx           - Compatibility. Not used
     -extract           - Extract the view and exit
     -extractfiles      - Extract files, without a view
     -devMode=xxx       - Create Workspace suitable for development.(Tip,Tag,...)
     -cache             - Refresh local dpkg_archive cache
 command line. It overrides the value of GBE_VIEWBASE.
 If the command is invoked within a development sandbox, then the default
 location will be the root directory of the development sandbox.
-=item B<-branch=xxx or -mkbranch=xxx>
+=item B<-mkbranch=xxx>
 This option will create a workspace associated with a branch within the
 repository. This is intended to facilitate the maintenance of existing packages
-and the creation of project or development branches in a manner similar to
+and the creation of project or development branches.
-ClearCase.
+The named branch must not exist. It is an error for the branch to exist.
-If the named branch exists, then the workspace will be based on the branch and
+This tool will copy the specified source version to the branch, create a
-not on the specified label.
+workspace based on the branch and then switch to the branch.
-If the named branch does not exist, then this tool will copy the specified
-source version to the branch and then create a workspace based on the branch.
+This option is intended to create a development thread, for project or private
+use.
 A branch name of TIMESTAMP will be treated in special manner. The name will be
 replaced with a unique name based on the users name and the current date time.
+=item B<-branch=xxx>
+This option will create a workspace associated with a branch within the
+repository. This is intended to facilitate the maintenance of existing packages
+and the creation of project or development branches in a manner similar to
+ClearCase.
+The named branch must exist. It is an error for the branch to not exist.
+If the named branch does exist, then this tool will create a workspace based
+on the head of the branch.
+This option is intended to extract the tip of a development thread.
 =item B<-tag=text>
 This option is not used.
 It is present to maintain compatibility with the buildtool interface.

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_svnrelease.pl – Rev 1456 → 2040