kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

archimport: safer log file parsing 

Better logfile parsing, no longer confused by 'headers' after the first
blank line.

Re-enabled tag-reading with abrowse (baz and tla compatible)

Remove need to quote args to external processes

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
maint
Eric Wong 2005-11-23 23:53:55 -08:00 committed by Martin Langhoff
parent 42f44b08bc
commit 6df896b50a
1 changed files with 110 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
git-archimport.perl
View File

@ -140,10 +140,10 @@ sub do_abrowse {
$ps{type} = 's'; $ps{type} = 's';
} elsif ($type =~ /\(.*import\)/) { } elsif ($type =~ /\(.*import\)/) {
$ps{type} = 'i'; $ps{type} = 'i';
} elsif ($type =~ m/\(tag.*\)/) { } elsif ($type =~ m/\(tag.*?(\S+\@\S+).*?\)/) {
$ps{type} = 't'; $ps{type} = 't';
# read which revision we've tagged when we parse the log # read which revision we've tagged when we parse the log
#$ps{tag} = $1; $ps{tag} = $1;
} else { } else {
warn "Unknown type $type"; warn "Unknown type $type";
} }
@ -359,78 +359,73 @@ foreach my $ps (@psets) {
# #
my $tree; my $tree;
my $commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id}); my @commitlog = safe_pipe_capture($TLA,'cat-archive-log',$ps->{id});
die "Error in cat-archive-log: $!" if $?; die "Error in cat-archive-log: $!" if $?;
# parselog will git-add/rm files parselog($ps,\@commitlog);
# and generally prepare things for the commit
# NOTE: parselog will shell-quote filenames!
my ($sum, $msg, $add, $del, $mod, $ren) = parselog($commitlog);
my $logmessage = "$sum\n$msg";



# imports don't give us good info # imports don't give us good info
# on added files. Shame on them # on added files. Shame on them
if ($ps->{type} eq 'i' || $ps->{type} eq 't') { if ($ps->{type} eq 'i' || $ps->{type} eq 't') {
`find . -type f -print0 | grep -zv '^./$git_dir' | xargs -0 -l100 git-update-index --add`; system('git-ls-files --others -z | '.
`git-ls-files --deleted -z | xargs --no-run-if-empty -0 -l100 git-update-index --remove`; 'git-update-index --add -z --stdin') == 0 or die "$! $?\n";
system('git-ls-files --deleted -z | '.
'git-update-index --remove -z --stdin') == 0 or die "$! $?\n";
} }


if (@$add) { # TODO: handle removed_directories and renamed_directories:
if (my $add = $ps->{new_files}) {
while (@$add) { while (@$add) {
my @slice = splice(@$add, 0, 100); my @slice = splice(@$add, 0, 100);
my $slice = join(' ', @slice); system('git-update-index','--add','--',@slice) == 0 or
`git-update-index --add $slice`; die "Error in git-update-index --add: $! $?\n";
die "Error in git-update-index --add: $!" if $?;
} }
} }
if (@$del) {
foreach my $file (@$del) { if (my $del = $ps->{removed_files}) {
unlink $file or die "Problems deleting $file : $!"; unlink @$del;
}
while (@$del) { while (@$del) {
my @slice = splice(@$del, 0, 100); my @slice = splice(@$del, 0, 100);
my $slice = join(' ', @slice); system('git-update-index','--remove','--',@slice) == 0 or
`git-update-index --remove $slice`; die "Error in git-update-index --remove: $! $?\n";
die "Error in git-update-index --remove: $!" if $?;
} }
} }
if (@$ren) { # renamed
if (my $ren = $ps->{renamed_files}) { # renamed
if (@$ren % 2) { if (@$ren % 2) {
die "Odd number of entries in rename!?"; die "Odd number of entries in rename!?";
} }
;
while (@$ren) { while (@$ren) {
my $from = pop @$ren; my $from = shift @$ren;
my $to = pop @$ren; my $to = shift @$ren;


unless (-d dirname($to)) { unless (-d dirname($to)) {
mkpath(dirname($to)); # will die on err mkpath(dirname($to)); # will die on err
} }
#print "moving $from $to"; print "moving $from $to";
`mv $from $to`; rename($from, $to) or die "Error renaming '$from' '$to': $!\n";
die "Error renaming $from $to : $!" if $?; system('git-update-index','--remove','--',$from) == 0 or
`git-update-index --remove $from`; die "Error in git-update-index --remove: $! $?\n";
die "Error in git-update-index --remove: $!" if $?; system('git-update-index','--add','--',$to) == 0 or
`git-update-index --add $to`; die "Error in git-update-index --add: $! $?\n";
die "Error in git-update-index --add: $!" if $?;
} }


} }
if (@$mod) { # must be _after_ renames
if (my $mod = $ps->{modified_files}) {
while (@$mod) { while (@$mod) {
my @slice = splice(@$mod, 0, 100); my @slice = splice(@$mod, 0, 100);
my $slice = join(' ', @slice); system('git-update-index','--',@slice) == 0 or
`git-update-index $slice`; die "Error in git-update-index: $! $?\n";
die "Error in git-update-index: $!" if $?;
} }
} }

