doc updates for bzr

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9bf54298199d130dc3187c97c784df20c7e45e6e..e2974cfd59f89ed3ccb18c503071ca23eb11e7e0 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -42,6 +42,11 @@ use IkiWiki::Setup::Standard {
        #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
        #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
 
        #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
        #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
 

+       # Bazaar stuff.
+       #rcs => "bzr",
+       #historyurl => ??,
+       #diffurl => ??,
+

        # Monotone stuff
        #rcs => "monotone",
        #mtnkey => "web\@machine.company.com",
        # Monotone stuff
        #rcs => "monotone",
        #mtnkey => "web\@machine.company.com",

diff --git a/doc/rcs/bzr.mdwn b/doc/rcs/bzr.mdwn
new file mode 100644 (file)
index 0000000..19a7ae3
--- /dev/null
+++ b/doc/rcs/bzr.mdwn
@@ -0,0 +1,8 @@
+[Bazaar](http://bazaar-vcs.org/) is a distributed revison control
+system developed by Canonical Ltd. Ikiwiki supports storing a wiki in a
+bzr repository.
+
+Ikiwiki can run as a post-update hook to update a wiki whenever commits
+come in. When running as a [[cgi]] with bzr, ikiwiki automatically
+commits edited pages, and uses the bzr history to generate the
+[[RecentChanges]] page.

diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn
index 6b9ffb91ff10b21e7b9d05079ba9f4fb6ddd5cb9..449e129bd1021969005a9fcd2c2f1a1fc2ea7238 100644 (file)
--- a/doc/rcs/details.mdwn
+++ b/doc/rcs/details.mdwn
@@ -352,3 +352,5 @@ merge again with a merger that inserts conflict markers.  It commits this new
 revision with conflict markers to the repository.  It then returns the text to the
 user for cleanup.  This is less neat than it could be, in that a conflict marked
 revision gets committed to the repository.
 revision with conflict markers to the repository.  It then returns the text to the
 user for cleanup.  This is less neat than it could be, in that a conflict marked
 revision gets committed to the repository.

+
+## [[bzr]]

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 9bf7f7c7b579918065c169254f0522cc71062fc7..857a9dbae01bd0323afbc309306c36061544d417 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -135,6 +135,13 @@ about using the git repositories.
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 
        ikiwiki-makerepo mercurial $SRCDIR
 """]]
 

+[[toggle id=mercurial text="Bazaar"]]
+[[toggleable id=bazaar text="""
+       REPOSITORY=$SRCDIR
+       # FIXME: doesn't work yet with bzr
+       ikiwiki-makerepo bzr $SRCDIR
+"""]]
+

 [[toggle id=tla text="TLA"]]
 [[toggleable id=tla text="""
        REPOSITORY=~/wikirepo
 [[toggle id=tla text="TLA"]]
 [[toggleable id=tla text="""
        REPOSITORY=~/wikirepo

diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn
index 51ae081463e11711631524729c547d2f918f1736..179ea2f24db7ced98c4838858af9c14277c8d668 100644 (file)
--- a/doc/todo/bzr.mdwn
+++ b/doc/todo/bzr.mdwn
@@ -190,3 +190,5 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
 > 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'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]]