From a99790e5ec38afe4d591ba27d984b367c098d5d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:58:55 -0400 Subject: second review pass and I have a revert branch now --- doc/todo/web_reversion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc/todo') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 34947b710..e0c6ebdf1 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -65,3 +65,20 @@ Peter Gammie has done an initial implementation of the above. >> gets used to check whether attachments are allowed -- there really should be a hook for that. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] + +>>> I have made my own revert branch and put a few fixes in there +>>> (and fixed all the indention..). Issues I noticed but have not gotten +>>> to: --[[Joey]] +>>> +>>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>> * Would it be better for `rcs_revert` to not commit, and +>>> `rcs_commit_staged` to then be used? This would work for git, but +>>> maybe other RCSs would be problimatic. It would simplifiy the +>>> interface and allow for future mulitple-revert interfaces. +>>> * I quite don't understand why one caller of `git_parse_changes` +>>> needs it to chdir, and not the other one. It's running +>>> in the same git repo either way, and git doesn't need +>>> `git show` to run in a subdir at all.. +>>> * Probably needs to untaint the revs passed in. +>>> * Seems backwards for `rcs_preprevert` to import and +>>> use `IkiWiki::Receive`. -- cgit v1.2.3 From 3f104d1eb7cc15dec0d3a7a67db85fbe63484281 Mon Sep 17 00:00:00 2001 From: PeteG Date: Tue, 5 Oct 2010 02:30:25 +0000 Subject: --- doc/todo/web_reversion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/todo') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index e0c6ebdf1..900d98591 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -69,8 +69,11 @@ Peter Gammie has done an initial implementation of the above. >>> I have made my own revert branch and put a few fixes in there >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] +>>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] >>> >>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]] + >>> * Would it be better for `rcs_revert` to not commit, and >>> `rcs_commit_staged` to then be used? This would work for git, but >>> maybe other RCSs would be problimatic. It would simplifiy the @@ -79,6 +82,9 @@ Peter Gammie has done an initial implementation of the above. >>> needs it to chdir, and not the other one. It's running >>> in the same git repo either way, and git doesn't need >>> `git show` to run in a subdir at all.. +>>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] + >>> * Probably needs to untaint the revs passed in. >>> * Seems backwards for `rcs_preprevert` to import and >>> use `IkiWiki::Receive`. +>>>> Indeed. This is saying that the checking code in IkiWiki::Receive is in the wrong place. I think it would be better to set up some general hooks and shuffle it into a plugin, for then other plugins that maintain special files in the repo can have a say about validity. -- [[peteg]] -- cgit v1.2.3 From b02081b6f7de340372100227efc4b97d494b170f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 13:33:36 +0000 Subject: Added link to git repository with support for inlining raw files. --- doc/todo/inline_raw_files.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/inline_raw_files.mdwn (limited to 'doc/todo') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn new file mode 100644 index 000000000..0e0f0c298 --- /dev/null +++ b/doc/todo/inline_raw_files.mdwn @@ -0,0 +1,16 @@ +summary +======= + +Extend inlining to handle raw files (files with unrecognized extensions). + +Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. + +I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. + +[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ + +usage +===== + + \[[!inline pagenames="somefile.txt" template="raw" feeds="no"]] -- cgit v1.2.3 From 267d2ce476756335142424b34fe4341081a67f36 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:02:03 +0000 Subject: Use wtk's github branch instead of drexel.edu branch. --- doc/todo/inline_raw_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/todo') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 0e0f0c298..2968bad40 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -7,7 +7,7 @@ Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. -[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From 421de42c2a09d8e933dd25581333afa09c56ff15 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:08:23 +0000 Subject: Add gitbranch template to inline_raw_files.mdwn. --- doc/todo/inline_raw_files.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc/todo') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 2968bad40..b5a525ac0 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -1,13 +1,14 @@ +[[!template id=gitbranch branch=wtk/master author="[[wtk]]"]] + summary ======= Extend inlining to handle raw files (files with unrecognized extensions). -Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. +Also raise an error in `IkiWiki::pagetype($file)` if `$file` is blank, which avoids trying to do much with missing files, etc. -I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. +I'm using the new code in my [blog][]. -[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From 46a98c8a4d72e8be0fd5e683a83745d529b2c3c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Oct 2010 11:22:51 -0400 Subject: add pointer to my branch --- doc/todo/web_reversion.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/todo') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 900d98591..33fa79aad 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -67,6 +67,7 @@ Peter Gammie has done an initial implementation of the above. >> Please look it over and tell me what else needs fixing... -- [[peteg]] >>> I have made my own revert branch and put a few fixes in there +>>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] -- cgit v1.2.3