X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c8a59c1c10d1c936bf65d81144e096d98d7a053a..a22d9f9721f89111cba2efbd2b795e3edfcb08b8:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index ce2384897..3407354c9 100644
--- 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
 
@@ -25,8 +23,6 @@ sub _safe_git (&@) { #{{{
 
 	if (!$pid) {
 		# In child.
-		open STDERR, ">&STDOUT"
-		    or error("Cannot dup STDOUT: $!");
 		# Git commands want to be in wc.
 		chdir $config{srcdir}
 		    or error("Cannot chdir to $config{srcdir}: $!");
@@ -42,7 +38,7 @@ sub _safe_git (&@) { #{{{
 
 	close $OUT;
 
-	($error_handler || sub { })->("'@cmdline' failed: $!") if $?;
+	$error_handler->("'@cmdline' failed: $!") if $? && $error_handler;
 
 	return wantarray ? @lines : ($? == 0);
 }
@@ -112,8 +108,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 +121,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 +142,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,23 +154,25 @@ 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;
-		} elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
+		}
+		elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
 			# XXX: collecting in reverse order
 			push @{ $ci{'parents'} }, $1;
-		} elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
+		}
+		elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
 			my ($who, $name, $epoch, $tz) =
 			   ($1,   $2,    $3,     $4 );
 
@@ -182,17 +180,19 @@ sub _parse_diff_tree (@) { #{{{
 			$ci{ "${who}_epoch" } = $epoch;
 			$ci{ "${who}_tz"    } = $tz;
 
-			if ($name =~ m/^([^<]+) <([^@]+)/) {
+			if ($name =~ m/^([^<]+) <([^@>]+)/) {
 				my ($fullname, $username) = ($1, $2);
 				$ci{"${who}_fullname"}    = $fullname;
 				$ci{"${who}_username"}    = $username;
-			} else {
+			}
+			else {
 				$ci{"${who}_fullname"} =
 					$ci{"${who}_username"} = $name;
 			}
-		} elsif ($line =~ m/^$/) {
+		}
+		elsif ($line =~ m/^$/) {
 			# Trailing empty line signals next section.
-			last IDENT;
+			last;
 		}
 	}
 
@@ -202,17 +202,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
@@ -228,6 +228,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),
@@ -235,9 +236,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'};
@@ -254,11 +255,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;
 	}
 
@@ -283,7 +284,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 ($) { #{{{
@@ -303,10 +304,12 @@ sub rcs_commit ($$$;$$) { #{{{
 	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
 	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
+		$message = "web commit by $user" .
+		    (length $message ? ": $message" : "");
 	}
 	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+		$message = "web commit from $ipaddr" .
+		    (length $message ? ": $message" : "");
 	}
 
 	# XXX: Wiki directory is in the unlocked state when starting this
@@ -331,7 +334,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
@@ -354,11 +357,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'},
@@ -366,7 +369,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'};
 
@@ -386,9 +389,10 @@ sub rcs_recentchanges ($) { #{{{
 
 		if (defined $messages[0] &&
 		    $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
-			$user=defined $2 ? "$2" : "$3";
-			$messages[0]->{line}=$4;
-		} else {
+			$user = defined $2 ? "$2" : "$3";
+			$messages[0]->{line} = $4;
+		}
+		else {
 			$type ="git";
 			$user = $ci->{'author_username'};
 		}
@@ -402,7 +406,7 @@ sub rcs_recentchanges ($) { #{{{
 			pages      => [@pages],
 		};
 
-		last INFO if @rets >= $num;
+		last if @rets >= $num;
 	}
 
 	return @rets;
@@ -436,7 +440,8 @@ sub rcs_notify () { #{{{
 	if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
 		$user    = defined $2 ? "$2" : "$3";
 		$message = $4;
-	} else {
+	}
+	else {
 		$user    = $ci->{'author_username'};
 		$message = join "\n", @{ $ci->{'comment'} };
 	}
@@ -448,18 +453,19 @@ sub rcs_notify () { #{{{
 		},
 		sub {
 			join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
-		}, $user, @changed_pages);
+		}, $user, @changed_pages
+	);
 } #}}}
 
 sub rcs_getctime ($) { #{{{
-	# Get the ctime of file.
-
-	my ($file) = @_;
+	my $file=shift;
+	# Remove srcdir prefix
+	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
 	my $sha1  = git_sha1($file);
 	my $ci    = git_commit_info($sha1);
 	my $ctime = $ci->{'author_epoch'};
-	debug("ctime for '$file': ". localtime($ctime) . "\n");
+	debug("ctime for '$file': ". localtime($ctime));
 
 	return $ctime;
 } #}}}