# warn "errors when running git-update-index! $!"; # warn "errors when running git-update-index! $!";
$tree = `git-write-tree`; $tree = `git-write-tree`;
die "cannot write tree $!" if $?; die "cannot write tree $!" if $?;
chomp $tree; chomp $tree;
# #
# Who's your daddy? # Who's your daddy?
@ -464,13 +459,14 @@ foreach my $ps (@psets) {
$ENV{GIT_COMMITTER_EMAIL} = $ps->{email}; $ENV{GIT_COMMITTER_EMAIL} = $ps->{email};
$ENV{GIT_COMMITTER_DATE} = $ps->{date}; $ENV{GIT_COMMITTER_DATE} = $ps->{date};


my ($pid, $commit_rh, $commit_wh); my $pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
$commit_rh = 'commit_rh';
$commit_wh = 'commit_wh';
$pid = open2(*READER, *WRITER,'git-commit-tree',$tree,@par)
or die $!; or die $!;
print WRITER $logmessage; # write print WRITER $ps->{summary},"\n";
print WRITER $ps->{message},"\n";
# make it easy to backtrack and figure out which Arch revision this was:
print WRITER 'git-archimport-id: ',$ps->{id},"\n";
close WRITER; close WRITER;
my $commitid = <READER>; # read my $commitid = <READER>; # read
chomp $commitid; chomp $commitid;
@ -568,7 +564,9 @@ sub apply_cset {




# =for reference # =for reference
# A log entry looks like # notes: *-files/-directories keys cannot have spaces, they're always
# pika-escaped. Everything after the first newline
# A log entry looks like:
# Revision: moodle-org--moodle--1.3.3--patch-15 # Revision: moodle-org--moodle--1.3.3--patch-15
# Archive: arch-eduforge@catalyst.net.nz--2004 # Archive: arch-eduforge@catalyst.net.nz--2004
# Creator: Penny Leach <penny@catalyst.net.nz> # Creator: Penny Leach <penny@catalyst.net.nz>
@ -586,70 +584,85 @@ sub apply_cset {
# admin/editor.html backup/lib.php backup/restore.php # admin/editor.html backup/lib.php backup/restore.php
# New-patches: arch-eduforge@catalyst.net.nz--2004/moodle-org--moodle--1.3.3--patch-15 # New-patches: arch-eduforge@catalyst.net.nz--2004/moodle-org--moodle--1.3.3--patch-15
# Summary: Updating to latest from MOODLE_14_STABLE (1.4.5+) # Summary: Updating to latest from MOODLE_14_STABLE (1.4.5+)
# summary can be multiline with a leading space just like the above fields
# Keywords: # Keywords:
# #
# Updating yadda tadda tadda madda # Updating yadda tadda tadda madda
sub parselog { sub parselog {
my $log = shift; my ($ps, $log) = @_;
#print $log; my $key = undef;


my (@add, @del, @mod, @ren, @kw, $sum, $msg ); # headers we want that contain filenames:

my %want_headers = (
if ($log =~ m/(?:\n|^)New-files:(.*?)(?=\n\w)/s ) { new_files => 1,
my $files = $1; modified_files => 1,
@add = split(m/\s+/s, $files); renamed_files => 1,
} renamed_directories => 1,
removed_files => 1,
if ($log =~ m/(?:\n|^)Removed-files:(.*?)(?=\n\w)/s ) { removed_directories => 1,
my $files = $1; );
@del = split(m/\s+/s, $files);
}
if ($log =~ m/(?:\n|^)Modified-files:(.*?)(?=\n\w)/s ) { chomp (@$log);
my $files = $1; while ($_ = shift @$log) {
@mod = split(m/\s+/s, $files); if (/^Continuation-of:\s*(.*)/) {
$ps->{tag} = $1;
$key = undef;
} elsif (/^Summary:\s*(.*)$/ ) {
# summary can be multiline as long as it has a leading space
$ps->{summary} = [ $1 ];
$key = 'summary';
} elsif (/^Creator: (.*)\s*<([^\>]+)>/) {
$ps->{author} = $1;
$ps->{email} = $2;
$key = undef;
# any *-files or *-directories can be read here:
} elsif (/^([A-Z][a-z\-]+):\s*(.*)$/) {
my $val = $2;
$key = lc $1;
$key =~ tr/-/_/; # too lazy to quote :P
if ($want_headers{$key}) {
push @{$ps->{$key}}, split(/\s+/, $val);
} else {
$key = undef;
}
} elsif (/^$/) {
last; # remainder of @$log that didn't get shifted off is message
} elsif ($key) {
if (/^\s+(.*)$/) {
if ($key eq 'summary') {
push @{$ps->{$key}}, $1;
} else { # files/directories:
push @{$ps->{$key}}, split(/\s+/, $1);
}
} else {
$key = undef;
}
}
} }
# post-processing:
$ps->{summary} = join("\n",@{$ps->{summary}})."\n";
$ps->{message} = join("\n",@$log);
if ($log =~ m/(?:\n|^)Renamed-files:(.*?)(?=\n\w)/s ) { # skip Arch control files, unescape pika-escaped files
my $files = $1; foreach my $k (keys %want_headers) {
@ren = split(m/\s+/s, $files); next unless (defined $ps->{$k});
} my @tmp;

foreach my $t (@{$ps->{$k}}) {
$sum =''; next unless length ($t);
if ($log =~ m/^Summary:(.+?)$/m ) { next if $t =~ m!\{arch\}/!;
$sum = $1; next if $t =~ m!\.arch-ids/!;
$sum =~ s/^\s+//; # should we skip this?
$sum =~ s/\s+$//; next if $t =~ m!\.arch-inventory$!;
}

$msg = '';
if ($log =~ m/\n\n(.+)$/s) {
$msg = $1;
$msg =~ s/^\s+//;
$msg =~ s/\s+$//;
}


# cleanup the arrays
foreach my $ref ( (\@add, \@del, \@mod, \@ren) ) {
my @tmp = ();
while (my $t = pop @$ref) {
next unless length ($t);
next if $t =~ m!\{arch\}/!;
next if $t =~ m!\.arch-ids/!;
next if $t =~ m!\.arch-inventory$!;
# tla cat-archive-log will give us filenames with spaces as file\(sp)name - why? # tla cat-archive-log will give us filenames with spaces as file\(sp)name - why?
# we can assume that any filename with \ indicates some pika escaping that we want to get rid of. # we can assume that any filename with \ indicates some pika escaping that we want to get rid of.
if ($t =~ /\\/ ){ if ($t =~ /\\/ ){
$t = (safe_pipe_capture($TLA,'escape','--unescaped',$t))[0]; $t = (safe_pipe_capture($TLA,'escape','--unescaped',$t))[0];
} }
push (@tmp, $t); push @tmp, $t;
} }
@$ref = @tmp; $ps->{$k} = \@tmp if scalar @tmp;
} }
#print Dumper [$sum, $msg, \@add, \@del, \@mod, \@ren];
return ($sum, $msg, \@add, \@del, \@mod, \@ren);
} }


# write/read a tag # write/read a tag