diff options
| author | Brian Downing <bdowning@lavos.net> | 2008-01-17 06:42:34 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-17 11:15:23 -0500 |
| commit | 6d85ccdb6f1bb6e97a2815d059850a2cc2f8e93b (patch) | |
| tree | c7dadabbe173f149fca84afb1d88923236cf8f20 | |
| parent | 06bd32f9dad90233a0882f114bcc2099a2d50bb6 (diff) | |
Add full parser for git diff-tree output
The -c option to git log/diff-tree produces "merged" diffs with a
different format from normal ones. However, the existing diff-tree
parser only accepted non-merged diff lines. Merged diff lines caused
the parser to get out of sync. This patch adds a full parser for diffs
with any number of parents. See the "DIFF FORMAT FOR MERGES" section in
the git-diff-tree man page for more information.
Signed-off-by: Brian Downing <bdowning@lavos.net>
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index d4d2ec7a9..fea1c11eb 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -217,17 +217,19 @@ sub _parse_diff_tree ($@) { #{{{ # Modified files. while (my $line = shift @{ $dt_ref }) { - if ($line =~ m{^: - ([0-7]{6})[ ] # from mode - ([0-7]{6})[ ] # to mode - ($sha1_pattern)[ ] # from sha1 - ($sha1_pattern)[ ] # to sha1 - (.) # status - ([0-9]{0,3})\t # similarity - (.*) # file + if ($line =~ m{^ + (:+) # number of parents + ([^\t]+)\t # modes, sha1, status + (.*) # file names $}xo) { - my ($sha1_from, $sha1_to, $file) = - ($3, $4, $7 ); + my $num_parents = length $1; + my @tmp = split(" ", $2); + my ($file, $file_to) = split("\t", $3); + my @mode_from = splice(@tmp, 0, $num_parents); + my $mode_to = shift(@tmp); + my @sha1_from = splice(@tmp, 0, $num_parents); + my $sha1_to = shift(@tmp); + my $status = shift(@tmp); if ($file =~ m/^"(.*)"$/) { ($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg; @@ -236,7 +238,7 @@ sub _parse_diff_tree ($@) { #{{{ if (length $file) { push @{ $ci{'details'} }, { 'file' => decode_utf8($file), - 'sha1_from' => $sha1_from, + 'sha1_from' => $sha1_from[0], 'sha1_to' => $sha1_to, }; } |