X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/082649f8698c5ca71aad504384f6aa4724420a8e..58a0698d921efe0daa932599515f6b41b2da4044:/doc/todo/web_reversion.mdwn?ds=sidebyside

diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index e0c6ebdf1..7cb412f79 100644
--- a/doc/todo/web_reversion.mdwn
+++ b/doc/todo/web_reversion.mdwn
@@ -55,7 +55,6 @@ Peter Gammie has done an initial implementation of the above.
 > (The data from `rcs_preprevert` could also be used for a confirmation
 > prompt -- it doesn't currently include enough info for diffs, but at
 > least could have a list of changed files.)
->> I added `rcs_showpatch` which simply yields the output of `git show <patch-id>`. -- [[peteg]]
 >
 > Note that it's possible for a git repo to have commits that modify wiki
 > files in a subdir, and code files elsewhere. `rcs_preprevert` should
@@ -67,10 +66,11 @@ 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]] 
->>>
->>> * `rcs_diff` already exists; why add `rcs_showpatch`?
+>>>> Please change the git pointer above, then. I will work on your branch. -- [[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 +79,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]]