Add a "rm -i" style interactive cleaning method. User must confirm one by one before starting to delete. Signed-off-by: Jiang Xin <worldhello.net@xxxxxxxxx> --- builtin/clean.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/builtin/clean.c b/builtin/clean.c index 75e37..5bb36 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -721,6 +721,40 @@ static int edit_by_numbers_cmd() return 0; } +static int rm_i_cmd() +{ + struct strbuf confirm = STRBUF_INIT; + struct strbuf buf = STRBUF_INIT; + struct string_list_item *item; + const char *qname; + int changed = 0, eof = 0; + + for_each_string_list_item(item, &del_list) { + /* Ctrl-D should stop removing files */ + if (!eof) { + qname = quote_path_relative(item->string, -1, &buf, *the_prefix); + printf(_("remove %s ? "), qname); + if (strbuf_getline(&confirm, stdin, '\n') != EOF) { + strbuf_trim(&confirm); + } else { + putchar('\n'); + eof = 1; + } + } + if (!confirm.len || !strncasecmp(confirm.buf, "no", confirm.len)) { + *item->string = '\0'; + changed++; + } + } + + if (changed) + string_list_remove_empty_items(&del_list, 0); + + strbuf_release(&buf); + strbuf_release(&confirm); + return MENU_RETURN_NO_LOOP; +} + static int quit_cmd() { string_list_clear(&del_list, 0); @@ -735,6 +769,7 @@ static int help_cmd(int x) "clean - start cleaning\n" "edit by patterns - exclude items from deletion\n" "edit by numbers - select items to be deleted by numbers\n" + "rm -i - delete items one by one, like \"rm -i\"\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" @@ -753,6 +788,7 @@ static void interactive_main_loop() {'c', "clean", 0, clean_cmd}, {'p', "edit by patterns", 0, edit_by_patterns_cmd}, {'n', "edit by numbers", 0, edit_by_numbers_cmd}, + {'i', "rm -i", 0, rm_i_cmd}, {'q', "quit", 0, quit_cmd}, {'h', "help", 0, help_cmd}, }; -- 1.8.3.rc1.341.g1c24ab7 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html