proper fix for adding file, based on jkoenig's patch

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

diff --git a/IkiWiki/Rcs/Stub.pm b/IkiWiki/Rcs/Stub.pm
index 01696a8b0a25b4d34282be0bc6e8307a8fe72dbe..19ecfa88df571bd2ca4553c4c9bbc0690ba12188 100644 (file)
--- a/IkiWiki/Rcs/Stub.pm
+++ b/IkiWiki/Rcs/Stub.pm
@@ -20,7 +20,7 @@ sub rcs_prepedit ($) {
        return ""
 }
 
-sub rcs_commit ($$$) {
+sub rcs_commit ($$$;$$) {
        # Tries to commit the page; returns undef on _success_ and
        # a version of the page with the rcs's conflict markers on failure.
        # The file is relative to the srcdir.
@@ -29,6 +29,8 @@ sub rcs_commit ($$$) {
 
 sub rcs_add ($) {
        # Add a file. The filename is relative to the root of the srcdir.
+       # Note that this should not check the new file in, it should only
+       # prepare for it to be checked in when rcs_commit is called.
 }
 
 sub rcs_recentchanges ($) {
@@ -39,17 +41,17 @@ sub rcs_recentchanges ($) {
        #       committype => # either "web" or the name of the rcs,
        #       when => # time when the change was made,
        #       message => [
-       #               "commit message line",
-       #               "commit message line",
-       #               "...",
+       #               { line => "commit message line" },
+       #               { line => "commit message line" },
+       #               # etc,
        #       ],
        #       pages => [
        #               {
        #                       page => # name of page changed,
        #                       diffurl => # optional url to a diff showing 
        #                                  # the changes,
-       #               }
-       #               # repeat for each page changed in this commit
+       #               },
+       #               # repeat for each page changed in this commit,
        #       ],
        # }
 }
@@ -63,7 +65,7 @@ sub rcs_notify () {
 
 sub rcs_getctime ($) {
        # Optional, used to get the page creation time from the RCS.
-       error "getctime not implemented";
+       error gettext("getctime not implemented");
 }
 
 1