make the author metadata for changes pages be the un-munged openid

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

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index 82a2fa642646cec3c54ad3be639babeb908ce4fe..db6a396ac4914630a41407d0df8748641c9aeef2 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -55,7 +55,7 @@ sub mercurial_log($) {
 }
 
 sub rcs_update () { #{{{
 }
 
 sub rcs_update () { #{{{

-       my @cmdline = ("hg", "-R", "$config{srcdir}", "update");
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -65,12 +65,26 @@ sub rcs_prepedit ($) { #{{{
        return "";
 } #}}}
 
        return "";
 } #}}}
 

-sub rcs_commit ($$$) { #{{{
-       my ($file, $message, $rcstoken) = @_;
+sub rcs_commit ($$$;$$) { #{{{
+       my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+
+       if (defined $user) {
+               $user = possibly_foolish_untaint($user);
+       }
+       elsif (defined $ipaddr) {
+               $user = "Anonymous from ".possibly_foolish_untaint($ipaddr);
+       }
+       else {
+               $user = "Anonymous";
+       }

 
        $message = possibly_foolish_untaint($message);
 
        $message = possibly_foolish_untaint($message);

+       if (! length $message) {
+               $message = "no message given";
+       }

 
 

-       my @cmdline = ("hg", "-R", "$config{srcdir}", "commit", "-m", "$message");
+       my @cmdline = ("hg", "-q", "-R", $config{srcdir}, "commit", 
+                      "-m", $message, "-u", $user);

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -81,7 +95,7 @@ sub rcs_commit ($$$) { #{{{
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 

-       my @cmdline = ("hg", "-R", "$config{srcdir}", "add", "$file");
+       my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -91,10 +105,15 @@ sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 
        eval q{use CGI 'escapeHTML'};
        my ($num) = @_;
 
        eval q{use CGI 'escapeHTML'};

+       error($@) if $@;

 
 

-       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num);
+       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
+               "--style", "default");

        open (my $out, "@cmdline |");
 
        open (my $out, "@cmdline |");
 

+       eval q{use Date::Parse};
+       error($@) if $@;
+

        my @ret;
        foreach my $info (mercurial_log($out)) {
                my @pages = ();
        my @ret;
        foreach my $info (mercurial_log($out)) {
                my @pages = ();


@@ -123,7 +142,7 @@ sub rcs_recentchanges ($) { #{{{
                        rev        => $info->{"changeset"},
                        user       => $user,
                        committype => "mercurial",
                        rev        => $info->{"changeset"},
                        user       => $user,
                        committype => "mercurial",

-                       when       => $info->{"date"},
+                       when       => str2time($info->{"date"}),

                        message    => [@message],
                        pages      => [@pages],
                };
                        message    => [@message],
                        pages      => [@pages],
                };


@@ -132,12 +151,26 @@ sub rcs_recentchanges ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub rcs_notify () { #{{{
-       # TODO
-} #}}}
-

 sub rcs_getctime ($) { #{{{
 sub rcs_getctime ($) { #{{{

-       error "getctime not implemented";
+       my ($file) = @_;
+
+       # XXX filename passes through the shell here, should try to avoid
+       # that just in case
+       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', 
+               "--style", "default", "$config{srcdir}/$file");
+       open (my $out, "@cmdline |");
+
+       my @log = mercurial_log($out);
+
+       if (length @log < 1) {
+               return 0;
+       }
+
+       eval q{use Date::Parse};
+       error($@) if $@;
+       
+       my $ctime = str2time($log[0]->{"date"});
+       return $ctime;

 } #}}}
 
 1
 } #}}}
 
 1