web commit by http://natalian.org/

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index ad829221c7db30304ea5511b5c558ea26128c7a8..9f64b8630dce9c6f8d4f6c08de51ad551fc24c51 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -8,8 +8,6 @@ use open qw{:utf8 :std};
 
 package IkiWiki;
 
-my $origin_branch    = 'origin';            # Git ref for main repository
-my $master_branch    = 'master';            # working branch
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 
@@ -112,8 +110,8 @@ sub _merge_past ($$$) { #{{{
 
                # Switch to throw-away branch for the merge operation.
                push @undo, sub {
-                       if (!run_or_cry('git-checkout', $master_branch)) {
-                               run_or_cry('git-checkout','-f',$master_branch);
+                       if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
+                               run_or_cry('git-checkout','-f',$config{gitmaster_branch});
                        }
                };
                run_or_die('git-checkout', $branch);
@@ -125,7 +123,7 @@ sub _merge_past ($$$) { #{{{
                # _Silently_ commit all modifications in the current branch.
                run_or_non('git-commit', '-m', $message, '-a');
                # ... and re-switch to master.
-               run_or_die('git-checkout', $master_branch);
+               run_or_die('git-checkout', $config{gitmaster_branch});
 
                # Attempt to merge without complaining.
                if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
@@ -146,11 +144,11 @@ sub _merge_past ($$$) { #{{{
        return $conflict;
 } #}}}
 
-sub _parse_diff_tree (@) { #{{{
+sub _parse_diff_tree ($@) { #{{{
        # Parse the raw diff tree chunk and return the info hash.
        # See git-diff-tree(1) for the syntax.
 
-       my ($dt_ref) = @_;
+       my ($prefix, $dt_ref) = @_;
 
        # End of stream?
        return if !defined @{ $dt_ref } ||
@@ -158,16 +156,16 @@ sub _parse_diff_tree (@) { #{{{
 
        my %ci;
        # Header line.
-       HEADER: while (my $line = shift @{ $dt_ref }) {
+       while (my $line = shift @{ $dt_ref }) {
                return if $line !~ m/^(.+) ($sha1_pattern)/;
 
                my $sha1 = $2;
                $ci{'sha1'} = $sha1;
-               last HEADER;
+               last;
        }
 
        # Identification lines for the commit.
-       IDENT: while (my $line = shift @{ $dt_ref }) {
+       while (my $line = shift @{ $dt_ref }) {
                # Regexps are semi-stolen from gitweb.cgi.
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $ci{'tree'} = $1;
@@ -196,7 +194,7 @@ sub _parse_diff_tree (@) { #{{{
                }
                elsif ($line =~ m/^$/) {
                        # Trailing empty line signals next section.
-                       last IDENT;
+                       last;
                }
        }
 
@@ -206,17 +204,17 @@ sub _parse_diff_tree (@) { #{{{
        $ci{'parent'} = @{ $ci{'parents'} }[0] if defined $ci{'parents'};
 
        # Commit message.
-       COMMENT: while (my $line = shift @{ $dt_ref }) {
+       while (my $line = shift @{ $dt_ref }) {
                if ($line =~ m/^$/) {
                        # Trailing empty line signals next section.
-                       last COMMENT;
+                       last;
                };
                $line =~ s/^    //;
                push @{ $ci{'comment'} }, $line;
        }
 
        # Modified files.
-       FILE: while (my $line = shift @{ $dt_ref }) {
+       while (my $line = shift @{ $dt_ref }) {
                if ($line =~ m{^:
                        ([0-7]{6})[ ]      # from mode
                        ([0-7]{6})[ ]      # to mode
@@ -232,6 +230,7 @@ sub _parse_diff_tree (@) { #{{{
                        if ($file =~ m/^"(.*)"$/) {
                                ($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
                        }
+                       $file =~ s/^\Q$prefix\E//;
                        if (length $file) {
                                push @{ $ci{'details'} }, {
                                        'file'      => decode_utf8($file),
@@ -239,9 +238,9 @@ sub _parse_diff_tree (@) { #{{{
                                        'sha1_to'   => $sha1_to,
                                };
                        }
-                       next FILE;
+                       next;
                };
-               last FILE;
+               last;
        }
 
        debug("No detail in diff-tree output") if !defined $ci{'details'};
@@ -258,11 +257,11 @@ sub git_commit_info ($;$) { #{{{
        $num ||= 1;
 
        my @raw_lines =
-           run_or_die(qq{git-rev-list --max-count=$num $sha1 |
-                         git-diff-tree --stdin --pretty=raw --always -M -m -r});
+           run_or_die('git-log', "--max-count=$num", '--pretty=raw', '--raw', '--abbrev=40', '--always', '-m', '-r', $sha1, '--', '.');
+       my ($prefix) = run_or_die('git-rev-parse', '--show-prefix');
 
        my @ci;
-       while (my $parsed = _parse_diff_tree(\@raw_lines)) {
+       while (my $parsed = _parse_diff_tree(($prefix or ""), \@raw_lines)) {
                push @ci, $parsed;
        }
 
@@ -287,7 +286,7 @@ sub git_sha1 (;$) { #{{{
 sub rcs_update () { #{{{
        # Update working directory.
 
-       run_or_cry('git-pull', $origin_branch);
+       run_or_cry('git-pull', $config{gitorigin_branch});
 } #}}}
 
 sub rcs_prepedit ($) { #{{{
@@ -337,7 +336,7 @@ sub rcs_commit ($$$;$$) { #{{{
        $message = possibly_foolish_untaint($message);
        if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
                unlockwiki();
-               run_or_cry('git-push', $origin_branch);
+               run_or_cry('git-push', $config{gitorigin_branch});
        }
 
        return undef; # success
@@ -360,11 +359,11 @@ sub rcs_recentchanges ($) { #{{{
        error($@) if $@;
 
        my @rets;
-       INFO: foreach my $ci (git_commit_info('HEAD', $num)) {
+       foreach my $ci (git_commit_info('HEAD', $num)) {
                my $title = @{ $ci->{'comment'} }[0];
 
                # Skip redundant commits.
-               next INFO if ($title eq $dummy_commit_msg);
+               next if ($title eq $dummy_commit_msg);
 
                my ($sha1, $when) = (
                        $ci->{'sha1'},
@@ -372,7 +371,7 @@ sub rcs_recentchanges ($) { #{{{
                );
 
                my (@pages, @messages);
-               DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
+               foreach my $detail (@{ $ci->{'details'} }) {
                        my $diffurl = $config{'diffurl'};
                        my $file    = $detail->{'file'};
 
@@ -409,7 +408,7 @@ sub rcs_recentchanges ($) { #{{{
                        pages      => [@pages],
                };
 
-               last INFO if @rets >= $num;
+               last if @rets >= $num;
        }
 
        return @rets;