git-svn: remove any need for the XML::Simple dependency
XML::Simple was originally required back when I made svn-arch-mirror because I needed to explictly track renames with Arch. Then I carried it over to git-svn because I was afraid somebody could commit an svn log message that could throw off a non-XML log parser. Then I noticed the <n> lines column in the header. So, no more XML :) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Feb 20, 2006 at 10:57 UTC
ce6f35190360ef8b8c3611eea61a82fb18b50c6c
1 file changed
+35
-49
contrib/git-svn/git-svn
+35
-49
@@ -21,7 +21,7 @@ $ENV{LC_ALL} = 'C';
21
22
# If SVN:: library support is added, please make the dependencies
23
# optional and preserve the capability to use the command-line client.
24
-# See what I do with XML::Simple to make the dependency optional.
24
+# use eval { require SVN::... } to make it lazy load
25
use Carp qw/croak/;
26
use IO::File qw//;
27
use File::Basename qw/dirname basename/;
@@ -177,8 +177,7 @@ sub fetch {
177
push @log_args, "-r$_revision";
178
push @log_args, '--stop-on-copy' unless $_no_stop_copy;
179
180
- eval { require XML::Simple or croak $! };
181
- my $svn_log = $@ ? svn_log_raw(@log_args) : svn_log_xml(@log_args);
180
+ my $svn_log = svn_log_raw(@log_args);
181
@$svn_log = sort { $a->{revision} <=> $b->{revision} } @$svn_log;
182
183
my $base = shift @$svn_log or croak "No base revision!\n";
@@ -476,49 +475,6 @@ sub svn_commit_tree {
475
return fetch("$rev_committed=$commit")->{revision};
476
}
477
479
-sub svn_log_xml {
480
- my (@log_args) = @_;
481
- my $log_fh = IO::File->new_tmpfile or croak $!;
482
-
483
- my $pid = fork;
484
- defined $pid or croak $!;
485
-
486
- if ($pid == 0) {
487
- open STDOUT, '>&', $log_fh or croak $!;
488
- exec (qw(svn log --xml), @log_args) or croak $!
489
- }
490
-
491
- waitpid $pid, 0;
492
- croak $? if $?;
493
-
494
- seek $log_fh, 0, 0;
495
- my @svn_log;
496
- my $log = XML::Simple::XMLin( $log_fh,
497
- ForceArray => ['path','revision','logentry'],
498
- KeepRoot => 0,
499
- KeyAttr => { logentry => '+revision',
500
- paths => '+path' },
501
- )->{logentry};
502
- foreach my $r (sort {$a <=> $b} keys %$log) {
503
- my $log_msg = $log->{$r};
504
- my ($Y,$m,$d,$H,$M,$S) = ($log_msg->{date} =~
505
- /(\d{4})\-(\d\d)\-(\d\d)T
506
- (\d\d)\:(\d\d)\:(\d\d)\.\d+Z$/x)
507
- or croak "Failed to parse date: ",
508
- $log->{$r}->{date};
509
- $log_msg->{date} = "+0000 $Y-$m-$d $H:$M:$S";
510
-
511
- # XML::Simple can't handle <msg></msg> as a string:
512
- if (ref $log_msg->{msg} eq 'HASH') {
513
- $log_msg->{msg} = "\n";
514
- } else {
515
- $log_msg->{msg} .= "\n";
516
- }
517
- push @svn_log, $log->{$r};
518
- }
519
- return \@svn_log;
520
-}
521
-
478
sub svn_log_raw {
479
my (@log_args) = @_;
480
my $pid = open my $log_fh,'-|';
@@ -529,21 +485,42 @@ sub svn_log_raw {
485
}
486
487
my @svn_log;
532
- my $state;
488
+ my $state = 'sep';
489
while (<$log_fh>) {
490
chomp;
491
if (/^\-{72}$/) {
492
+ if ($state eq 'msg') {
493
+ if ($svn_log[$#svn_log]->{lines}) {
494
+ $svn_log[$#svn_log]->{msg} .= $_."\n";
495
+ unless(--$svn_log[$#svn_log]->{lines}) {
496
+ $state = 'sep';
497
+ }
498
+ } else {
499
+ croak "Log parse error at: $_\n",
500
+ $svn_log[$#svn_log]->{revision},
501
+ "\n";
502
+ }
503
+ next;
504
+ }
505
+ if ($state ne 'sep') {
506
+ croak "Log parse error at: $_\n",
507
+ "state: $state\n",
508
+ $svn_log[$#svn_log]->{revision},
509
+ "\n";
510
+ }
511
$state = 'rev';
512
513
# if we have an empty log message, put something there:
514
if (@svn_log) {
515
$svn_log[$#svn_log]->{msg} ||= "\n";
516
+ delete $svn_log[$#svn_log]->{lines};
517
}
518
next;
519
}
520
if ($state eq 'rev' && s/^r(\d+)\s*\|\s*//) {
521
my $rev = $1;
546
- my ($author, $date) = split(/\s*\|\s*/, $_, 2);
522
+ my ($author, $date, $lines) = split(/\s*\|\s*/, $_, 3);
523
+ ($lines) = ($lines =~ /(\d+)/);
524
my ($Y,$m,$d,$H,$M,$S,$tz) = ($date =~
525
/(\d{4})\-(\d\d)\-(\d\d)\s
526
(\d\d)\:(\d\d)\:(\d\d)\s([\-\+]\d+)/x)
@@ -551,6 +528,7 @@ sub svn_log_raw {
528
my %log_msg = ( revision => $rev,
529
date => "$tz $Y-$m-$d $H:$M:$S",
530
author => $author,
531
+ lines => $lines,
532
msg => '' );
533
push @svn_log, \%log_msg;
534
$state = 'msg_start';
@@ -560,7 +538,15 @@ sub svn_log_raw {
538
if ($state eq 'msg_start' && /^$/) {
539
$state = 'msg';
540
} elsif ($state eq 'msg') {
563
- $svn_log[$#svn_log]->{msg} .= $_."\n";
541
+ if ($svn_log[$#svn_log]->{lines}) {
542
+ $svn_log[$#svn_log]->{msg} .= $_."\n";
543
+ unless (--$svn_log[$#svn_log]->{lines}) {
544
+ $state = 'sep';
545
+ }
546
+ } else {
547
+ croak "Log parse error at: $_\n",
548
+ $svn_log[$#svn_log]->{revision},"\n";
549
+ }
550
}
551
}
552
close $log_fh or croak $?;