Subversion Repositories DevTools

Rev

Go to most recent revision | Details | Last modification | View Log | RSS feed

Rev Author Line No. Line
267 dpurdie 1
########################################################################
2
# Copyright (C) 2008 ERG Limited, All rights reserved
3
#
4
# Module name   : JatsSvnCore.pm
5
# Module type   : Jats Support Module
6
# Compiler(s)   : Perl
7
# Environment(s): jats
8
#
9
# Description   : JATS LowLevel Subversion Interface Functions
10
#
11
#                 Requires a subversion client to be present on the machine
12
#                 Does require at least SubVersion 1.5
13
#                 Uses features not available in 1.4
14
#
15
#                 The package currently implements a set of functions
16
#                 There are some intentional limitations:
17
#                   1) Non recursive
18
#                   2) Errors terminate operation
19
#
20
#                 This package contains experimental argument passing
21
#                 processes. Sometimes use a hash of arguments
22
#
23
#......................................................................#
24
 
25
require 5.008_002;
26
use strict;
27
use warnings;
28
use JatsEnv;
29
 
30
#
31
#   Global Variables
32
#   Configuration variables imported from environment
33
#   Must be 'our' to work with EnvImport
34
#
35
our $GBE_SVN_PATH;                      # Optional: SVN bin directory
36
our $GBE_SVN_USERNAME;                  # Optional: User name
37
our $GBE_SVN_PASSWORD;                  # Optional: User passwrd
363 dpurdie 38
our $USER;
267 dpurdie 39
 
40
package JatsSvnCore;
41
 
42
use JatsError;
43
use JatsSystem;
44
use IPC::Open3;
45
 
46
 
47
use File::Path;             # Instead of FileUtils
48
use File::Basename;
49
use Cwd;
50
 
51
 
52
# automatically export what we need into namespace of caller.
53
use Exporter();
54
our (@ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK);
55
@ISA         = qw(Exporter);
56
@EXPORT      = qw(
57
                    SvnSession
58
                    SvnUserCmd
59
                    SvnComment
60
 
61
                );
62
@EXPORT_OK =  qw(
63
                    ProcessRevNo
353 dpurdie 64
                    %SVN_URLS
65
                    @SVN_URLS_LIST
66
 
267 dpurdie 67
                );
68
 
69
%EXPORT_TAGS = (All => [@EXPORT, @EXPORT_OK]);
70
 
71
 
72
#
73
#   Package Global
74
#
353 dpurdie 75
my  $svn;                               # Abs path to 'svn' utility
76
my  $stdmux;                            # Abs path to stdmux utlity
77
our %SVN_URLS;                          # Exported repository URLs
78
our @SVN_URLS_LIST;                     # Exported repository URLs scan order
267 dpurdie 79
 
