From d7fdd04b5a113b6dded40cb79b670b16570c11b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 00:36:58 -0500 Subject: * Removed support for sending commit notification mails. Along with it went the svnrepo and notify settings, though both will be ignored if left in setup files. --- doc/setup.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc/setup.mdwn') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index af1adc235..9bf7f7c7b 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -180,8 +180,7 @@ about using the git repositories. Once your wiki is checked in to the revision control system, you should configure ikiwiki to use revision control. Edit your ikiwiki.setup, and uncomment the lines for the revision control system -you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using -subversion. Uncomment the block for the wrapper for your revision +you chose to use. Uncomment the block for the wrapper for your revision control system, and configure the wrapper path in that block appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`). -- cgit v1.2.3 From e050f35261fe453b70294b58bc6c87bfe57cf231 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 19:56:19 -0500 Subject: doc updates for bzr --- doc/ikiwiki.setup | 5 +++++ doc/rcs/bzr.mdwn | 8 ++++++++ doc/rcs/details.mdwn | 2 ++ doc/setup.mdwn | 7 +++++++ doc/todo/bzr.mdwn | 2 ++ 5 files changed, 24 insertions(+) create mode 100644 doc/rcs/bzr.mdwn (limited to 'doc/setup.mdwn') diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 9bf542981..e2974cfd5 100644 --- 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]]", + # Bazaar stuff. + #rcs => "bzr", + #historyurl => ??, + #diffurl => ??, + # 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 index 000000000..19a7ae395 --- /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 6b9ffb91f..449e129bd 100644 --- 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. + +## [[bzr]] diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 9bf7f7c7b..857a9dbae 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -135,6 +135,13 @@ about using the git repositories. 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 diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn index 51ae08146..179ea2f24 100644 --- 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 used jelmer's patch --[[done]]! --[[Joey]] -- cgit v1.2.3 From ab414bc56c1ad2620a48902ad6bca1cf3ba11611 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 20:04:42 -0500 Subject: remove todo --- doc/setup.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc/setup.mdwn') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 857a9dbae..9d7aecabd 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -138,7 +138,6 @@ about using the git repositories. [[toggle id=mercurial text="Bazaar"]] [[toggleable id=bazaar text=""" REPOSITORY=$SRCDIR - # FIXME: doesn't work yet with bzr ikiwiki-makerepo bzr $SRCDIR """]] -- cgit v1.2.3