aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-01-25 15:10:50 -0400
committerJoey Hess <joey@kitenet.net>2011-01-25 15:10:50 -0400
commit8cd0a1c434549e2718fe7b3441ce24e6ff759bea (patch)
treea3c760668e5505b8d6ceb101ec6dedca4f675d07
parent313b06878c2e330848b4db6e12921366d93706c2 (diff)
downloadikiwiki-8cd0a1c434549e2718fe7b3441ce24e6ff759bea.tar
ikiwiki-8cd0a1c434549e2718fe7b3441ce24e6ff759bea.tar.gz
review
-rw-r--r--doc/branches.mdwn3
-rw-r--r--doc/reviewed.mdwn6
-rw-r--r--doc/todo/inline_raw_files.mdwn20
3 files changed, 29 insertions, 0 deletions
diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 4accc21ca..5149d79f9 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -4,6 +4,9 @@ example when submitting a [[patch]], you can use the
\[[!template id=gitbranch branch=yourrepo/amazingbranch author="\[[yourname]]"]]
+Branches that have been [[reviewed]] and need work will not be listed
+here.
+
Branches referred to in open [[bugs]] and [[todo]]:
[[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
diff --git a/doc/reviewed.mdwn b/doc/reviewed.mdwn
new file mode 100644
index 000000000..a25d7f116
--- /dev/null
+++ b/doc/reviewed.mdwn
@@ -0,0 +1,6 @@
+This page lists [[branches]] that have been reviewed. If your branch
+shows up here, the ball is back in your court, to respond to the review and
+deal with whatever is preventing it from being merged into ikiwiki.
+
+[[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
+and !link(todo/done) and !*/*/* and link(.)" show=0 archive=yes]]
diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn
index 58920cc12..ef827fb3f 100644
--- a/doc/todo/inline_raw_files.mdwn
+++ b/doc/todo/inline_raw_files.mdwn
@@ -64,3 +64,23 @@ usage
>>> will be easier to merge or reject. Note the new branch name:
>>> `raw_inline`. I'll open separate todo items for items mentioned in my
>>> previous comment. --[[wtk]]
+
+----
+
+Reviewing your patch the first thing I see is this:
+
+<pre>
++ if (! $file) {
++ error("Missing file.");
++ }
+</pre>
+
+This fails if the filename is "0". Also, `pagetype()`
+currently cannot fail; allowing it to crash the entire
+wiki build if the filename is somehow undefined seems
+unwise.
+
+I didn't look much further, because it seems to me what you're trying to do
+can be better accomplished by using the highlight plugin. Assuming the raw
+file you want to inline and comment on is some source-code-like thing,
+which seems likely. --[[Joey]] [[!tag reviewed]]