diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-05 11:29:44 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-05 11:29:44 -0400 |
commit | 06b28dddecce8d27c0b556c883b8721aee1d3dc9 (patch) | |
tree | 69451a53b452729420a1674535d934eaebb89d77 /doc/todo/web_reversion.mdwn | |
parent | fe582418d21f8b619db872b84bc718459325bd15 (diff) | |
parent | 46a98c8a4d72e8be0fd5e683a83745d529b2c3c3 (diff) |
Merge branch 'master' into revert
Conflicts:
doc/todo/web_reversion.mdwn
Diffstat (limited to 'doc/todo/web_reversion.mdwn')
-rw-r--r-- | doc/todo/web_reversion.mdwn | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 9e5880558..33fa79aad 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -66,8 +66,26 @@ 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. Issues ->>> I noticed but have not gotten to: +>>> 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]] >>> >>> * `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 +>>> 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.. +>>>> 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]] |