Subversion Repositories DevTools

Rev

Rev 1356 | Rev 1360 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1356 Rev 1357
Line 100... Line 100...
100 
my $noReleaseWs = 0;                        # Do not officially release from this
 100 
my $noReleaseWs = 0;                        # Do not officially release from this
101 
my $checkDelta = 1;                         # Check Diffs between Tag and Head
 101 
my $checkDelta = 1;                         # Check Diffs between Tag and Head
102 
                                            #   0 - Don't do anything
 102 
                                            #   0 - Don't do anything
103 
                                            #   1 - Warn about diffs
 103 
                                            #   1 - Warn about diffs
104 
                                            #   2 - Error if diffs
 104 
                                            #   2 - Error if diffs
- 
 
 105 
my $traceBack = 2;                          # Trace Back error control. As above
105 
 
 106 
 
106 
#
 107 
#
107 
#   Data about the package-version
 108 
#   Data about the package-version
108 
#
 109 
#
109 
my $srcPathPkg;                             # Root of the package
 110 
my $srcPathPkg;                             # Root of the package
Line 237... Line 238...
237 
    } elsif ( $opt_devModeStr =~ m/^Exact$/i) {
 238 
    } elsif ( $opt_devModeStr =~ m/^Exact$/i) {
238 
        $opt_devMode = 'exact';
 239 
        $opt_devMode = 'exact';
239 
        $checkDelta = 1;
 240 
        $checkDelta = 1;
240 
        $noReleaseWs = 0;
 241 
        $noReleaseWs = 0;
241 
        Error ('Not allowed to mix -branch and -devMode=exact') if ( $opt_branch );
 242 
        Error ('Not allowed to mix -branch and -devMode=exact') if ( $opt_branch );
- 
 
 243 
    } elsif ( $opt_devModeStr =~ m/^vcsdiff$/i) {
- 
 
 244 
        $opt_devMode = 'exact';
- 
 
 245 
        $checkDelta = 0;
- 
 
 246 
        $noReleaseWs = 0;
- 
 
 247 
        $traceBack = 1;
- 
 
 248 
        Error ('Not allowed to mix -branch and -devMode=vcsdiff') if ( $opt_branch );
242 
    } else {
 249 
    } else {
243 
        Error ("Unknown development mode: $opt_devModeStr");
 250 
        Error ("Unknown development mode: $opt_devModeStr");
244 
    }
 251 
    }
245 
}
 252 
}
246 
 
 253 
 
Line 484... Line 491...
484 
#
 491 
#
485 
#   Trace back from the tag to the point at which it was copied
 492 
#   Trace back from the tag to the point at which it was copied
486 
#   This should be the same as the user provided development branch
 493 
#   This should be the same as the user provided development branch
487 
#   but it may not be the same if the user is changing the branch
 494 
#   but it may not be the same if the user is changing the branch
488 
#
 495 
#
489 
if ( $tagLabel )
 496 
if ( $tagLabel && $traceBack )
490 
{
 497 
{
491 
    my $btData;
 498 
    my $btData;
492 
    my $labelBranch = $svnSession->backTrackSvnLabel(
 499 
    my $labelBranch = $svnSession->backTrackSvnLabel(
493 
                            join ('@', $tagLabel, $tagPeg)
 500 
                            join ('@', $tagLabel, $tagPeg)
494 
                          , 'data' => \$btData
 501 
                          , 'data' => \$btData
Line 513... Line 520...
513 
        {
 520 
        {
514 
            # If the user is creating a branch, then allow this mismatch
 521 
            # If the user is creating a branch, then allow this mismatch
515 
            #
 522 
            #
516 
            unless ( $opt_branch && ($devBranch =~ m~/$opt_branch$~) )
 523 
            unless ( $opt_branch && ($devBranch =~ m~/$opt_branch$~) )
517 
            {
 524 
            {
- 
 
 525 
                my @msgText;
- 
 
 526 
                push ( @msgText,
518 
                Error("The package Tag was not taken from the development branch",
 527 
                        "The package Tag was not taken from the development branch",
519 
                      "Development Branch: $devBranch\@$tagPeg",
 528 
                        "Development Branch: $devBranch\@$tagPeg",
520 
                      "Tag traced back to: $tagLabelBranch\@$tagLabelBranchPeg" );
 529 
                        "Tag traced back to: $tagLabelBranch\@$tagLabelBranchPeg" );
- 
 
 530 
                if ( $traceBack == 1) {
- 
 
 531 
                    push @messageText, @msgText;
- 
 
 532 
                } else {
- 
 
 533 
                    Error ( @msgText );
- 
 
 534 
                }
521 
            }
 535 
            }
522 
        }
 536 
        }
523 
        $devBranchPeg = $tagLabelBranchPeg unless ( $devBranchPeg );
 537 
        $devBranchPeg = $tagLabelBranchPeg unless ( $devBranchPeg );
524 
 
 538 
 
525 
        #   Ensure that the TAG has not been modified since it was taken
 539 
        #   Ensure that the TAG has not been modified since it was taken
Line 595... Line 609...
595 
#
 609 
#
596 
#   If we are only extracting files then ...
 610 
#   If we are only extracting files then ...
597 
#
 611 
#
598 
if ( $opt_extract_files )
 612 
if ( $opt_extract_files )
599 
{
 613 
{
- 
 
 614 
    Warning(@messageText );
600 
    extract_files_from_view();
 615 
    extract_files_from_view();
601 
    exit (0);
 616 
    exit (0);
602 
}
 617 
}
603 
 
 618 
 
604 
#
 619 
#
Line 683... Line 698...
683 
    mkdir ( $VIEWDIR . '/local_dpkg_archive')
 698 
    mkdir ( $VIEWDIR . '/local_dpkg_archive')
684 
        unless ($GBE_SANDBOX);
 699 
        unless ($GBE_SANDBOX);
685 
 
 700 
 
686 
    #
 701 
    #
687 
    #   Display messages AFTER the extraction text
 702 
    #   Display messages AFTER the extraction text
688 
    #   Will ensure that the user has a chace to see them
 703 
    #   Will ensure that the user has a chance to see them
689 
    #
 704 
    #
690 
    Warning(@messageText );
 705 
    Warning(@messageText );
691
706
692 
}
 707 
}
693 
 
 708