From 675236d251cfbfa698470392f627e62591cd726b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 00:07:59 -0400 Subject: [PATCH 1/7] web commit by cjb: Suggested patch for 302 redirect after page creation when using bzr --- doc/todo/quieten-bzr.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/todo/quieten-bzr.mdwn diff --git a/doc/todo/quieten-bzr.mdwn b/doc/todo/quieten-bzr.mdwn new file mode 100644 index 000000000..78f9c0b55 --- /dev/null +++ b/doc/todo/quieten-bzr.mdwn @@ -0,0 +1,20 @@ +The _bzr_ plug echoes "added: somefile.mdwn" when it adds somefile.mdwn to the repository. As a result, the redirect performed after a new article is created fails because the _bzr_ output comes before the HTTP headers. + +The fix is simply to call `bzr` with the _--quiet_ switch. Something like this applied to _bzr.pm_ works for me: + + 46c46 + < my @cmdline = ("bzr", $config{srcdir}, "update"); + --- + > my @cmdline = ("bzr", "update", "--quiet", $config{srcdir}); + 74c74 + < my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user, + --- + > my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user, + 86c86 + < my @cmdline = ("bzr", "add", "$config{srcdir}/$file"); + --- + > my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file"); + 94a95,97 + > eval q{use CGI 'escapeHTML'}; + > error($@) if $@; + > From e8728aa894231c4e667f9562becf68e7fb99339a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 00:09:07 -0400 Subject: [PATCH 2/7] web commit by cjb: Tagged --- doc/todo/quieten-bzr.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/quieten-bzr.mdwn b/doc/todo/quieten-bzr.mdwn index 78f9c0b55..f5f00b0a3 100644 --- a/doc/todo/quieten-bzr.mdwn +++ b/doc/todo/quieten-bzr.mdwn @@ -18,3 +18,6 @@ The fix is simply to call `bzr` with the _--quiet_ switch. Something like this a > eval q{use CGI 'escapeHTML'}; > error($@) if $@; > + + +[[tag patch]] From 04528ba2596d084ff20cd57058b05d6dfad55ed9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 01:06:21 -0400 Subject: [PATCH 3/7] web commit by cjb: Fixed URL --- doc/plugins/contrib/sourcehighlight.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/sourcehighlight.mdwn b/doc/plugins/contrib/sourcehighlight.mdwn index f89677d9e..0066c9b9f 100644 --- a/doc/plugins/contrib/sourcehighlight.mdwn +++ b/doc/plugins/contrib/sourcehighlight.mdwn @@ -4,7 +4,7 @@ I noticed several places in the wiki talking about similar ideas, so I decided t I have implemented a simple wrapper around [source-highlight](http://www.gnu.org/software/src-highlite/). You can find the latest version in -[git](http://http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/sourcehighlight.pm;hb=HEAD). +[git](http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/sourcehighlight.pm;hb=HEAD). You must specify `highlight_lang=>"foo,bar"` in your setup file. where foo and bar are the (source-supported) languages you want to highlight From 7921d9456c3bb0941e0b2f4890e3537b0c8f4181 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 13:00:36 -0400 Subject: [PATCH 4/7] web commit by ScottSwalwell: Fixed this link. --- doc/plugins/edittemplate.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn index ac8e0a71f..798d1290c 100644 --- a/doc/plugins/edittemplate.mdwn +++ b/doc/plugins/edittemplate.mdwn @@ -3,7 +3,7 @@ This plugin allows registering template pages, that provide default content for new pages created using the web frontend. To register a -template, insert a [[PreprocessorDirective]] on some other page. +template, insert a [[Preprocessor Directive|/ikiwiki/preprocessordirective]] on some other page. \[[!edittemplate template="bugtemplate" match="bugs/*"]] From 56474485018122a6ee7cd2b9100f4c3b99e323f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 13:01:27 -0400 Subject: [PATCH 5/7] web commit by ScottSwalwell: Fixed my fix. --- doc/plugins/edittemplate.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn index 798d1290c..8140b4f41 100644 --- a/doc/plugins/edittemplate.mdwn +++ b/doc/plugins/edittemplate.mdwn @@ -3,7 +3,7 @@ This plugin allows registering template pages, that provide default content for new pages created using the web frontend. To register a -template, insert a [[Preprocessor Directive|/ikiwiki/preprocessordirective]] on some other page. +template, insert a [[Preprocessor_Directive|/ikiwiki/preprocessordirective]] on some other page. \[[!edittemplate template="bugtemplate" match="bugs/*"]] From ff363cf9a026daa981f3d3a84d90634f22937856 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 14:43:58 -0400 Subject: [PATCH 6/7] web commit by http://joey.kitenet.net/ --- doc/index.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 1a416d798..42d2408dd 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -6,6 +6,8 @@ There are many other [[features]], including support for [[template id=links]] +foo + ## using ikiwiki [[Setup]] has a tutorial for setting up ikiwiki, or you can read the From c69c811d64b285cec3dc3039376c2ff8c8907121 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2008 14:45:00 -0400 Subject: [PATCH 7/7] web commit by http://joey.kitenet.net/: oops :-) --- doc/index.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 42d2408dd..1a416d798 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -6,8 +6,6 @@ There are many other [[features]], including support for [[template id=links]] -foo - ## using ikiwiki [[Setup]] has a tutorial for setting up ikiwiki, or you can read the