Merge branch 'master' of ssh://git.ikiwiki.info

master
Joey Hess 2013-09-14 12:06:43 -04:00
commit 211635bb1b
3 changed files with 62 additions and 0 deletions

View File

@ -109,3 +109,52 @@ Please, let me know what to do to avoid this kind of error.
> for backwards compatibility? > for backwards compatibility?
> >
> --[[smcv]] > --[[smcv]]
>> [[!template id=gitbranch author="[[smcv]]" branch=smcv/definetemplate]]
>> [[!tag patch]]
>> OK, here is a branch implementing what I said. It adds the `definetemplate`
>> directive to [[plugins/goodstuff]] as its last commit.
>>
>> Templates with the current strange semantics will still work, until
>> IkiWiki breaks compatibility.
>>
>> Possible controversies:
>>
>> * Should the `definetemplate` plugin be core, or in goodstuff, or neither?
>>
>> * Should \[[!definetemplate]] be allowed on any page (with the implementation
>> of `template("foo")` looking for a `definetemplate` in `templates/foo`,
>> then a `definetemplate` in `foo`, then fall back to the current logic)?
>> If not, should \[[!definetemplate]] raise an error when used on a page not
>> in `templates/`, since it will have no practical effect there?
>>
>> * Is it OK to rely on `definetemplate` being enabled in the basewiki's
>> templates?
>>
>> * Should the "use definetemplate" wording in the documentation of
>> template and edittemplate be stronger? Should those plugins automatically
>> load definetemplate?
>>
>> --[[smcv]]
>>> this looks like a good idea to me.
>>>
>>> * i'd put it in core, and add a transition for the time compatibility gets
>>> broken, provided the transitioning system will be used in that. templates
>>> can't be expected to just work as markdown+ikiwiki too.
>>>
>>> (it being in core would also solve my qualms about `section => "web"` /
>>> `\[[!tag type/web]]`).
>>>
>>> * if definetemplate gets deemed core, no "use definetemplate!" notes on the
>>> template/edittemplate pages will be required any more.
>>>
>>> * first i was sceptical of the approach of re-running scan to make sure the
>>> `my %templates` is filled, but it is indeed a practical solution.
>>>
>>> * the name "`definetemplate`" gives me the first impression that something
>>> is assigned (as in `#define`), but actually it highlights a region in the
>>> file. wouldn't "`templatebody`" be a better description of the meaning of
>>> the directive?
>>>
>>> --[[chrysn]]

View File

@ -0,0 +1,3 @@
On the recent changes page, edits are listed with a username which is a link to the corresponding user page. I'd like the commits from git to show up with the correct username, but am unsure how Ikiwiki sources this info. It doesn't seem to correspond to "git config user.name", for instance.
Any help would be much appreciated! Thanks!

View File

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 1"
date="2013-09-10T10:01:22Z"
content="""
In the git plugin, it's usually the local part (the part before the @)
of the email address (as in `git config user.email`).
See `parse_diff_tree()` in `IkiWiki/Plugin/git.pm`.
"""]]