Add a "rm -i" style interactive cleaning method. User must confirm one
by one before starting to delete.

Signed-off-by: Jiang Xin <worldhello....@gmail.com>
---
 builtin/clean.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/builtin/clean.c b/builtin/clean.c
index 3b07f..f36ad 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -659,6 +659,40 @@ int edit_by_numbers_cmd()
        return 0;
 }
 
+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;
+}
+
 int quit_cmd()
 {
        string_list_clear(&del_list, 0);
@@ -673,6 +707,7 @@ 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"
@@ -691,6 +726,7 @@ void interactive_main_loop()
                        {'c', "clean",                  clean_cmd},
                        {'p', "edit by patterns",       edit_by_patterns_cmd},
                        {'n', "edit by numbers",        edit_by_numbers_cmd},
+                       {'i', "rm -i",                  rm_i_cmd},
                        {'q', "quit",                   quit_cmd},
                        {'h', "help",                   help_cmd},
                };
-- 
1.8.3.rc1.338.gb35aa5d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to