mercurial username setting patch

[ikiwiki.git] / IkiWiki / Rcs / mercurial.pm

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index 66ff0996a619fd482846d43831954143cff1bf71..da2beb7cdd0e30f0df9f902a62d651c36dfcdd69 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -65,19 +65,23 @@ sub rcs_prepedit ($) { #{{{
        return "";
 } #}}}
 
-sub rcs_commit ($$$) { #{{{
+sub rcs_commit ($$$;$$) { #{{{
        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        if (defined $user) {
-               $message="web commit by $user".(length $message ? ": $message" : "");
+               $user = possibly_foolish_untaint($user);
        }
        elsif (defined $ipaddr) {
-               $message="web commit from $ipaddr".(length $message ? ": $message" : "");
+               $user = "Anonymous from $ipaddr";
+       }
+       else {
+               $user = "Anonymous";
        }
 
        $message = possibly_foolish_untaint($message);
 
-       my @cmdline = ("hg", "-R", "$config{srcdir}", "commit", "-m", "$message");
+       my @cmdline = ("hg", "-R", "$config{srcdir}", "commit", 
+                      "-m", "$message", "-u", "$user");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }