From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 16:22:10 +0000 (-0400)
Subject: Merge commit 'smcv/ready/getsource'
X-Git-Tag: 3.15~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/79312b2754571ac80253993217da2b0899086342?hp=-c

Merge commit 'smcv/ready/getsource'

Conflicts:
	debian/changelog
---

79312b2754571ac80253993217da2b0899086342
diff --combined debian/changelog
index 50bb0b945,90ec2ddac..e370a33ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,14 -8,7 +8,15 @@@ ikiwiki (3.15) UNRELEASED; urgency=lo
    * Add further build machinery to generate translated underlays from
      the po file, for use by wikis whose primary language is not English.
    * Add Danish basewiki translation by Jonas Smedegaard.
 +  * img: Fix adding of dependency from page to the image.
 +  * pagestats: add `among` parameter, which only counts links from specified
 +    pages (smcv)
 +  * pagestats: when making a tag cloud, don't emit links where the tag is
 +    unused (smcv)
 +  * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm)
 +  * inline: Add pagenames parameter that can be used to list a set of
 +    pages to inline, in a specific order, without using a PageSpec. (smcv)
+   * Add getsource plugin (Will, smcv)
  
   -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
  
diff --combined doc/todo/source_link.mdwn
index 4a8285948,a7203d06c..0c639a314
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@@ -4,36 -4,11 +4,36 @@@ How about a direct link from the page h
  
  I just implemented this.  There is one [[patch]] to the default page template, and a new plugin.  -- [[Will]]
  
 +All of this code is licensed under the GPLv2+. -- [[Will]]
 +
  > The use of sessioncgi here seems undesirable: on wikis where anonymity is
  > not allowed, you'll be asked to log in. Couldn't you achieve the same thing
  > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
  > --[[smcv]]
  
 +[[!template id=gitbranch branch=smcv/ready/getsource
 +  author="[[Will]]/[[smcv]]"]]
 +
 +>> I've applied the patch below in a git branch, fixed my earlier criticism,
 +>> and also fixed a couple of other issues I noticed:
 +>>
 +>> * missing pages could be presented better as a real 404 page
 +>> * the default Content-type should probably be UTF-8 since the rest of
 +>>   IkiWiki tends to assume that
 +>> * emitting attachments (images, etc.) as text/plain isn't going to work :-)
 +>>
 +>> Any opinions on my branch? I think it's ready for merge, if Joey approves.
 +>>
 +>> --[[smcv]]
 +
 +>>> I need a copyright&license statement, so debian/copyright can be updated for
 +>>> the plugin, before I can merge this. Otherwise ready. --[[Joey]]
 +
 +>>> That looks like a nice set of fixes.  One more that might be worthwhile: instead of reading the page source into a var, and then writing it out later, it might be nice to just
 +>>>  `print readfile(srcfile(pagesources{$page}));` at the appropriate point. -- [[Will]]
 +
 +>>>> OK, I've committed that. --[[smcv]]
 +
  ----
  
      diff --git a/templates/page.tmpl b/templates/page.tmpl
@@@ -132,3 -107,5 +132,5 @@@
      }
      
      1
+ 
+ [[done]] --[[smcv]]