* monotone: Add code to default mergerc file to run

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

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index e5258b111300e6470f2939c01b0f2faba714c62d..db6a396ac4914630a41407d0df8748641c9aeef2 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -139,10 +139,10 @@ sub rcs_recentchanges ($) { #{{{
                $user =~ s/^\s*//;
 
                push @ret, {
                $user =~ s/^\s*//;
 
                push @ret, {

-                       id         => $info->{"changeset"},
+                       rev        => $info->{"changeset"},

                        user       => $user,
                        committype => "mercurial",
                        user       => $user,
                        committype => "mercurial",

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

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


@@ -151,10 +151,6 @@ sub rcs_recentchanges ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

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

 sub rcs_getctime ($) { #{{{
        my ($file) = @_;
 
 sub rcs_getctime ($) { #{{{
        my ($file) = @_;