todo_list_check() works by checking if every commit in old_todo (the
backup list) is also present in new_todo (the todo list to check).
This works only when no commits have been picked (ie. right after the
initial edit). In other cases, the backup list will contain one or
several commits that have been applied and are no longer in the todo
list. Let's take this todo list, for instance:
pick 123abc An interesting change
break
pick cba321 A boring change
After executing the `break' command, the backup list will contain the
original todo list, while the todo list will only contain the last
`pick' insn. Even if commit 123abc has been picked up, in this case,
todo_list_check() will fail because it is not part of the todo list.
There is another list containing every command that have been executed:
the "done" list. In our example, after the `break' command, the "done"
list will contain the first commit (123abc). Comparing the backup list
against the todo list and the done list will fix this problem.
This changes todo_list_check() to compare old_todo against new_todo
_and_ the done list. This should be useful to check the todo list when
resuming a rebase or reloading the todo list after an `exec' command,
but not for `--edit-todo' (the todo list is copied before edition).
But, for the sake of safety, it is still done in the next commit.
This also adds a function, todo_list_check_against_backup(), to load the
done list and the backup list, and call todo_list_check().
Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx>
---
rebase-interactive.c | 57 ++++++++++++++++++++++++++++++++++++++------
rebase-interactive.h | 6 ++++-
sequencer.c | 4 ++--
3 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/rebase-interactive.c b/rebase-interactive.c
index aa18ae82b7..c7dea85553 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -6,6 +6,8 @@
#include "commit-slab.h"
#include "config.h"
+static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done")
+
enum missing_commit_check_level {
MISSING_COMMIT_CHECK_IGNORE = 0,
MISSING_COMMIT_CHECK_WARN,
@@ -124,13 +126,27 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
}
define_commit_slab(commit_seen, unsigned char);
+
+static void mark_commits_as_seen(struct commit_seen *commit_seen,
+ struct todo_list *list)
+{
+ int i;
+
+ for (i = 0; i < list->nr; i++) {
+ struct commit *commit = list->items[i].commit;
+ if (commit)
+ *commit_seen_at(commit_seen, commit) = 1;
+ }
+}
+
/*
* Check if the user dropped some commits by mistake
* Behaviour determined by rebase.missingCommitsCheck.
* Check if there is an unrecognized command or a
* bad SHA-1 in a command.
*/
-int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
+int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo,
+ struct todo_list *done)
{
enum missing_commit_check_level check_level = get_missing_commit_check_level();
struct strbuf missing = STRBUF_INIT;
@@ -142,12 +158,11 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
if (check_level == MISSING_COMMIT_CHECK_IGNORE)
goto leave_check;
- /* Mark the commits in git-rebase-todo as seen */
- for (i = 0; i < new_todo->nr; i++) {
- struct commit *commit = new_todo->items[i].commit;
- if (commit)
- *commit_seen_at(&commit_seen, commit) = 1;
- }
+ /* Mark the commits in git-rebase-todo and git-rebase-done as
+ seen */
+ mark_commits_as_seen(&commit_seen, new_todo);
+ if (done)
+ mark_commits_as_seen(&commit_seen, done);
/* Find commits in git-rebase-todo.backup yet unseen */
for (i = old_todo->nr - 1; i >= 0; i--) {
@@ -187,3 +202,31 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
clear_commit_seen(&commit_seen);
return res;
}
+
+int todo_list_check_against_backup(struct repository *r,
+ struct todo_list *todo_list)
+{
+ struct todo_list done = TODO_LIST_INIT, initial = TODO_LIST_INIT;
+ int res;
+
+ if (strbuf_read_file(&done.buf, rebase_path_done(), 0) < 0 && errno != ENOENT)
+ return error(_("could not read '%s'"), rebase_path_done());
+
+ strbuf_read_file(&done.buf, rebase_path_done(), 0);
+ todo_list_parse_insn_buffer(r, done.buf.buf, &done);
+
+ if (strbuf_read_file(&initial.buf, rebase_path_todo_backup(), 0) < 0 &&
+ errno != ENOENT) {
+ todo_list_release(&done);
+ return error(_("could not read '%s'"), rebase_path_done());
+ }
+
+ todo_list_parse_insn_buffer(r, initial.buf.buf, &initial);
+
+ res = todo_list_check(&initial, todo_list, &done);
+
+ todo_list_release(&done);
+ todo_list_release(&initial);
+
+ return res;
+}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index 44dbb06311..ac401cda25 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -11,6 +11,10 @@ void append_todo_help(unsigned keep_empty, int command_count,
int edit_todo_list(struct repository *r, struct todo_list *todo_list,
struct todo_list *new_todo, const char *shortrevisions,
const char *shortonto, unsigned flags);
-int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
+
+int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo,
+ struct todo_list *done);
+int todo_list_check_against_backup(struct repository *r,
+ struct todo_list *todo_list);
#endif
diff --git a/sequencer.c b/sequencer.c
index 3fb15ff8d9..0638c92f12 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4898,7 +4898,7 @@ int check_todo_list_from_file(struct repository *r)
if (!res)
res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
if (!res)
- res = todo_list_check(&old_todo, &new_todo);
+ res = todo_list_check(&old_todo, &new_todo, NULL);
if (res)
fprintf(stderr, _(edit_todo_list_advice));
out:
@@ -5008,7 +5008,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
}
if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) ||
- todo_list_check(todo_list, &new_todo)) {
+ todo_list_check(todo_list, &new_todo, NULL)) {
fprintf(stderr, _(edit_todo_list_advice));
checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
todo_list_release(&new_todo);
--
2.22.0
