Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / bzr.mdwn

diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn
index 46f2ecdc02c185eb451813aa3c275bb154681919..a50c58d26d1deaee5a1a2dbbef66c09ed848371d 100644 (file)
--- a/doc/todo/bzr.mdwn
+++ b/doc/todo/bzr.mdwn
@@ -4,6 +4,8 @@ rcs_commit was only changed to work around bzr's lack of a switch to set the
 username). bzr_log could probably be written better by someone better at perl,
 and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
 
+(rcs_notify is not needed in this branch --[[Joey]])
+
     #!/usr/bin/perl
     
     use warnings;
@@ -54,15 +56,15 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             return @ret;
     }
     
-    sub rcs_update () { #{{{
+    sub rcs_update () {
             # Not needed.
-    } #}}}
+    }
     
-    sub rcs_prepedit ($) { #{{{
+    sub rcs_prepedit ($) {
             return "";
-    } #}}}
+    }
     
-    sub rcs_commit ($$$;$$) { #{{{
+    sub rcs_commit ($$$;$$) {
             my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
     
             if (defined $user) {
@@ -93,18 +95,18 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             system("bzr","whoami",$olduser);
     
             return undef; # success
-    } #}}}
+    }
     
-    sub rcs_add ($) { # {{{
+    sub rcs_add ($) {
             my ($file) = @_;
     
             my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
             if (system(@cmdline) != 0) {
                     warn "'@cmdline' failed: $!";
             }
-    } #}}}
+    }
     
-    sub rcs_recentchanges ($) { #{{{
+    sub rcs_recentchanges ($) {
             my ($num) = @_;
     
             eval q{use CGI 'escapeHTML'};
@@ -151,17 +153,42 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
             }
     
             return @ret;
-    } #}}}
+    }
     
-    sub rcs_notify () { #{{{
+    sub rcs_notify () {
             # TODO
-    } #}}}
+    }
     
-    sub rcs_getctime ($) { #{{{
+    sub rcs_getctime ($) {
             # TODO
-    } #}}}
+    }
     
     1
 
 
 [[patch]]
+
+
+> Thanks for doing this.
+> bzr 0.90 has support for --author to commit to set the author for one commit at a time,
+> you might like to use that instead of changing the global username (which is racy).
+>
+> Wouter van Heyst and I were also working on a plugin for bzr, but we were waiting for
+> the smart server to grow the ability to run server side hooks, so that you can edit locally
+> and then push to rebuild the wiki, but there is no need to stop this going in in the mean
+> time.
+> Thanks again --[[JamesWestby]]
+
+>> I didn't know about --author, it doesn't seem to be mentioned in the manual.
+>> I'd update the patch to reflect this, but it breaks with the version of bzr
+>> from Stable, and also the one I'm currently using from backports.org.
+
+>>> It's new (in fact I'm not even sure that it made it in to 0.90, it might be in 0.91 due
+>>> in a couple of weeks.
+>>> I was just noting it for a future enhancement. --[[JamesWestby]]
+
+> I've just posted another patch with support for bzr, including support for 
+> --author and a testsuite to git://git.samba.org/jelmer/ikiwiki.git. I hadn't 
+> seen this page earlier.  --[[jelmer]]
+
+> I used jelmer's patch --[[done]]! --[[Joey]]