X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f66eddccc688059fee94b4b7789318e39675d34c..b277e00d4ec2dc3b50a111957b7fbd0c5ac7bbd9:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index c816d1bb5..7c3ae9276 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -11,6 +11,40 @@ use open qw{:utf8 :std};
 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
 
+hook(type => "getsetup", id => "git", call => sub { #{{{
+	return
+		historyurl => {
+			type => "string",
+			default => "",
+			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+			description => "gitweb url to show file history ([[file]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+		diffurl => {
+			type => "string",
+			default => "",
+			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+		gitorigin_branch => {
+			type => "string",
+			default => "origin",
+			description => "where to pull and push changes (unset to not pull/push)",
+			safe => 0, # paranoia
+			rebuild => 0,
+		},
+		gitmaster_branch => {
+			type => "string",
+			default => "master",
+			description => "branch that the wiki is stored in",
+			safe => 0, # paranoia
+			rebuild => 0,
+		},
+}); #}}}
+
 sub _safe_git (&@) { #{{{
 	# Start a child process safely without resorting /bin/sh.
 	# Return command output or success state (in scalar context).
@@ -197,7 +231,7 @@ sub _parse_diff_tree ($@) { #{{{
 	}
 
 	debug("No 'tree' seen in diff-tree output") if !defined $ci{'tree'};
-
+	
 	if (defined $ci{'parents'}) {
 		$ci{'parent'} = @{ $ci{'parents'} }[0];
 	}
@@ -205,15 +239,13 @@ sub _parse_diff_tree ($@) { #{{{
 		$ci{'parent'} = 0 x 40;
 	}
 
-	# Commit message.
-	while (my $line = shift @{ $dt_ref }) {
-		if ($line =~ m/^$/) {
-			# Trailing empty line signals next section.
-			last;
-		};
+	# Commit message (optional).
+	while ($dt_ref->[0] =~ /^    /) {
+		my $line = shift @{ $dt_ref };
 		$line =~ s/^    //;
 		push @{ $ci{'comment'} }, $line;
 	}
+	shift @{ $dt_ref } if $dt_ref->[0] =~ /^$/;
 
 	# Modified files.
 	while (my $line = shift @{ $dt_ref }) {
@@ -320,18 +352,29 @@ sub rcs_commit ($$$;$$) { #{{{
 		my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
 		return $conflict if defined $conflict;
 	}
-	
-	# Set the commit author to the web committer.
+
+	rcs_add($file);	
+	return rcs_commit_staged($message, $user, $ipaddr);
+} #}}}
+
+sub rcs_commit_staged ($$$) {
+	# Commits all staged changes. Changes can be staged using rcs_add,
+	# rcs_remove, and rcs_rename.
+	my ($message, $user, $ipaddr)=@_;
+
+	# Set the commit author and email to the web committer.
 	my %env=%ENV;
 	if (defined $user || defined $ipaddr) {
-		$ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)";
-		$ENV{GIT_AUTHOR_EMAIL}="";
+		my $u=defined $user ? $user : $ipaddr;
+		$ENV{GIT_AUTHOR_NAME}=$u;
+		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 	}
 
 	# 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', '--cleanup=verbatim', '-q', '-m', $message, '-i', $file)) {
+	if (run_or_non('git', 'commit', '--cleanup=verbatim',
+	               '-q', '-m', $message)) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
@@ -339,7 +382,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	
 	%ENV=%env;
 	return undef; # success
-} #}}}
+}
 
 sub rcs_add ($) { # {{{
 	# Add file to archive.
@@ -349,6 +392,20 @@ sub rcs_add ($) { # {{{
 	run_or_cry('git', 'add', $file);
 } #}}}
 
+sub rcs_remove ($) { # {{{
+	# Remove file from archive.
+
+	my ($file) = @_;
+
+	run_or_cry('git', 'rm', '-f', $file);
+} #}}}
+
+sub rcs_rename ($$) { # {{{
+	my ($src, $dest) = @_;
+
+	run_or_cry('git', 'mv', '-f', $src, $dest);
+} #}}}
+
 sub rcs_recentchanges ($) { #{{{
 	# List of recent changes.
 
@@ -360,7 +417,7 @@ sub rcs_recentchanges ($) { #{{{
 	my @rets;
 	foreach my $ci (git_commit_info('HEAD', $num)) {
 		# Skip redundant commits.
-		next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);
+		next if ($ci->{'comment'} && @{$ci->{'comment'}}[0] eq $dummy_commit_msg);
 
 		my ($sha1, $when) = (
 			$ci->{'sha1'},
@@ -392,7 +449,7 @@ sub rcs_recentchanges ($) { #{{{
 		}
 
 		my $user=$ci->{'author_username'};
-		my $web_commit = ($user=~s/\s+\(web\)$//);
+		my $web_commit = ($ci->{'author'} =~ /\@web>/);
 		
 		# compatability code for old web commit messages
 		if (! $web_commit &&
@@ -400,6 +457,7 @@ sub rcs_recentchanges ($) { #{{{
 		      $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
 			$user = defined $2 ? "$2" : "$3";
 			$messages[0]->{line} = $4;
+		 	$web_commit=1;
 		}
 
 		push @rets, {