From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>,
Git List <git@vger.kernel.org>
Cc: Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v10 12/14] git-clean: add ask each interactive action
Date: Thu, 16 May 2013 17:53:43 +0800 [thread overview]
Message-ID: <25323f98dce032c958c42ce106a6f18bd0f4d657.1368696028.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <cover.1368696028.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1368696028.git.worldhello.net@gmail.com>
Add a new action for interactive git-clean: ask each. It's just like
the "rm -i" command, that the user must confirm one by one for each
file or directory to be cleaned.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
builtin/clean.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 96a5bb..1c6315 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -710,6 +710,40 @@ static int select_by_numbers_cmd(void)
return 0;
}
+static int ask_each_cmd(void)
+{
+ 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, NULL, &buf);
+ 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, "yes", 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(void)
{
string_list_clear(&del_list, 0);
@@ -724,6 +758,7 @@ static int help_cmd(void)
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"select by numbers - select items to be deleted by numbers\n"
+ "ask each - confirm each deletion (like \"rm -i\")\n"
"quit - stop cleaning\n"
"help - this screen\n"
"? - help for prompt selection"
@@ -741,6 +776,7 @@ static void interactive_main_loop(void)
{'c', "clean", 0, clean_cmd},
{'f', "filter by pattern", 0, filter_by_patterns_cmd},
{'s', "select by numbers", 0, select_by_numbers_cmd},
+ {'a', "ask each", 0, ask_each_cmd},
{'q', "quit", 0, quit_cmd},
{'h', "help", 0, help_cmd},
};
--
1.8.3.rc1.407.g762149a
next prev parent reply other threads:[~2013-05-16 9:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 9:53 [PATCH v10 00/14] interactive git-clean Jiang Xin
2013-05-16 9:53 ` [PATCH v10 01/14] path.c: refactor relative_path(), not only strip prefix Jiang Xin
2013-05-16 9:53 ` [PATCH v10 02/14] quote.c: remove path_relative, use relative_path instead Jiang Xin
2013-05-16 9:53 ` [PATCH v10 03/14] Refactor quote_path_relative, remove unused params Jiang Xin
2013-05-16 9:53 ` [PATCH v10 04/14] Refactor write_name_quoted_relative, " Jiang Xin
2013-05-16 19:15 ` Junio C Hamano
2013-05-16 9:53 ` [PATCH v10 05/14] git-clean: refactor git-clean into two phases Jiang Xin
2013-05-16 9:53 ` [PATCH v10 06/14] git-clean: add support for -i/--interactive Jiang Xin
2013-05-16 9:53 ` [PATCH v10 07/14] git-clean: show items of del_list in columns Jiang Xin
2013-05-16 9:53 ` [PATCH v10 08/14] git-clean: add colors to interactive git-clean Jiang Xin
2013-05-16 9:53 ` [PATCH v10 09/14] git-clean: use a git-add-interactive compatible UI Jiang Xin
2013-05-16 19:29 ` Junio C Hamano
2013-05-16 19:39 ` Junio C Hamano
2013-05-16 9:53 ` [PATCH v10 10/14] git-clean: add filter by pattern interactive action Jiang Xin
2013-05-16 9:53 ` [PATCH v10 11/14] git-clean: add select by numbers " Jiang Xin
2013-05-16 9:53 ` Jiang Xin [this message]
2013-05-16 9:53 ` [PATCH v10 13/14] git-clean: add documentation for interactive git-clean Jiang Xin
2013-05-16 9:53 ` [PATCH v10 14/14] test: add t7301 for git-clean--interactive Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25323f98dce032c958c42ce106a6f18bd0f4d657.1368696028.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).