Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)
- From
Alban Gruin <alban.gruin@gmail.com>
- Date
- Dec 16, 2018, 21:48 UTC
- Message-ID
- <fcc4ad0b-5566-165c-f20d-8a09ce659112@gmail.com>
- In-Reply-To
- <xmqq8t0z3xcc.fsf@gitster-ct.c.googlers.com>
Hi Junio,
Le 09/12/2018 à 09:42, Junio C Hamano a écrit :> -%<-
> * ag/sequencer-reduce-rewriting-todo (2018-11-12) 16 commits > . rebase--interactive: move transform_todo_file() to
rebase--interactive.c
Show 10 quoted lines
> . sequencer: fix a call to error() in transform_todo_file() > . sequencer: use edit_todo_list() in complete_action() > . rebase-interactive: rewrite edit_todo_list() to handle the initial edit > . rebase-interactive: append_todo_help() changes > . rebase-interactive: use todo_list_write_to_file() in edit_todo_list() > . sequencer: refactor skip_unnecessary_picks() to work on a todo_list > . sequencer: change complete_action() to use the refactored functions > . sequencer: make sequencer_make_script() write its script to a strbuf > . sequencer: refactor rearrange_squash() to work on a todo_list > . sequencer: refactor sequencer_add_exec_commands() to work on a
todo_list
Show 16 quoted lines
> . sequencer: refactor check_todo_list() to work on a todo_list > . sequencer: introduce todo_list_write_to_file() > . sequencer: refactor transform_todos() to work on a todo_list > . sequencer: make the todo_list structure public > . sequencer: changes in parse_insn_buffer() > > The scripted version of "git rebase -i" wrote and rewrote the todo > list many times during a single step of its operation, and the > recent C-rewrite made a faithful conversion of the logic to C. The > implementation has been updated to carry necessary information > around in-core to avoid rewriting the same file over and over > unnecessarily. > > With too many topics in-flight that touch sequencer and rebaser, > this need to wait giving precedence to other topics that fix bugs. >
If I’m not mistaken, there is currently 3 others series touching rebase, rebase-interactive and/or the sequencer: en/rebase-merge-on-sequencer, nd/the-index, and the new js/rebase-i-redo-exec. Among these, I believe only nd/the-index actually touches the same places as ag/sequencer-reduce-rewriting-todo, and is not a behaviour change.
Is this safe to reroll this in the next few days?
-- Alban