This patch series rewrite the interactive rebase from shell to C.
It is based on master (as of 2018-07-24).
Changes since v3:
- The `--verbose` option is stored directly into opts.verbose
- Drop includes in rebase-interactive.h
- skip_unnecessary_picks() now returns an object_id instead of a string
- Add a test case to ensure interactive rebase aborts when the todo
list only has commented-out commands
- complete_action() aborts when the todo list only has commented-out
commands
- Drop the `keep_empty` parameter of complete_action()
- Don’t remove the modes `--shorten-oids` and `--expand-oids` from
git-rebase--helper
- Replace `ret = !!x(); return ret` by `ret = x(); return !!ret`
- Fail if `--make-script` is provided with two arguments instead of
one
- Rewrite write_basic_state() and init_basic_state() in C
- Rewrite git-rebase--interactive.sh as a builtin
Alban Gruin (20):
sequencer: make two functions and an enum from sequencer.c public
rebase -i: rewrite append_todo_help() in C
editor: add a function to launch the sequence editor
rebase -i: rewrite the edit-todo functionality in C
sequencer: add a new function to silence a command, except if it fails
rebase -i: rewrite setup_reflog_action() in C
rebase -i: rewrite checkout_onto() in C
sequencer: refactor append_todo_help() to write its message to a
buffer
sequencer: change the way skip_unnecessary_picks() returns its result
t3404: todo list with commented-out commands only aborts
rebase -i: rewrite complete_action() in C
rebase -i: remove unused modes and functions
rebase -i: implement the logic to initialize $revisions in C
rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in
C
rebase -i: rewrite write_basic_state() in C
rebase -i: rewrite init_basic_state() in C
rebase -i: implement the main part of interactive rebase as a builtin
rebase--interactive2: rewrite the submodes of interactive rebase in C
rebase -i: remove git-rebase--interactive.sh
rebase -i: move rebase--helper modes to rebase--interactive
.gitignore | 1 -
Makefile | 5 +-
builtin.h | 1 +
builtin/rebase--helper.c | 88 ----------
builtin/rebase--interactive.c | 264 ++++++++++++++++++++++++++++
cache.h | 1 +
editor.c | 27 ++-
git-rebase--interactive.sh | 283 ------------------------------
git-rebase--preserve-merges.sh | 10 +-
git-rebase.sh | 47 ++++-
git.c | 2 +-
rebase-interactive.c | 96 ++++++++++
rebase-interactive.h | 8 +
sequencer.c | 311 +++++++++++++++++++++++++++------
sequencer.h | 19 +-
strbuf.h | 2 +
t/t3404-rebase-interactive.sh | 10 ++
17 files changed, 729 insertions(+), 446 deletions(-)
delete mode 100644 builtin/rebase--helper.c
create mode 100644 builtin/rebase--interactive.c
delete mode 100644 git-rebase--interactive.sh
create mode 100644 rebase-interactive.c
create mode 100644 rebase-interactive.h
--
2.18.0
