test1

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index d4d2ec7a943b7c2fd6639dc25555947e3b5ad467..98c9a5eae8f5a6783bb1f3e289e4230ac707b03d 100644 (file)
--- 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,
                                };
                        }
@@ -427,13 +429,10 @@ sub rcs_notify () { #{{{
        # hooks/post-update to support IkiWiki commits coming from a
        # cloned repository (through command line) because post-update
        # is called _after_ each ref in repository is updated (update
-       # hook is called _before_ the repository is updated).  Since
-       # post-update hook does not accept command line arguments, we
-       # don't have an $ENV variable in this function.
+       # hook is called _before_ the repository is updated).
        #
        # Here, we rely on a simple fact: we can extract all parts of the
-       # notification content by parsing the "HEAD" commit (which also
-       # triggers a refresh of IkiWiki pages).
+       # notification content by parsing the "HEAD" commit.
 
        my $ci = git_commit_info('HEAD');
        return if !defined $ci;