diff options
Diffstat (limited to 'Bugzilla/PatchReader/CVSClient.pm')
| -rw-r--r-- | Bugzilla/PatchReader/CVSClient.pm | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/Bugzilla/PatchReader/CVSClient.pm b/Bugzilla/PatchReader/CVSClient.pm index 7a8875dc8..3f2a852f2 100644 --- a/Bugzilla/PatchReader/CVSClient.pm +++ b/Bugzilla/PatchReader/CVSClient.pm @@ -14,37 +14,36 @@ use strict; use warnings; sub parse_cvsroot { - my $cvsroot = $_[0]; - # Format: :method:[user[:password]@]server[:[port]]/path - if ($cvsroot =~ /^:([^:]*):(.*?)(\/.*)$/) { - my %retval; - $retval{protocol} = $1; - $retval{rootdir} = $3; - my $remote = $2; - if ($remote =~ /^(([^\@:]*)(:([^\@]*))?\@)?([^:]*)(:(.*))?$/) { - $retval{user} = $2; - $retval{password} = $4; - $retval{server} = $5; - $retval{port} = $7; - return %retval; - } + my $cvsroot = $_[0]; + + # Format: :method:[user[:password]@]server[:[port]]/path + if ($cvsroot =~ /^:([^:]*):(.*?)(\/.*)$/) { + my %retval; + $retval{protocol} = $1; + $retval{rootdir} = $3; + my $remote = $2; + if ($remote =~ /^(([^\@:]*)(:([^\@]*))?\@)?([^:]*)(:(.*))?$/) { + $retval{user} = $2; + $retval{password} = $4; + $retval{server} = $5; + $retval{port} = $7; + return %retval; } + } - return ( - rootdir => $cvsroot - ); + return (rootdir => $cvsroot); } sub cvs_co { - my ($cvsroot, @files) = @_; - my $cvs = $::cvsbin || "cvs"; - return system($cvs, "-Q", "-d$cvsroot", "co", @files); + my ($cvsroot, @files) = @_; + my $cvs = $::cvsbin || "cvs"; + return system($cvs, "-Q", "-d$cvsroot", "co", @files); } sub cvs_co_rev { - my ($cvsroot, $rev, @files) = @_; - my $cvs = $::cvsbin || "cvs"; - return system($cvs, "-Q", "-d$cvsroot", "co", "-r$rev", @files); + my ($cvsroot, $rev, @files) = @_; + my $cvs = $::cvsbin || "cvs"; + return system($cvs, "-Q", "-d$cvsroot", "co", "-r$rev", @files); } 1 |