X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/730a3fb4b7502fc89ee35f7d75c5b56fe8a8b8d8..2f3a279f68dcf8c1566d82419fc7257e162ee345:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 84e7d74e5..036900887 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -51,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.
@@ -60,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
@@ -103,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 = $@;
@@ -196,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 }) {
@@ -213,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;
@@ -232,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,
 				};
 			}
@@ -241,8 +247,6 @@ sub _parse_diff_tree ($@) { #{{{
 		last;
 	}
 
-	debug("No detail in diff-tree output") if !defined $ci{'details'};
-
 	return \%ci;
 } #}}}
 
@@ -254,10 +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',
+	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 ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
 
 	my @ci;
 	while (my $parsed = _parse_diff_tree(($prefix or ""), \@raw_lines)) {
@@ -275,7 +279,8 @@ 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 +291,7 @@ sub rcs_update () { #{{{
 	# Update working directory.
 
 	if (length $config{gitorigin_branch}) {
-		run_or_cry('git-pull', $config{gitorigin_branch});
+		run_or_cry('git', 'pull', $config{gitorigin_branch});
 	}
 } #}}}
 
@@ -315,13 +320,6 @@ sub rcs_commit ($$$;$$) { #{{{
 		    (length $message ? ": $message" : "");
 	}
 
-	# XXX: Wiki directory is in the unlocked state when starting this
-	# 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.
-	lockwiki();
-
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
 	my $cur    = git_sha1($file);
@@ -332,13 +330,12 @@ 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', '-q', '-m', $message, '-i', $file)) {
-		unlockwiki();
+	if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
 		if (length $config{gitorigin_branch}) {
-			run_or_cry('git-push', $config{gitorigin_branch});
+			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
 	}
 
@@ -350,7 +347,7 @@ sub rcs_add ($) { # {{{
 
 	my ($file) = @_;
 
-	run_or_cry('git-add', $file);
+	run_or_cry('git', 'add', $file);
 } #}}}
 
 sub rcs_recentchanges ($) { #{{{
@@ -363,14 +360,12 @@ 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'},
-			time - $ci->{'author_epoch'}
+			$ci->{'author_epoch'}
 		);
 
 		my (@pages, @messages);
@@ -388,7 +383,10 @@ sub rcs_recentchanges ($) { #{{{
 				diffurl => $diffurl,
 			};
 		}
-		push @messages, { line => $title };
+
+		push @messages, { line => $_ } foreach grep {
+			! m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i
+		}  @{$ci->{'comment'}};
 
 		my ($user, $type) = (q{}, "web");
 
@@ -409,7 +407,7 @@ sub rcs_recentchanges ($) { #{{{
 			when       => $when,
 			message    => [@messages],
 			pages      => [@pages],
-		};
+		} if @pages;
 
 		last if @rets >= $num;
 	}
@@ -417,49 +415,21 @@ sub rcs_recentchanges ($) { #{{{
 	return @rets;
 } #}}}
 
-sub rcs_notify () { #{{{
-	# Send notification mail to subscribed users.
-	#
-	# In usual Git usage, hooks/update script is presumed to send
-	# notification mails (see git-receive-pack(1)).  But we prefer
-	# 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.
-	#
-	# 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).
-
-	my $sha1 = 'HEAD'; # the commit which triggers this action
-
-	my $ci = git_commit_info($sha1);
-	return if !defined $ci;
-
-	my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
-
-	my ($user, $message);
-	if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
-		$user    = defined $2 ? "$2" : "$3";
-		$message = $4;
+sub rcs_diff ($) { #{{{
+	my $rev=shift;
+	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
+	my @lines;
+	foreach my $line (run_or_non("git", "show", $sha1)) {
+		if (@lines || $line=~/^diff --git/) {
+			push @lines, $line."\n";
+		}
+	}
+	if (wantarray) {
+		return @lines;
 	}
 	else {
-		$user    = $ci->{'author_username'};
-		$message = join "\n", @{ $ci->{'comment'} };
+		return join("", @lines);
 	}
-
-	require IkiWiki::UserInfo;
-	send_commit_mails(
-		sub {
-			$message;
-		},
-		sub {
-			join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
-		}, $user, @changed_pages
-	);
 } #}}}
 
 sub rcs_getctime ($) { #{{{