Subversion Repositories DevTools

Rev

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

Rev 5709 Rev 6085
Line 38... Line 38...
38 
my $opt_new_label;
 38 
my $opt_new_label;
39 
my $opt_old_label;
 39 
my $opt_old_label;
40 
my $opt_md5check;
 40 
my $opt_md5check;
41 
my $opt_mode;
 41 
my $opt_mode;
42 
my $opt_diff;
 42 
my $opt_diff;
- 
 
 43 
my @opt_options;
43 
 
 44 
 
44 
#
 45 
#
45 
#   Globals - Provided by the JATS environment
 46 
#   Globals - Provided by the JATS environment
46 
#
 47 
#
47 
my $USER            = $ENV{'USER'};
 48 
my $USER            = $ENV{'USER'};
Line 79... Line 80...
79 
                "debug:+"       => \$opt_debug,             # Debug Verbosity
 80 
                "debug:+"       => \$opt_debug,             # Debug Verbosity
80 
                "new=s"         => \$opt_new_label,         # Path1
 81 
                "new=s"         => \$opt_new_label,         # Path1
81 
                "old=s"         => \$opt_old_label,         # Path2
 82 
                "old=s"         => \$opt_old_label,         # Path2
82 
                'check'         => \$opt_md5check,          # Force MD5 Check
 83 
                'check'         => \$opt_md5check,          # Force MD5 Check
83 
                'diff!'         => \$opt_diff,              # Force use of diff
 84 
                'diff!'         => \$opt_diff,              # Force use of diff
- 
 
 85 
                'option=s'      => \@opt_options,           # User options
84 
                );
 86 
                );
85 
 
 87 
 
86 
                #
 88 
                #
87 
                #   UPDATE THE DOCUMENTATION AT THE END OF THIS FILE !!!
 89 
                #   UPDATE THE DOCUMENTATION AT THE END OF THIS FILE !!!
88 
                #
 90 
                #
Line 227... Line 229...
227 
#
 229 
#
228 
Message ("Using '$Name' to compare two views",
 230 
Message ("Using '$Name' to compare two views",
229 
         "Wait for utility to exit so that we can delete the views" ) if ($DiffWait);
 231 
         "Wait for utility to exit so that we can delete the views" ) if ($DiffWait);
230 
 
 232 
 
231 
Verbose ("Diff Utility: $DiffProg");
 233 
Verbose ("Diff Utility: $DiffProg");
232 
System ( $DiffProg, @DiffArgs, $path1, $path2 );
 234 
System ( $DiffProg, @DiffArgs, split(/,/, join (',', @opt_options)), $path1, $path2 );
233 
exit 0;
 235 
exit 0;
234 
 
 236 
 
235 
#-------------------------------------------------------------------------------
 237 
#-------------------------------------------------------------------------------
236 
# Function        : create_view
 238 
# Function        : create_view
237 
#
 239 
#
Line 495... Line 497...
495 
=head1 SYNOPSIS
 497 
=head1 SYNOPSIS
496 
 
 498 
 
497 
  jats vcsdiff [options] [old_label new_label]
 499 
  jats vcsdiff [options] [old_label new_label]
498 
 
 500 
 
499 
 Options:
 501 
 Options:
500 
    -help              - brief help message
 502 
    -help               - Brief help message
501 
    -help -help        - Detailed help message
 503 
    -help -help         - Detailed help message
502 
    -man               - Full documentation
 504 
    -man                - Full documentation
503 
    -check             - Perform MD5SUM over both views
 505 
    -check              - Perform MD5SUM over both views
504 
    -[no]diff          - Force the use of a 'diff' utility
 506 
    -[no]diff           - Force the use of a 'diff' utility
- 
 
 507 
    -option=opt1,...    - Add user options to the command line
505 
    -old=tag           - Old VcsTag (or dir=path)
 508 
    -old=tag            - Old VcsTag (or dir=path)
506 
    -new=tag           - New VcsTag (or dir=path)
 509 
    -new=tag            - New VcsTag (or dir=path)
507 
 
 510 
 
508 
=head1 OPTIONS
 511 
=head1 OPTIONS
509 
 
 512 
 
510 
=over 8
 513 
=over 8
511 
 
 514 
 
Line 547... Line 550...
547 
This option will force the use of a 'diff' utility on both Windows and
 550 
This option will force the use of a 'diff' utility on both Windows and
548 
Unix.
 551 
Unix.
549 
 
 552 
 
550 
This option cannot be used in conjunction with the '-check' option'.
 553 
This option cannot be used in conjunction with the '-check' option'.
551 
 
 554 
 
- 
 
 555 
=item B<-option=opt1,..>
- 
 
 556 
 
- 
 
 557 
This option allows the user to modify the operation of the invoked diff program.
- 
 
 558 
 
- 
 
 559 
The options are passed directly to the diff utility invoved by the program. It is the users
- 
 
 560 
responsibility to ensure that the options are valid.
- 
 
 561 
 
- 
 
 562 
This option may be used mutiple times, or options may be comma-seperated.
- 
 
 563 
 
552 
=item B<-old=tag>
 564 
=item B<-old=tag>
553 
 
 565 
 
554 
This option specifies the old, or base, VcsTag for the difference report. This
 566 
This option specifies the old, or base, VcsTag for the difference report. This
555 
tag is mandatory.
 567 
tag is mandatory.
556 
 
 568