X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1b318dacbda00d05566f300bb4a69cd913ce0e71..2b9615194e0adefa0f61810405db1e9204ccc72b:/IkiWiki/Rcs/git.pm?ds=inline

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 26f2a39f2..ecf560d0b 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -318,18 +318,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});
 		}
@@ -337,7 +348,7 @@ sub rcs_commit ($$$;$$) { #{{{
 	
 	%ENV=%env;
 	return undef; # success
-} #}}}
+}
 
 sub rcs_add ($) { # {{{
 	# Add file to archive.
@@ -347,6 +358,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.
 
@@ -390,7 +415,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 &&
@@ -398,6 +423,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, {