undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase-interactive: append_todo_help() changes

Browse Source 
This moves the writing of the comment "Rebase $shortrevisions onto
$shortonto ($command_count commands)" from todo_list_write_to_file() to
append_todo_help().

shortrevisions, shortonto, and command_count are passed as parameters to
append_todo_help().

During the initial edit of the todo list, shortrevisions and shortonto
are not NULL.  Therefore, if shortrevisions or shortonto is NULL, then
edit_todo would be true, otherwise it would be false.  Thus, edit_todo
is removed from the parameters of append_todo_help().

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alban Gruin 2019-03-05 20:18:02 +01:00 committed by Junio C Hamano
parent ddb81e5072
commit af1fc3adc5
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rebase-interactive.c
View File

@ -28,7 +28,8 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
return MISSING_COMMIT_CHECK_IGNORE; return MISSING_COMMIT_CHECK_IGNORE;
} }
void append_todo_help(unsigned edit_todo, unsigned keep_empty, void append_todo_help(unsigned keep_empty, int command_count,
const char *shortrevisions, const char *shortonto,
struct strbuf *buf) struct strbuf *buf)
{ {
const char *msg = _("\nCommands:\n" const char *msg = _("\nCommands:\n"
@ -48,6 +49,15 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty,
". specified). Use -c <commit> to reword the commit message.\n" ". specified). Use -c <commit> to reword the commit message.\n"
"\n" "\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"); "These lines can be re-ordered; they are executed from top to bottom.\n");
unsigned edit_todo = !(shortrevisions && shortonto);
if (!edit_todo) {
strbuf_addch(buf, '\n');
strbuf_commented_addf(buf, Q_("Rebase %s onto %s (%d command)",
"Rebase %s onto %s (%d commands)",
command_count),
shortrevisions, shortonto, command_count);
}
strbuf_add_commented_lines(buf, msg, strlen(msg)); strbuf_add_commented_lines(buf, msg, strlen(msg));

3
rebase-interactive.h
View File

@ -5,7 +5,8 @@ struct strbuf;
struct repository; struct repository;
struct todo_list; struct todo_list;
void append_todo_help(unsigned edit_todo, unsigned keep_empty, void append_todo_help(unsigned keep_empty, int command_count,
const char *shortrevisions, const char *shortonto,
struct strbuf *buf); struct strbuf *buf);
int edit_todo_list(struct repository *r, unsigned flags); int edit_todo_list(struct repository *r, 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);

17
sequencer.c
View File

@ -4619,22 +4619,13 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
const char *file, const char *shortrevisions, const char *file, const char *shortrevisions,
const char *shortonto, int num, unsigned flags) const char *shortonto, int num, unsigned flags)
{ {
int edit_todo = !(shortrevisions && shortonto), res; int res;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
todo_list_to_strbuf(r, todo_list, &buf, num, flags); todo_list_to_strbuf(r, todo_list, &buf, num, flags);
if (flags & TODO_LIST_APPEND_TODO_HELP)
if (flags & TODO_LIST_APPEND_TODO_HELP) { append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list),
int command_count = count_commands(todo_list); shortrevisions, shortonto, &buf);
if (!edit_todo) {
strbuf_addch(&buf, '\n');
strbuf_commented_addf(&buf, Q_("Rebase %s onto %s (%d command)",
"Rebase %s onto %s (%d commands)",
command_count),
shortrevisions, shortonto, command_count);
}
append_todo_help(edit_todo, flags & TODO_LIST_KEEP_EMPTY, &buf);
}
res = write_message(buf.buf, buf.len, file, 0); res = write_message(buf.buf, buf.len, file, 0);
strbuf_release(&buf); strbuf_release(&buf);