diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-22 14:28:38 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-22 14:28:38 +0000 |
| commit | 04a9dbfe7daa9c352ae4e9af17df8134248f3806 (patch) | |
| tree | 253d6c60f0ebcdc7198ea9e67767400de711755d /IkiWiki/Rcs/git.pm | |
| parent | 00c6f9e5cbed1ed0943d93aacdf63ce696133ca6 (diff) | |
| download | ikiwiki-04a9dbfe7daa9c352ae4e9af17df8134248f3806.tar ikiwiki-04a9dbfe7daa9c352ae4e9af17df8134248f3806.tar.gz | |
updates
Diffstat (limited to 'IkiWiki/Rcs/git.pm')
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 46adf1657..05eaa8d78 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -294,12 +294,19 @@ sub rcs_prepedit ($) { #{{{ return git_sha1($file); } #}}} -sub rcs_commit ($$$) { #{{{ +sub rcs_commit ($$$;$$) { #{{{ # Try to commit the page; returns undef on _success_ and # a version of the page with the rcs's conflict markers on # failure. - my ($file, $message, $rcstoken) = @_; + my ($file, $message, $rcstoken, $user, $ipaddr) = @_; + + if (defined $user) { + $message="web commit by $user".(length $message ? ": $message" : ""); + } + elsif (defined $ipaddr) { + $message="web commit from $ipaddr".(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 |