X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3fd86def96f1f946dfbc1d847b57aeba11428b9b..4c1a4402f92204abee5a9425e74864825799f5d2:/IkiWiki/Rcs/git.pm?ds=sidebyside

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 070bf3208..d4d2ec7a9 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);
 }
@@ -53,7 +51,7 @@ sub run_or_non ($@) { _safe_git(undef,            @_) }
 sub _merge_past ($$$) { #{{{
 	# Unlike with Subversion, Git cannot make a 'svn merge -rN:M file'.
 	# Git merge commands work with the committed changes, except in the
-	# implicit case of '-m' of git-checkout(1).  So we should invent a
+	# implicit case of '-m' of git checkout(1).  So we should invent a
 	# kludge here.  In principle, we need to create a throw-away branch
 	# in preparing for the merge itself.  Since branches are cheap (and
 	# branching is fast), this shouldn't cost high.
@@ -62,7 +60,7 @@ sub _merge_past ($$$) { #{{{
 	# possible approach to get rid of this situation could be that we first
 	# make a temporary commit in the master branch and later restore the
 	# initial state (this is possible since Git has the ability to undo a
-	# commit, i.e. 'git-reset --soft HEAD^').  The method can be summarized
+	# commit, i.e. 'git reset --soft HEAD^').  The method can be summarized
 	# as follows:
 	#
 	# 	- create a diff of HEAD:current-sha1
@@ -105,30 +103,30 @@ sub _merge_past ($$$) { #{{{
 		my $branch = "throw_away_${sha1}"; # supposed to be unique
 
 		# Create a throw-away branch and rewind backward.
-		push @undo, sub { run_or_cry('git-branch', '-D', $branch) };
-		run_or_die('git-branch', $branch, $sha1);
+		push @undo, sub { run_or_cry('git', 'branch', '-D', $branch) };
+		run_or_die('git', 'branch', $branch, $sha1);
 
 		# Switch to throw-away branch for the merge operation.
 		push @undo, sub {
-			if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
-				run_or_cry('git-checkout','-f',$config{gitmaster_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);
+		run_or_die('git', 'checkout', $branch);
 
 		# Put the modified file in _this_ branch.
 		rename($hidden, $target)
 		    or error("rename '$hidden' to '$target' failed: $!");
 
 		# _Silently_ commit all modifications in the current branch.
-		run_or_non('git-commit', '-m', $message, '-a');
+		run_or_non('git', 'commit', '-m', $message, '-a');
 		# ... and re-switch to master.
-		run_or_die('git-checkout', $config{gitmaster_branch});
+		run_or_die('git', 'checkout', $config{gitmaster_branch});
 
 		# Attempt to merge without complaining.
-		if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
+		if (!run_or_non('git', 'pull', '--no-commit', '.', $branch)) {
 			$conflict = readfile($target);
-			run_or_die('git-reset', '--hard');
+			run_or_die('git', 'reset', '--hard');
 		}
 	};
 	my $failure = $@;
@@ -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;
@@ -198,10 +196,14 @@ sub _parse_diff_tree ($@) { #{{{
 		}
 	}
 
-	debug("No 'tree' or 'parents' seen in diff-tree output")
-	    if !defined $ci{'tree'} || !defined $ci{'parents'};
+	debug("No 'tree' seen in diff-tree output") if !defined $ci{'tree'};
 
-	$ci{'parent'} = @{ $ci{'parents'} }[0] if defined $ci{'parents'};
+	if (defined $ci{'parents'}) {
+		$ci{'parent'} = @{ $ci{'parents'} }[0];
+	}
+	else {
+		$ci{'parent'} = 0 x 40;
+	}
 
 	# Commit message.
 	while (my $line = shift @{ $dt_ref }) {
@@ -256,9 +258,10 @@ sub git_commit_info ($;$) { #{{{
 
 	$num ||= 1;
 
-	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 @raw_lines = run_or_die('git', 'log', "--max-count=$num", 
+		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
+		'-r', $sha1, '--', '.');
+	my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
 
 	my @ci;
 	while (my $parsed = _parse_diff_tree(($prefix or ""), \@raw_lines)) {
@@ -276,7 +279,7 @@ sub git_sha1 (;$) { #{{{
 	my $file = shift || q{--};
 
 	# Ignore error since a non-existing file might be given.
-	my ($sha1) = run_or_non('git-rev-list', '--max-count=1', 'HEAD', $file);
+	my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file);
 	if ($sha1) {
 		($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
 	} else { debug("Empty sha1sum for '$file'.") }
@@ -286,7 +289,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 ($) { #{{{
@@ -318,7 +323,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	# action.  But it takes time for a Git process to finish its job
 	# (especially if a merge required), so we must re-lock to prevent
 	# race conditions.  Only when the time of the real commit action
-	# (i.e. git-push(1)) comes, we'll unlock the directory.
+	# (i.e. git push) comes, we'll unlock the directory.
 	lockwiki();
 
 	# Check to see if the page has been changed by someone else since
@@ -331,12 +336,14 @@ sub rcs_commit ($$$;$$) { #{{{
 		return $conflict if defined $conflict;
 	}
 
-	# git-commit(1) returns non-zero if file has not been really changed.
+	# git commit 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
@@ -347,7 +354,7 @@ sub rcs_add ($) { # {{{
 
 	my ($file) = @_;
 
-	run_or_cry('git-add', $file);
+	run_or_cry('git', 'add', $file);
 } #}}}
 
 sub rcs_recentchanges ($) { #{{{
@@ -360,10 +367,8 @@ sub rcs_recentchanges ($) { #{{{
 
 	my @rets;
 	foreach my $ci (git_commit_info('HEAD', $num)) {
-		my $title = @{ $ci->{'comment'} }[0];
-
 		# Skip redundant commits.
-		next if ($title eq $dummy_commit_msg);
+		next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);
 
 		my ($sha1, $when) = (
 			$ci->{'sha1'},
@@ -372,9 +377,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;
@@ -385,7 +390,7 @@ sub rcs_recentchanges ($) { #{{{
 				diffurl => $diffurl,
 			};
 		}
-		push @messages, { line => $title };
+		push @messages, { line => $_ } foreach @{$ci->{'comment'}};
 
 		my ($user, $type) = (q{}, "web");
 
@@ -406,7 +411,7 @@ sub rcs_recentchanges ($) { #{{{
 			when       => $when,
 			message    => [@messages],
 			pages      => [@pages],
-		};
+		} if @pages;
 
 		last if @rets >= $num;
 	}
@@ -428,12 +433,9 @@ sub rcs_notify () { #{{{
 	#
 	# 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) and we can obtain the diff
-	# by comparing HEAD and HEAD^ (the previous commit).
+	# triggers a refresh of IkiWiki pages).
 
-	my $sha1 = 'HEAD'; # the commit which triggers this action
-
-	my $ci = git_commit_info($sha1);
+	my $ci = git_commit_info('HEAD');
 	return if !defined $ci;
 
 	my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
@@ -448,13 +450,15 @@ sub rcs_notify () { #{{{
 		$message = join "\n", @{ $ci->{'comment'} };
 	}
 
+	my $sha1 = $ci->{'sha1'};
+
 	require IkiWiki::UserInfo;
 	send_commit_mails(
 		sub {
 			$message;
 		},
 		sub {
-			join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
+			join "\n", run_or_die('git', 'diff', "${sha1}^", $sha1);
 		}, $user, @changed_pages
 	);
 } #}}}