Subversion Repositories DevTools

Rev

Rev 7300 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7300 Rev 7323
Line 21... Line 21...
21 
use JatsError;
 21 
use JatsError;
22 
use JatsSvn;
 22 
use JatsSvn;
23 
 
 23 
 
24 
use Pod::Usage;                             # required for help support
 24 
use Pod::Usage;                             # required for help support
25 
use Getopt::Long;
 25 
use Getopt::Long;
26 
use Cwd;
 26 
use FileUtils;
27 
 
 27 
 
28 
my $VERSION = "1.0.0";                      # Update this
 28 
my $VERSION = "1.0.0";                      # Update this
29 
 
 29 
 
30 
#
 30 
#
31 
#   Options
 31 
#   Options
Line 102... Line 102...
102 
pod2usage(-verbose => 2) if ($opt_help > 2);
 102 
pod2usage(-verbose => 2) if ($opt_help > 2);
103 
 
 103 
 
104 
#
 104 
#
105 
#   Configure the error reporting process now that we have the user options
 105 
#   Configure the error reporting process now that we have the user options
106 
#
 106 
#
- 
 
 107 
InitFileUtils();
107 
ErrorConfig( 'name'    =>'SVNLABEL',
 108 
ErrorConfig( 'name'    =>'SVNLABEL',
108 
             'verbose' => $opt_verbose,
 109 
             'verbose' => $opt_verbose,
109 
            );
 110 
            );
110 
 
 111 
 
111 
#
 112 
#
Line 274... Line 275...
274 
    #       If the 'tags' area is not writable then we get a cryptic message
 275 
    #       If the 'tags' area is not writable then we get a cryptic message
275 
    #       If the 'tags' area is writable then we commit the changes twice
 276 
    #       If the 'tags' area is writable then we commit the changes twice
276 
    #
 277 
    #
277 
    #   Solution - ensure that the Workspace is upto date
 278 
    #   Solution - ensure that the Workspace is upto date
278 
    #              This is done within SvnCopyWs
 279 
    #              This is done within SvnCopyWs
- 
 
 280 
    #
- 
 
 281 
    #   If the workspace has 'mixed revisions' then files will be added/removed/copied
- 
 
 282 
    #   directly to the 'tags' and will not be present on the branch. This is not good.
- 
 
 283 
    #
- 
 
 284 
    #   Solution - Ensure that the Workspace is not mixed
- 
 
 285 
    #              This is done within SvnCopyWs
279 
    #
 286 
    #
280 
    $session->SvnCopyWs (
 287 
    $session->SvnCopyWs (
281 
                   target => $ws_label,
 288 
                   target => $ws_label,
282 
                   'allowLocalMods' => $opt_complexTag,
 289 
                   'allowLocalMods' => $opt_complexTag,
283 
                   'noupdatecheck' => $opt_noUpdateCheck,
 290 
                   'noupdatecheck' => $opt_noUpdateCheck,
Line 431... Line 438...
431 
    #   Every thing else can live without it
 438 
    #   Every thing else can live without it
432 
    #
 439 
    #
433 
    Error ("Cannot determine source Workspace") if ( $opt_label && !$ws_root );
 440 
    Error ("Cannot determine source Workspace") if ( $opt_label && !$ws_root );
434 
 
 441 
 
435 
    #
 442 
    #
- 
 
 443 
    #   If operation is 'label', then we have a Workspace
- 
 
 444 
    #   Ensure that we are in the 'root' of the workspace - otherwise we will get cryptic messages
- 
 
 445 
    #
- 
 
 446 
    if ( $opt_label && $ws_root  && !$opt_workspace) {
- 
 
 447 
        my $pathToRoot = RelPath($ws_root);
- 
 
 448 
        if ( $pathToRoot =~ m~^..~) {
- 
 
 449 
            Warning("Current directory is the not the workspace root",
- 
 
 450 
                    "The 'svn update' command will not update the entire workspace");
- 
 
 451 
        }
- 
 
 452 
    }
- 
 
 453 
 
- 
 
 454 
    #
436 
    #   Calculate the package base
 455 
    #   Calculate the package base
437 
    #       - User specified
 456 
    #       - User specified
438 
    #       - Extacted from label
 457 
    #       - Extacted from label
439 
    #       - Extracted from WorkSpace
 458 
    #       - Extracted from WorkSpace
440 
    #           - User specified Workspace
 459 
    #           - User specified Workspace