From 5034d7f456a5f0a0dd77834ddade415616fec11c Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sat, 21 Jan 2012 16:47:16 -0500 Subject: [PATCH 1/5] comment - index attachments --- doc/forum/index_attachments/comment_4._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/index_attachments/comment_4._comment diff --git a/doc/forum/index_attachments/comment_4._comment b/doc/forum/index_attachments/comment_4._comment new file mode 100644 index 000000000..1a2726290 --- /dev/null +++ b/doc/forum/index_attachments/comment_4._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="jerojasro" + nickname="jerojasro" + subject="RE: comment 1" + date="2012-01-21T21:44:00" + content=""" +[[Michal]], that's not a bad idea IMO, but we would lose some [[searching +keywords|ikiwiki/searching]] and would also index structural elements +(navigation text, and so on) +"""]] From 4ddcd8a0b7ec44bcac7d7b82530ede7cf2ab0395 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI" Date: Sun, 22 Jan 2012 02:19:19 -0400 Subject: [PATCH 2/5] for rcs_remove(), there's no new file --- doc/plugins/write.mdwn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 9a5ca60a0..dcab041dc 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1110,9 +1110,7 @@ to version control; the subdir can be added if so. Remove a file. The filename is relative to the root of the srcdir. Note that this should not commit the removal, it should only prepare for it -to be committed when `rcs_commit` (or `rcs_commit_staged`) is called. Note -that the new file may be in a new subdir that is not yet in version -control; the subdir can be added if so. +to be committed when `rcs_commit` (or `rcs_commit_staged`) is called. #### `rcs_rename($$)` From af29b004d5aa086b28097b73c5efae233bf9b6e3 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 22 Jan 2012 10:42:01 -0500 Subject: [PATCH 3/5] point to my branch, wrap lines, working on test coverage now --- doc/rcs/cvs.mdwn | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/doc/rcs/cvs.mdwn b/doc/rcs/cvs.mdwn index 9beb08ece..a0ee5ab60 100644 --- a/doc/rcs/cvs.mdwn +++ b/doc/rcs/cvs.mdwn @@ -1,13 +1,17 @@ -If you really need to, you can use [[!wikipedia desc="CVS" Concurrent Versions System]] -with ikiwiki. +[[!template id=gitbranch branch=schmonz/cvs author="[[schmonz]]"]] + +If you really need to, you can use [[!wikipedia desc="CVS" Concurrent +Versions System]] with ikiwiki. ### Usage 7. Install [[!cpan File::chdir]], [[!cpan File::ReadBackwards]], -[cvsps](http://www.cobite.com/cvsps/), and -[cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like. + [cvsps](http://www.cobite.com/cvsps/), and + [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like. 7. Adjust CVS-related parameters in your setup file. -Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one: +Consider creating `$HOME/.cvsrc` if you don't have one already; the +plugin doesn't need it, but you yourself might. Here's a good +general-purpose one: cvs -q checkout -P @@ -17,12 +21,25 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn ### Implementation details * [[ikiwiki-makerepo]]: - * creates a repository, - * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS), - * configures the post-commit hook in `CVSROOT/loginfo`. + * creates a repository, + * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag + IKIWIKI, release tag PRE_CVS), + * configures the post-commit hook in `CVSROOT/loginfo`. ### To do -* Have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce commits into changesets. Reasons: - 7. Obviates the need to scrape the repo's complete history to determine the last N changesets. (Repositories without such records can fall back on the `cvsps` and `File::ReadBackwards` code.) - 7. Arranges for ikiwiki to be run once per changeset, rather than CVS's once per committed file (!), which is a waste at best and bug-inducing at worst. (Currently, on multi-directory commits, only the first directory's changes get mentioned in [[recentchanges|plugins/recentchanges]].) -* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't. +* Expand test coverage and fix bugs. +* Have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and + `commit_prep` scripts that coalesce commits into changesets. Reasons: + 7. Obviates the need to scrape the repo's complete history to + determine the last N changesets. (Repositories without such + records can fall back on the `cvsps` and `File::ReadBackwards` + code.) + 7. Arranges for ikiwiki to be run once per changeset, rather + than CVS's once per committed file (!), which is a waste at + best and bug-inducing at worst. (Currently, on multi-directory + commits, only the first directory's changes get mentioned + in [[recentchanges|plugins/recentchanges]].) +* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` + (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks + to the CVS metadata directory, the attempt will fail anyway (and + much more confusingly) if we don't. From f9ff7c7aaeeae9d9c5cde5dedf33b6b7c60ecadc Mon Sep 17 00:00:00 2001 From: test Date: Sun, 22 Jan 2012 14:55:54 -0400 Subject: [PATCH 4/5] --- doc/sandbox/Test_it.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/Test_it.mdwn diff --git a/doc/sandbox/Test_it.mdwn b/doc/sandbox/Test_it.mdwn new file mode 100644 index 000000000..5478d7a67 --- /dev/null +++ b/doc/sandbox/Test_it.mdwn @@ -0,0 +1 @@ +Test it just now! From 19280af1824d37c9237636c0b24772c79372b0cc Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 22 Jan 2012 20:39:12 -0500 Subject: [PATCH 5/5] pull request (no functional change, just worried I broke easy merging) --- doc/rcs/cvs/discussion.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 645b2388b..2df2c1317 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -147,3 +147,15 @@ short and clear as possible. --[[schmonz]] > that. --[[Joey]] >> Done. --[[schmonz]]. + +---- + +I'm attempting to bring some polish to this plugin, starting with +fuller test coverage. In preparation, I've refactored the tests a +bunch (and shuffled the code a bit) in my branch. I'm worried, +however, that my misunderstanding of `git rebase` may have made my +branch harder for you to pull. + +Before I go writing a whole swack of test cases, could you merge +my latest? Through at least ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a +there should be no functional change. --[[schmonz]]