On Wed, May 25 2022, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Absolutely. I wonder how involved is would be to revert the merge >> of the whole thing from 'master'. It may give us a clean slate to >> rethink the whole mess and redo it without breaking the existing >> users' hooks. > > I tried the revert, and the result compiled and tested OK, but I am > tempted to say that it looks as if the topic was deliberately > designed to make it hard to revert by taking as much stuff hostage > as possible. No, it's just that... > At least one fix that depends on the run_hooks_opt structure > introduced by c70bc338 (Merge branch 'ab/config-based-hooks-2', > 2022-02-09) needs to be discarded. 7431379a (Merge branch > 'ab/racy-hooks', 2022-03-16) did address an issue worth addressing, ...we've made some use of the API since then, including for that bug fix... > so even if we revert the whole c70bc338, we would want to redo the > fix, possibly in some other way. But it also needed an "oops that > was wrong, here is an attempt to fix it again" by cb3b3974 (Merge > branch 'ab/racy-hooks', 2022-03-30). The situation is quite ugly. ...although for that last one if you're considering reverting that fix too to back out of the topic(s) it should be relatively easy to deal with that one. > As you hinted in the message I responded to in the message I am > responding to, if we can make a surgical fix to make the new and > improved run_hooks_opt() API build on top of run_command(), instead > on top of run_processes_parallel(), that would give us a cleaner way > out than discarding everything and redoing them "the right way". At > least, the external interface into the API (read: the impression you > would get by "less hook.h") does not look too bad. I have a pending re-roll of this topic structured the way it is now (but with fixes for outstanding issues). I understand your suggestion here to use the non-parallel API, and the reluctance to have a relatively large regression fix. I haven't come up with a patch in this direction, and I'll try before a re-roll, but I can't see how we wouldn't end up with code that's an even larger logical change as a result. I.e. this would require rewriting a large part of hook.[ch] which is currently structured around the callback API, and carefully coming up with the equivalent non-parallel API pattern for it. Whereas the current direction is more boilerplate for sure, but keeps all of that existing behavior, and just narrowly adjust what options we pass down to the "struct child_process" in that case. I can try to come up with it (and delay the current re-roll I have that's almost ready), but I really think that reviewing such a change will be much harder. The current proposal is large by line count, but it's relatively easy to skim it and assure oneself that a new parameter is being passed in, and that all the proposed behavior change applies only to the one caller that passes in that new parameter. Whereas switching to a new non-callback based API will require carefully going over the parallel API line-by-line, assuring oneself that the non-callback version is really doing the same thing etc.
