aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden ↵Joey Hess2010-04-22
| | | | during build
* Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess2010-04-22
|\
| * rename bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn ↵blipvert2010-04-23
| | | | | | | | to bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
| * (no commit message)blipvert2010-04-23
| |
* | use meta titleJoey Hess2010-04-22
|/
* reference my branch for thisJoey Hess2010-04-22
|
* map can't currently change sort orderinghttp://smcv.pseudorandom.co.uk/2010-04-22
|
* (no commit message)http://seph.myopenid.com/2010-04-22
|
* addJoey Hess2010-04-22
|
* only remove page from influences when influences are not staticJoey Hess2010-04-22
| | | | This matches what add_depends done
* updateJoey Hess2010-04-22
|
* updateJoey Hess2010-04-22
|
* formatJoey Hess2010-04-22
|
* Merge branch 'autotag'Joey Hess2010-04-22
|\
| * updateJoey Hess2010-04-21
| |
| * turn on tag_autocreate by default if tagbase is setJoey Hess2010-04-21
| |
| * Merge branch 'master' into autotagJoey Hess2010-04-21
| |\
| * \ Merge branch 'master' into autotagJoey Hess2010-04-21
| |\ \ | | | | | | | | | | | | | | | | Conflicts: IkiWiki/Plugin/tag.pm
| * | | fixesJoey Hess2010-04-21
| | | |
| * | | clarifyJoey Hess2010-04-21
| | | |
| * | | Merge branch 'master' into autotagJoey Hess2010-04-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: IkiWiki/Plugin/tag.pm
| * | | | add separate template variable for tag page and sanitize displayed tag nameJoey Hess2010-04-21
| | | | |
| * | | | remember autofiles that were tried and failed to be addedJoey Hess2010-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, if an autofile is registered for a file that already exists, it is remembered that it was tried, and it doesn't get recreated when removed.
| * | | | commit autocreated tag pagesJoey Hess2010-04-21
| | | | |
| * | | | remember autofiles alwaysJoey Hess2010-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the problem that it did not remember if an autofile is deleted, unless a plugin happened to register the autofile at the same time. With the new code, we just never recreate an autofile more than once. Only downside is that the list of autofiles is never pruned either. And I don't really see a way to prune it.
| * | | | bugfixesJoey Hess2010-04-21
| | | | |
| * | | | Merge branch 'master' into autotagJoey Hess2010-04-21
| |\ \ \ \
| * | | | | document tag_autocreateJoey Hess2010-04-21
| | | | | |
| * | | | | remove verify_src_fileJoey Hess2010-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitting out this function bothered me. It is conceptially similar to file_pruned, and yet also very specific to exactly the security needs of find_src_files. I liked that it got rid of duplicate code in the latter function. So instead, put a helper sub in that, which I think allows refactoring things more cleanly, and with less boilerplate. As to the needs of gen_autofile, I'm not convinced this needs to handle the same set of problems that verify_src_file did. So I sat down and wrote a custom validator for autofiles, which turned out to seem to just need three things: Make sure the candidate filename is not something that would be pruned; untaint the candidate filename; and make sure that srcdir doesn't already have something with its name. (Plus, of course, all the other checks that were already in gen_autofile.) (In passing, also fixed a bunch of bugs I had introduced in this branch.)
| * | | | | add_autofile filename should be relative to srcdirJoey Hess2010-04-21
| | | | | |
| * | | | | Merge branch 'master' into autotagJoey Hess2010-04-21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into autotagJoey Hess2010-04-20
| |\ \ \ \ \ \
| * | | | | | | improve docsJoey Hess2010-04-17
| | | | | | | |
| * | | | | | | move File::Find control back into its code blocksJoey Hess2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok, this is longer, but features less scary action at a distance.
| * | | | | | | move decode_utf8 closer to reason for itJoey Hess2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filenames need to be decoded, as File::Find does not provide them in decoded form, but other callers of verify_src_file will be using utf8.
| * | | | | | | fix autotag behavior for relative tagsJoey Hess2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A tag like ./foo is searched for relative to the tagging page. However, if multiple pages use such a tag, the only one sure to be in common is in the root, so autocreate it there to avoid scattering redunadant autocreated tags around the tree. (This is probably not ideal.) Also renamed the tagpage and taglink functions for clarity.
| * | | | | | | call gentag for taglinks tooJoey Hess2010-04-17
| | | | | | | |
| * | | | | | | fix autofile callJoey Hess2010-04-17
| | | | | | | |
| * | | | | | | tag_autocreate fixupsJoey Hess2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix style of prompt. Optional to rebuild when it is changed. (Needed to get new all missing tags)
| * | | | | | | document add_autofileJoey Hess2010-04-17
| | | | | | | |
| * | | | | | | refactor autofilesJoey Hess2010-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made add_autofile take a generator function, and just register the autofile, for later possible creation. The testing is moved into Render, which allows cleaning up some stuff.
| * | | | | | | whitespaceJoey Hess2010-04-17
| | | | | | | |
| * | | | | | | Merge remote branch 'davrieb/autotag' into autotagJoey Hess2010-04-17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: IkiWiki.pm IkiWiki/Plugin/tag.pm
| | * | | | | | | Make sure deleted tag pages don't get recreated.David Riebenbauer2010-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason to do this is basically a user interaction design decision. It is achieved by adding an entry, associated to the creating plugin, to %pagestate. To find out if files were deleted a new global hash %del_hash is %introduced.
| | * | | | | | | Revert "Revert the effects of find_del_files() for (re)autoadded files."David Riebenbauer2010-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31680111f0062f07727d14fcf291c98978ad5a2f.
| | * | | | | | | Check for existence off srcfile in add_autofileDavid Riebenbauer2010-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_autofile has to have checks, whether to create the file, anyway, so this will make things more consistent. Correcter check for the result of verify_src_file(). Cosmetic rename of a variable $addfile to $autofile.
| | * | | | | | | fix bugs in `find_src_files()`.David Riebenbauer2010-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `_` to avoid superfluous stat. Check for `defined $file`, instead of just `$file`. Add spaces after commas. Change return values of `verify_src_file()` to not return the tainted filename. Rename `$f` to `$file_untainted in `verify_src_file()`. $f changes to `$file` in `find_src_files()`. This attempts to fix commit f3abeac919c4736429bd3362af6edf51ede8e7fe. For discussion see <http://ikiwiki.info/todo/auto-create_tag_pages_according_to_a_template/>
| | * | | | | | | Revert "Make srcfile() return undef, if the file isn't there."David Riebenbauer2010-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1bde208ec9b915db0187030c33450b5accb4892c.
| | * | | | | | | fix typo in autotag.tmplDavid Riebenbauer2010-02-02
| | | | | | | | |
| | * | | | | | | Export add_autofile() for use in Plugins.David Riebenbauer2010-02-02
| | | | | | | | |