X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7144514b9390c090778d9767192facaa73b56ec1..2a6e353c205a6c2c8b8e2eaf85fe9c585c1af0cd:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 8db83233d..84e7d74e5 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -23,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}: $!");
@@ -40,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);
 }
@@ -144,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 } ||
@@ -182,7 +180,7 @@ 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;
@@ -230,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),
@@ -255,11 +254,13 @@ sub git_commit_info ($;$) { #{{{
 
 	$num ||= 1;
 
-	my @raw_lines =
-	    run_or_die('git-log', "--max-count=$num", '--pretty=raw', '--raw', '--abbrev=40', '--always', '-M', '-m', '-r', $sha1);
+	my @raw_lines = 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;
 	}
 
@@ -284,7 +285,9 @@ sub git_sha1 (;$) { #{{{
 sub rcs_update () { #{{{
 	# Update working directory.
 
-	run_or_cry('git-pull', $config{gitorigin_branch});
+	if (length $config{gitorigin_branch}) {
+		run_or_cry('git-pull', $config{gitorigin_branch});
+	}
 } #}}}
 
 sub rcs_prepedit ($) { #{{{
@@ -332,9 +335,11 @@ sub rcs_commit ($$$;$$) { #{{{
 	# git-commit(1) returns non-zero if file has not been really changed.
 	# so we should ignore its exit status (hence run_or_non).
 	$message = possibly_foolish_untaint($message);
-	if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
+	if (run_or_non('git-commit', '-q', '-m', $message, '-i', $file)) {
 		unlockwiki();
-		run_or_cry('git-push', $config{gitorigin_branch});
+		if (length $config{gitorigin_branch}) {
+			run_or_cry('git-push', $config{gitorigin_branch});
+		}
 	}
 
 	return undef; # success
@@ -370,9 +375,9 @@ sub rcs_recentchanges ($) { #{{{
 
 		my (@pages, @messages);
 		foreach my $detail (@{ $ci->{'details'} }) {
-			my $diffurl = $config{'diffurl'};
-			my $file    = $detail->{'file'};
+			my $file = $detail->{'file'};
 
+			my $diffurl = $config{'diffurl'};
 			$diffurl =~ s/\[\[file\]\]/$file/go;
 			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
 			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
@@ -458,14 +463,14 @@ sub rcs_notify () { #{{{
 } #}}}
 
 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;
 } #}}}