From: Alban Gruin <alban.gruin@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: ag/sequencer-reduce-rewriting-todo, was Re: What's cooking in git.git (Dec 2018, #02; Fri, 28)
Date: Fri, 28 Dec 2018 20:21:48 +0100 [thread overview]
Message-ID: <202be141-cc57-cf2a-dc15-59647e7bca09@gmail.com> (raw)
In-Reply-To: <xmqqh8explya.fsf@gitster-ct.c.googlers.com>
Hi Junio,
Le 28/12/2018 à 19:04, 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
> . 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
> . 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.
>
>
Most of these topics have reached master and have been released in git
2.20. Currently, there is four topics actually touching rebase,
interactive rebase and/or the sequencer (js/rebase-i-redo-exec,
nd/backup-log, en/rebase-merge-on-sequencer and nd/the-index). Among
these, only nd/the-index conflicts with my series.
Should I consider this comment as outdated, and reroll my series
(rebased on top of nd/the-index) in the next few days?
Cheers,
Alban
next prev parent reply other threads:[~2018-12-28 19:22 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 18:04 What's cooking in git.git (Dec 2018, #02; Fri, 28) Junio C Hamano
2018-12-28 18:23 ` Elijah Newren
2019-01-03 13:27 ` Johannes Schindelin
2019-01-07 17:13 ` Elijah Newren
2018-12-28 19:21 ` Alban Gruin [this message]
2018-12-28 20:28 ` ag/sequencer-reduce-rewriting-todo, was " Junio C Hamano
2018-12-29 12:08 ` Denton Liu
2019-01-03 13:23 ` ps/stash-in-c, was " Johannes Schindelin
2019-01-06 16:39 ` jk/loose-object-cache René Scharfe
2019-01-06 16:45 ` [PATCH 1/3] object-store: factor out odb_loose_cache() René Scharfe
2019-01-07 8:27 ` Jeff King
2019-01-07 13:26 ` René Scharfe
2019-01-07 17:29 ` René Scharfe
2019-01-07 11:27 ` Philip Oakley
2019-01-07 12:30 ` Jeff King
2019-01-07 13:11 ` René Scharfe
2019-01-06 16:45 ` [PATCH 2/3] object-store: factor out odb_clear_loose_cache() René Scharfe
2019-01-06 16:45 ` [PATCH 3/3] object-store: use one oid_array per subdirectory for loose cache René Scharfe
2019-01-06 20:38 ` Ævar Arnfjörð Bjarmason
2019-01-06 22:58 ` René Scharfe
2019-01-07 8:31 ` [PATCH 0/11] jk/loose-object-cache sha1/object_id fixups Jeff King
2019-01-07 8:33 ` [PATCH 01/11] sha1-file: fix outdated sha1 comment references Jeff King
2019-01-07 8:34 ` [PATCH 02/11] update comment references to sha1_object_info() Jeff King
2019-01-07 8:34 ` [PATCH 03/11] http: use struct object_id instead of bare sha1 Jeff King
2019-01-07 8:35 ` [PATCH 04/11] sha1-file: modernize loose object file functions Jeff King
2019-01-07 8:37 ` [PATCH 05/11] sha1-file: modernize loose header/stream functions Jeff King
2019-01-07 8:37 ` [PATCH 06/11] sha1-file: convert pass-through functions to object_id Jeff King
2019-01-07 8:37 ` [PATCH 07/11] convert has_sha1_file() callers to has_object_file() Jeff King
2019-01-07 8:39 ` [PATCH 08/11] sha1-file: drop has_sha1_file() Jeff King
2019-01-07 8:39 ` [PATCH 09/11] sha1-file: prefer "loose object file" to "sha1 file" in messages Jeff King
2019-01-07 8:39 ` [PATCH 10/11] sha1-file: avoid "sha1 file" for generic use " Jeff King
2019-01-07 8:40 ` [PATCH 11/11] prefer "hash mismatch" to "sha1 mismatch" Jeff King
2019-01-08 16:40 ` [PATCH 0/11] jk/loose-object-cache sha1/object_id fixups René Scharfe
2019-01-08 17:39 ` Junio C Hamano
2019-01-08 18:05 ` Jeff King
2019-01-08 18:07 ` Junio C Hamano
2019-01-08 18:27 ` Derrick Stolee
2019-01-08 18:52 ` Junio C Hamano
2019-01-08 21:16 ` Jeff King
2019-01-09 21:37 ` Stefan Beller
2019-01-09 22:42 ` Stefan Beller
2019-01-10 6:17 ` Jeff King
2019-01-07 17:29 ` [PATCH 4/3] object-store: retire odb_load_loose_cache() René Scharfe
2019-01-07 19:32 ` Junio C Hamano
2019-01-07 19:29 ` jk/loose-object-cache Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202be141-cc57-cf2a-dc15-59647e7bca09@gmail.com \
--to=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.