80
#-------------------------------------------------------------------------------
81
# Function        : BEGIN
82
#
83
# Description     : Module Initialization
84
#                   Invoked by Perl as soon as possible
85
#                       Setup environment variables
86
#                       Calculate globals
87
#
88
# Inputs          : None
89
#
90
# Returns         : Nothing
91
#
92
sub BEGIN
93
{
94
    #
95
    #   Determine authentication information
96
    #   If not present then assume that the user is already athenticated
97
    #
363 dpurdie 98
    ::EnvImportOptional('USER');
267 dpurdie 99
    ::EnvImportOptional('GBE_SVN_USERNAME');
100
    ::EnvImportOptional('GBE_SVN_PASSWORD');
101
 
102
    #
103
    #   User can provide a path to the svn utility
104
    #   It will be used if its present
105
    #
106
    ::EnvImportOptional('GBE_SVN_PATH', '');
107
 
297 dpurdie 108
    #
109
    #   For some reason thats not clear these EnvVars must be used in this function
110
    #   for them to be available elsewhere.
111
    #
112
    #   No it doesn't make sence to me either
113
    #   Problem seen on Linx. Not investigated on others
114
    #
115
    Debug ("GBE_SVN_USERNAME", $::GBE_SVN_USERNAME);
116
    Debug ("GBE_SVN_PASSWORD", $::GBE_SVN_PASSWORD);
117
    Debug ("GBE_SVN_PATH", $::GBE_SVN_PATH);
118
 
271 dpurdie 119
    $stdmux = LocateProgInPath ( 'stdmux');
311 dpurdie 120
    $svn    = LocateProgInPath ( 'svn', '--All', '--Path=' . $::GBE_SVN_PATH );
353 dpurdie 121
 
122
    #
365 dpurdie 123
    #   Don't report errors in not finding svn and stdmux
124
    #   Need to allow the help system to work.
125
    #
126
 
127
    #
353 dpurdie 128
    #   Extract GBE_SVN_XXXX_URL information from the environment
129
    #       XXXX is the first element of the repository path and will
130
    #            be globally (ERG) unique
131
    #       The value will be the URL to access this named repository path
132
    #       It will normally include the repository path
133
    #       The saved URL will be terminated with a single '/' to simplify usage
134
    #
135
    foreach ( sort keys %ENV )
136
    {
137
        if ( m ~^GBE_SVN_URL_*(.*)~ )
138
        {
139
            my $url = $ENV{$_};
140
            my $key = $1;
141
            $url =~ s~/*$~/~;
142
            $SVN_URLS{$key} = $url;
143
 
144
            #
145
            #   Ensure that it is in valid format
146
            #   Four forms are supported, although not all should be used
147
            #
148
            if ( $url =~ m{^svn://[^/]+} ) {
149
                #
150
                #   Type is SVN server
151
                #   Protocol + server name
152
                #
153
            } elsif ( $url =~ m{^https{0,1}://.+} ) {
154
                #
155
                #   Type is HTTP server
156
                #   Protocol + server name + path on server
157
                #
158
            } elsif ( $url =~ m{^file:///+[A-Z]:/} ) {
159
                #
160
                #   Type is local Repo (file)
161
                #   Windows absolute pathname
162
                #   file:///I:/path/...
163
                #
164
            } elsif ( $url =~ m{^file:///+[^/]} ) {
165
                #
166
                #   Type is local Repo (file)
167
                #   Unix absolute pathname
168
                #   file:///path/...
169
                #
170
            } else {
171
                ReportError ("GBE_SVN_URL format not understood","$key: $url");
172
            }
173
 
174
        }
175
    }
176
    @SVN_URLS_LIST = reverse sort keys %SVN_URLS;
177
    ErrorDoExit();
178
#DebugDumpData("%SVN_URLS", \%SVN_URLS, \@SVN_URLS_LIST);
267 dpurdie 179
}
180
 
181
#-------------------------------------------------------------------------------
182
# Function        : SvnSession
183
#
184
# Description     : Create a new SvnSession
185
#                   Simply used to contain information about the operations
186
#
187
# Inputs          : Nothing
188
#
189
# Returns         : A blessed ref
190
#
191
sub SvnSession
192
{
193
    my $self = {};
194
 
195
    #
311 dpurdie 196
    #   Delayed error reporting
197
    #   Allows the the package to be used when SVN is not installed
198
    #   as long as we don't want to use any of the features
199
    #
200
    #   Think of 'help' when svn is not yet installed
201
    #
202
    Error ("The JATS stdmux utility cannot be found" ) unless ( $stdmux );
203
    Error ("The svn utility cannot be found", "Configured Path: $::GBE_SVN_PATH") unless ( $svn );
204
 
205
    #
267 dpurdie 206
    #   Documented instance variables
207
    #
208
    $self->{REVNO} = undef;         # Revision of last Repository operation
209
    $self->{ERROR_LIST} = [];       # Last SVN operation errors
210
    $self->{RESULT_LIST} = [];      # Last SVN operation results
211
    $self->{PRINTDATA} = 0;         # Global control of ProcessRevNo
212
 
213
    bless ($self, __PACKAGE__);
214
}
215
 
216
#-------------------------------------------------------------------------------
217
# Function        : SvnDelete
218
#
219
# Description     : Delete a directory within a repostory
220
#                   Intended to be used to remove tags and branches
221
#
222
# Inputs          : $self       - Instance data
223
#                   A hash of named arguments
224
#                       target     - Path to remove
225
#                       comment    - User comment
226
#                       noerror    - Don't panic on failure
227
#
228
#
229
# Returns         : True - delete failed and 'noerror' was present
230
#
231
sub SvnDelete
232
{
233
    my $self = shift;
234
    my %opt = @_;
235
    Debug ("SvnDelete");
236
    Error ("Odd number of args to SvnDelete") unless ((@_ % 2) == 0);
237
    Error ("SvnDelete: No target specified" ) unless ( $opt{'target'} );
238
 
239
    my $error =  $opt{'noerror'} ? '' : "SvnDelete: Target not deleted";
240
 
241
    my $rv = SvnCmd ($self, 'delete'
242
                    , $opt{'target'}
243
                    , '-m', SvnComment( $opt{'comment'}, 'Deleted by SvnDelete' ),
244
                    , { 'credentials' => 1,
245
                        'error' => $error } );
246
    return $rv;
247
}
248
 
249
 
250
#-------------------------------------------------------------------------------
251
# Function        : SvnRename
252
#
253
# Description     : Rename something within a repository
254
#                   Intended to be used to rename tags and branches
255
#
256
#                   A few tricks
257
#                   - Rename is the same as a copy-delete
258
#                     but it doesn't work if the source is pegged
259
#                     so we just use a copy.
260
#                   - Need to ensure the target does not exist
261
#                     because if it does then we may create a subdir
262
#                     within it.
263
#
264
# Inputs          : $self           - Instance data
265
#                   A hash of named arguments
266
#                       old      - Location within the repository to copy from
267
#                       new      - Location within the repository to copy to
268
#                       comment  - Commit comment
269
#                       revision - ref to returned revision tag
270
#                       tag      - ref to URL of the Check In
271
#                       replace  - True: Delete existing tag if present
272
#
273
# Returns         : Revision of the copy
274
#
275
sub SvnRename
276
{
277
    my $self = shift;
278
    my %opt = @_;
279
    Debug ("SvnRename");
280
    Error ("Odd number of args to SvnRename") unless ((@_ % 2) == 0);
281
 
282
    #
283
    #   Insert defaults
284
    #
285
    my $old = $opt{old} || Error ("SvnRename: Source not specified" );
286
    my $new = $opt{new} || Error ("SvnRename: Target not specified" );
287
 
288
    #
289
    #   Validate the source
290
    #   Must do this in case the target-delete fails
291
    #
292
    SvnValidateTarget ( $self,
293
                        'cmd'    => 'SvnRename',
294
                        'target' => $old,
295
                        'require' => 1,
296
                        );
297
 
298
    #
299
    #   Validate the target
300
    #   Repo needs to be valid, but we may be able
301
    #   to delete the target if it does exist
302
    #
303
    SvnValidateTarget ( $self,
304
                        'target' => $new,
305
                        'delete' => $opt{replace},
306
                        );
307
    #
308
    #   The 'rename' command does not handle a pegged source
309
    #   Detect this and use a 'copy' command
310
    #   We don't need to delete the source - as its pegged.
311
    #
312
    my $cmd = ($old =~ m~@\d+$~) ? 'copy' : 'rename';
313
    SvnCmd ($self, $cmd
314
                    , $old
315
                    , $new
316
                    , '-m', SvnComment($opt{'comment'},'Renamed by SvnRename'),
317
                    , { 'credentials' => 1,
318
                        'process' => \&ProcessRevNo
319
                      , 'error' => "SvnRename: Target not renamed" } );
320
 
321
 
322
    CalcRmReference($self, $new );
323
    Message ("Tag is: " . $self->{RMREF} );
324
    return $self->{RMREF} ;
325
}
326
 
327
#-------------------------------------------------------------------------------
328
# Function        : SvnCopy
329
#
330
# Description     : Copy something within a repository
331
#                   Intended to be used to copy tags and branches
332
#
333
#                   A few tricks
334
#                   - Need to ensure the target does not exist
335
#                     because if it does then we may create a subdir
336
#                     within it.
337
#
338
# Inputs          : $self           - Instance data
339
#                   A hash of named arguments
340
#                       old         - Location within the repository to copy from
341
#                       new         - Location within the repository to copy to
342
#                       comment     - Commit comment
343
#                       revision    - ref to returned revision tag
344
#                       tag         - ref to URL of the Check In
345
#                       replace     - True: Delete existing tag if present
346
#                       cmd         - Error Prefix
347
#                       validated   - Locations already validated
348
#
349
# Returns         : Revision of the copy
350
#
351
sub SvnCopy
352
{
353
    my $self = shift;
354
    my %opt = @_;
355
    Debug ("SvnCopy");
356
    Error ("Odd number of args to SvnCopy") unless ((@_ % 2) == 0);
357
 
358
    #
359
    #   Insert defaults
360
    #
361
    my $cmd = $opt{'cmd'} || 'SvnCopy';
362
    my $old = $opt{old} || Error ("$cmd: Source not specified" );
363
    my $new = $opt{new} || Error ("$cmd: Target not specified" );
364
 
365
    #
366
    #   Validate the source
367
    #   Must do this in case the target-delete fails
368
    #
369
    SvnValidateTarget ( $self,
370
                        'cmd'    => $cmd,
371
                        'target' => $old,
372
                        'require' => 1,
373
                        );
374
 
375
    #
376
    #   Validate the target
377
    #   Repo needs to be valid, but we may be able
378
    #   to delete the target if it does exist
379
    #
380
    SvnValidateTarget ( $self,
381
                        'cmd'    => $cmd,
382
                        'target' => $new,
383
                        'delete' => $opt{replace},
384
                        );
385
    #
386
    #   Copy the URLs
387
    #
388
    SvnCmd ($self   , 'copy'
389
                    , $old
390
                    , $new
391
                    , '-m', SvnComment($opt{'comment'},"Copied by $cmd"),
392
                    , { 'credentials' => 1
393
                      , 'process' => \&ProcessRevNo
394
                      , 'error' => "$cmd: Source not copied" } );
395
 
396
    CalcRmReference($self, $new );
397
    Message ("Tag is: " . $self->{RMREF} );
398
    return $self->{RMREF} ;
399
}
400
 
401
 
402
#-------------------------------------------------------------------------------
403
# Function        : SvnValidateTarget
404
#
405
# Description     : Validate a target within the repository
406
#                   Optional allow the target to be deleted
407
#                   Mostly used internally
408
#
409
# Inputs          : $self           - Instance data
410
#                   A hash of named arguments
411
#                       target      - Location within the repository to test
412
#                       cmd         - Name of command to use in messages
413
#                       delete      - Delete if it exists
414
#                       require     - Target must exist
415
#                       available   - Target must NOT exist
416
#                       comment     - Deletion comment
417
#                       test        - Just test existance
379 dpurdie 418
#                       create      - Create if it doesn't exist
267 dpurdie 419
#
420
# Returns         : May not return
421
#                   True : Exists
422
#                   False: Not exist (any more)
423
#
424
sub SvnValidateTarget
425
{
426
    my $self = shift;
427
    my %opt = @_;
428
    Debug ("SvnValidateTarget", $opt{target});
429
    Error ("Odd number of args to SvnValidateTarget") unless ((@_ % 2) == 0);
430
 
431
    #
432
    #   Validate options
433
    #
434
    Error ("SvnValidateTarget: No target specified") unless ( $opt{target} );
435
    $opt{cmd} = "SvnValidateTarget" unless ( $opt{cmd} );
436
    my $cmd = $opt{cmd};
437
 
438
    #
439
    #   Ensure that the target path does not exist
440
    #   Cannot allow a 'copy'/'rename' to copy into an existing path as
441
    #   Two problems:
442
    #       1) We end up copying the source into a subdir of
443
    #          target path, which is not what we want.
444
    #       2) Should use update to do that sort of a job
445
    #
446
    unless ( SvnTestPath ( $self, $cmd, $opt{target} ))
447
    {
448
        #
449
        #   Target does not exist
450
        #
451
        return 0 if ( $opt{'test'} || $opt{'available'} );
452
 
379 dpurdie 453
        #
454
        #   Create target if required
455
        #
456
        if ( $opt{create} )
457
        {
458
            $self->SvnCmd ('mkdir', $opt{target}
459
                           , '-m', $self->Path() . ': Created by SvnValidateTarget'
460
                           , '--parents'
461
                           , { 'credentials' => 1,
462
                               'error' => "SvnCreateBranch" } );
463
            return 1;
464
        }
465
 
267 dpurdie 466
        Error ("$cmd: Element does not exist", "Element: $opt{target}")
467
            if ( $opt{'require'} );
468
    }
469
    else
470
    {
471
        #
472
        #    Target DOES exist
473
        #       - Good if the user requires the target
474
        #       - Error unless the user is prepared to delete it
475
        #
476
        return 1
379 dpurdie 477
                if ( $opt{'require'} || $opt{'test'} || $opt{'create'}  );
267 dpurdie 478
 
479
        Error ("$cmd: Element exists", "Element: $opt{target}")
480
            unless ( $opt{'delete'} );
481
 
482
        #
483
        #   The user has requested that an existing target be deleted
484
        #
485
        SvnCmd ($self, 'delete'
486
                        , $opt{target}
487
                        , '-m', SvnComment($opt{'comment'},"Deleted by $cmd"),
488
                        , { 'credentials' => 1,
489
                            'error' => "$cmd: Element not deleted" } );
490
    }
491
    return 0;
492
}
493
 
494
#-------------------------------------------------------------------------------
495
# Function        : ProcessRevNo
496
#
497
# Description     : Callback function for SvnCmd to Extract a revision number
498
#                   from the svn command output stream
499
#
500
# Inputs          : $self           - Instance data
501
#                   $line           - Command output
502
#
503
#                   Globals:
504
#
505
# Returns         : zero - we don't want to kill the command
506
#
507
sub ProcessRevNo
508
{
509
    my ($self, $line ) = @_;
510
 
511
    if ( $line =~ m~Committed revision\s+(\d+)\.~i )
512
    {
513
        $self->{REVNO} = $1;
514
    } elsif ( $self->{PRINTDATA} ) {
515
        Message ( $line ) if $line;
516
    }
517
    return 0;
518
}
519
 
520
#-------------------------------------------------------------------------------
521
# Function        : SvnScanPath
522
#
523
# Description     : Internal helper function
524
#                   Scan a directory and split contents into three groups
525
#
526
# Inputs          : $self               - Instance data
527
#                   $cmd                - Command prefix for errros
528
#                   $path               - Path to test
529
#
530
# Returns         : $ref_files          - Ref to array of files
531
#                   $ref_dirs           - Ref to array of dirs
532
#                   $ref_svn            - Ref to array of svn dirs
533
#                   $found              - True: Path found
534
#
535
sub SvnScanPath
536
{
537
    my $self = shift;
538
    my ($cmd, $path) = @_;
539
    my @files;
540
    my @dirs;
541
    my @svn;
542
 
543
    Debug ("SvnScanPath");
544
    Verbose2 ("SvnScanPath: $path");
545
    #
546
    #   Read in the directory information
547
    #   Just one level. Gets files and dirs
548
    #
549
    if ( ! SvnTestPath( $self, $cmd, $path, 1 ) )
550
    {
551
        #
552
        #   Path does not exist
553
        #
554
        return \@files, \@dirs, \@svn, 0;
555
    }
556
 
557
    #
558
    #   Path exists
559
    #   Sort into three sets
560
    #       - Svn Directories
561
    #       - Other Directories
562
    #       - Files
563
    #
564
    foreach ( @{$self->{RESULT_LIST}} )
565
    {
566
        if ( $_ eq 'trunk/' || $_ eq 'tags/' || $_ eq 'branches/' ) {
567
            push @svn, $_;
568
 
569
        } elsif ( substr ($_, -1) eq '/' ) {
570
            push @dirs, $_;
571
 
572
        } else {
573
            push @files, $_;
574
        }
575
    }
576
 
577
    return \@files, \@dirs, \@svn, 1;
578
}
579
 
580
#-------------------------------------------------------------------------------
581
# Function        : SvnTestPath
582
#
583
# Description     : Internal helper function
584
#                   Test a path within the Repo for existance
585
#                   Optionally read in immediate directory data
586
#
587
# Inputs          : $self               - Instance data
588
#                   $cmd                - Command prefix for errros
589
#                   $path               - Path to test
590
#                   $mode               - True: Read in immediate data
591
#
592
# Returns         : True  : Path found
593
#                   False : Path is non-existent in revision
594
#
595
#                   May populate @RESULT_LIST with 'immediate' data
596
#
597
sub SvnTestPath
598
{
599
    my $self = shift;
600
    my ($cmd, $path, $mode) = @_;
601
    my $depth = $mode ? 'immediates' : 'empty';
602
    Debug ("SvnTestPath", @_);
603
 
604
    #
605
    #   Read in the directory information - but no data
606
    #
607
    if ( SvnCmd ( $self, 'list', $path
608
                        , '--depth', $depth
609
                        , {'credentials' => 1,}
610
                        ))
611
    {
612
        #
613
        #   Error occurred
614
        #   If the path does not exist then this is an error that
369 dpurdie 615
        #   we can handle. The path does not exist in the Repository
267 dpurdie 616
        #
617
        return 0
618
            if (    $self->{ERROR_LIST}[0] =~ m~' non-existent in that revision$~
369 dpurdie 619
                 || $self->{ERROR_LIST}[0] =~ m~' non-existent in revision ~
267 dpurdie 620
                 || $self->{ERROR_LIST}[0] =~ m~: No repository found in '~
621
                 || $self->{ERROR_LIST}[0] =~ m~: Error resolving case of '~
622
                );
623
 
624
        Error ("$cmd: Unexpected error", @{$self->{ERROR_LIST}});
625
    }
626
    return 1;
627
}
628
 
629
#-------------------------------------------------------------------------------
630
# Function        : CalcRmReference
631
#
632
# Description     : Determine the Release Manager Reference for a SVN
633
#                   operation
634
#
635
# Inputs          : $self                   - Instance data
636
#                   $target                 - target
637
#                   $self->{REVNO}          - Revision number
638
#
639
# Returns         : RMREF - String Reference
640
#
641
sub CalcRmReference
642
{
643
    my ($self, $target) = @_;
644
    Error ("CalcRmReference: No Target") unless ( $target );
353 dpurdie 645
    Debug ("CalcRmReference: $target");
267 dpurdie 646
 
647
    #
353 dpurdie 648
    #   Insert any revision information to create a pegged URL
649
    #
369 dpurdie 650
    my $peg = $self->{REVNO} || $self->{WSREVNO};
651
    $target .= '@' . $peg if $peg;
353 dpurdie 652
 
653
    #
267 dpurdie 654
    #   Take target and remove the reference to the local repository,
655
    #   if its present. This will provide a ref that we can use on any site
656
    #
353 dpurdie 657
    #   Note: %SVN_URLS values will have a trailing '/'
267 dpurdie 658
    #
353 dpurdie 659
    #   Sort in reverse order to ensure that the default URL is found last
660
    #
661
    foreach my $tag ( @SVN_URLS_LIST )
662
    {
663
        if ( $target =~ s~^\Q$SVN_URLS{$tag}\E~$tag/~ )
664
        {
665
            $target =~ s~^/~~;
666
            last;
667
        }
668
    }
267 dpurdie 669
    return $self->{RMREF} = $target;
670
}
671
 
672
#-------------------------------------------------------------------------------
673
# Function        : SvnComment
674
#
675
# Description     : Create a nice SVN comment from a string or an array
676
#
677
# Inputs          : user            - User comment
678
#                   default         - Default comment
679
#
680
#                   Comments may be:
681
#                       1) A string - Simple
682
#                       2) An array
683
#
684
# Returns         : A string comment
685
#
686
sub SvnComment
687
{
688
    my ($user, $default) = @_;
689
 
690
    $user = $default unless ( $user );
691
    return '' unless ( $user );
692
 
693
    my $type = ref $user;
694
    if ( $type eq '' ) {
695
        return $user;
696
 
697
    } elsif ( $type eq 'ARRAY' ) {
698
        return join ("\n", @{$user});
699
 
700
    } else {
701
        Error ("Unknown comment type: $type");
702
    }
703
}
704
 
705
 
706
#-------------------------------------------------------------------------------
707
# Function        : SvnCredentials
708
#
709
# Description     : Return an array of login credentials
710
#                   Used to extend command lines where repository access
711
#                   is required.
712
#
713
#                   There are security implications in using EnvVars
714
#                   to contain passwords. Its best to avoid their use
715
#                   and to let cached authentication from a user-session
716
#                   handle the process.
717
#
718
# Inputs          : None
719
#
720
# Returns         : An array - may be empty
721
#
722
sub SvnCredentials
723
{
724
    my @result;
363 dpurdie 725
    Verbose2 ("SvnCredentials: $::USER");
267 dpurdie 726
    if ( $::GBE_SVN_USERNAME )
727
    {
363 dpurdie 728
        Verbose2 ("SvnCredentials: GBE_SVN_USERNAME : $::GBE_SVN_USERNAME");
729
        Verbose2 ("SvnCredentials: GBE_SVN_PASSWORD : Defined" ) if ($::GBE_SVN_PASSWORD);
730
 
267 dpurdie 731
        push @result, '--no-auth-cache';
732
        push @result, '--username', $::GBE_SVN_USERNAME;
733
        push @result, '--password', $::GBE_SVN_PASSWORD if ($::GBE_SVN_PASSWORD);
734
    }
735
 
736
    return @result;
737
}
738
 
739
#-------------------------------------------------------------------------------
740
# Function        : SvnCmd
741
#
742
# Description     : Run a Subversion Command and capture/process the
743
#                   output
744
#
745
#                   See also SvnUserCmd
746
#
747
# Inputs          : $self           - Instance data
748
#                   Command arguments
749
#                   Last argument may be a hash of options.
750
#                       credentials - Add credentials
751
#                       nosavedata  - Don't save the data
752
#                       process     - Callback function
753
#                       error       - Error Message
754
#                                     Used as first line of an Error call
755
#
756
# Returns         : non-zero on errors detected
757
#
758
sub SvnCmd
759
{
760
    my $self = shift;
761
    Debug ("SvnCmd");
762
 
763
    #
764
    #   Extract arguments and options
765
    #   If last argument is a hesh, then its a hash of options
766
    #
767
    my $opt;
768
    $opt = pop @_
769
        if (@_ > 0 and UNIVERSAL::isa($_[-1],'HASH'));
770
 
771
    #
772
    #   All commands are non-interactive, prepend argument
367 dpurdie 773
    #   Accept serve certs. Only applies to https connections. VisualSvn
774
    #   perfers https and it uses self-signed certificates.
267 dpurdie 775
    #
367 dpurdie 776
    unshift @_, '--non-interactive', '--trust-server-cert';
267 dpurdie 777
    Verbose2 "SvnCmd $svn @_";
778
 
779
    #
780
    #   Prepend credentials, but don't show to users
781
    #
782
    unshift @_, SvnCredentials() if ( $opt->{'credentials'} );
783
 
784
    #
785
    # Useful debugging
786
    #
787
    # $self->{LAST_CMD} = [$svn, @_];
788
 
789
    #
790
    #   Reset command output data
791
    #
792
    $self->{ERROR_LIST} = [];
793
    $self->{RESULT_LIST} = [];
794
 
795
    #
271 dpurdie 796
    #   Make use of a wrapper program to mux the STDERR and STDOUT into
797
    #   one stream (STDOUT). #   This solves a lot of problems
798
    #
267 dpurdie 799
    #   Do not use IO redirection of STDERR because as this will cause a
800
    #   shell (sh or cmd.exe) to be invoked and this makes it much
271 dpurdie 801
    #   harder to kill on all platforms.
267 dpurdie 802
    #
803
    #   Use open3 as it allows the arguments to be passed
804
    #   directly without escaping and without any shell in the way
805
    #
271 dpurdie 806
    local (*CHLD_OUT, *CHLD_IN);
807
    my $pid = open3( \*CHLD_IN, \*CHLD_OUT, '>&STDERR', $stdmux, $svn, @_);
267 dpurdie 808
 
809
    #
810
    #   Looks as though we always get a PID - even if the process dies
811
    #   straight away or can't be found. I suspect that open3 doesn't set
812
    #   $! anyway. I know it doesn't set $?
813
    #
814
    Debug ("Pid: $pid");
815
    Error ("Can't run command: $!") unless $pid;
816
 
817
    #
818
    #   Close the input handle
819
    #   We don't have anything to send to this program
820
    #
821
    close(CHLD_IN);
822
 
823
    #
824
    #   Monitor the output from the utility
271 dpurdie 825
    #   Have used stdmux to multiplex stdout and stderr
267 dpurdie 826
    #
827
    #   Note: IO::Select doesn't work on Windows :(
271 dpurdie 828
    #   Note: Open3 will cause blocking unless both streams are read
829
    #         Can read both streams becsue IO::Select doesn't work
267 dpurdie 830
    #
831
    #   Observation:
832
    #       svn puts errors to STDERR
833
    #       svn puts status to STDOUT
834
    #
835
    while (<CHLD_OUT>)
836
    {
837
        s~\s+$~~;
838
        tr~\\/~/~;
839
 
379 dpurdie 840
 
271 dpurdie 841
        Verbose3 ( "SvnCmd:" . $_);
842
        m~^STD(...):(.+)~;
843
        my $data = $1 ? $2 : $_;
844
        next unless ( $data );
845
 
846
        if ( $1 && $1 eq 'ERR' )
267 dpurdie 847
        {
271 dpurdie 848
            #
849
            #   Process STDERR output
850
            #
851
            push @{$self->{ERROR_LIST}}, $data;
267 dpurdie 852
        }
271 dpurdie 853
        else
854
        {
855
            #
856
            #   Process STDOUT data
857
            #
858
            push @{$self->{RESULT_LIST}}, $data unless ($opt->{'nosavedata'});
859
 
860
            #
861
            #   If the user has specified a processing function then pass each
862
            #   line to the specified function.  A non-zero return will
863
            #   be taken as a signal to kill the command.
864
            #
865
            if ( exists ($opt->{'process'}) && $opt->{'process'}($self, $data) )
866
            {
867
                kill 9, $pid;
868
                last;
869
            }
870
        }
267 dpurdie 871
    }
872
 
873
    close(CHLD_OUT);
874
 
875
    #
876
    #   MUST wait for the process
877
    #   Under Windows if this is not done then we eventually fill up some
878
    #   perl-internal structure and can't spawn anymore processes.
879
    #
880
    my $rv = waitpid ( $pid, 0);
881
 
882
    #
883
    #   If an error condition was detected and the user has provided
884
    #   an error message, then display the error
885
    #
886
    #   This simplifies the user error processing
887
    #
888
    if ( @{$self->{ERROR_LIST}} && $opt->{'error'}  )
889
    {
890
        Error ( $opt->{'error'}, @{$self->{ERROR_LIST}} );
891
    }
892
 
893
    #
894
    #   Exit status has no meaning since open3 has been used
895
    #   This is because perl does not treat the opened process as a child
896
    #   Not too sure it makes any difference anyway
897
    #
898
    #
899
    Debug ("Useless Exit Status: $rv");
900
    my $result = @{$self->{ERROR_LIST}} ? 1 : 0;
901
    Verbose3 ("Exit Code: $result");
902
 
903
    return $result;
904
}
905
 
271 dpurdie 906
 
267 dpurdie 907
#-------------------------------------------------------------------------------
908
# Function        : SvnUserCmd
909
#
910
# Description     : Run a Subversion Command for interactive user
911
#                   Intended to be used interactive
912
#                   No data captured or processed
913
#                   See also SvnCmd
914
#
915
# Inputs          : Command arguments
916
#                   Last argument may be a hash of options.
917
#                       credentials - Add credentials
918
#
919
# Returns         : Result code of the SVN command
920
#
921
sub SvnUserCmd
922
{
923
    #
924
    #   Extract arguments and options
925
    #   If last argument is a hesh, then its a hash of options
926
    #
927
    my $opt;
928
    $opt = pop @_
929
        if (@_ > 0 and UNIVERSAL::isa($_[-1],'HASH'));
930
 
931
    Verbose2 "SvnUserCmd $svn @_";
365 dpurdie 932
 
267 dpurdie 933
    #
365 dpurdie 934
    #   Delayed error reporting
935
    #   Allows the the package to be used when SVN is not installed
936
    #   as long as we don't want to use any of the features
937
    #
938
    #   Think of 'help' when svn is not yet installed
939
    #
940
    Error ("The JATS stdmux utility cannot be found" ) unless ( $stdmux );
941
    Error ("The svn utility cannot be found", "Configured Path: $::GBE_SVN_PATH") unless ( $svn );
942
 
943
    #
267 dpurdie 944
    #   Prepend credentials, but don't show to users
945
    #
946
    unshift @_, SvnCredentials() if ( $opt->{'credentials'} );
947
 
948
 
949
    #
950
    #   Run the command
951
    #
952
    my $rv = system( $svn, @_ );
953
    Verbose2 "System Result Code: $rv";
954
    Verbose2 "System Result Code: $!" if ($rv);
955
 
956
     return $rv / 256;
957
}
958
 
959
#------------------------------------------------------------------------------
960
1;
363 dpurdie 961