From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>
Cc: Git List <git@vger.kernel.org>, Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v15 13/16] git-clean: add ask each interactive action
Date: Tue, 25 Jun 2013 23:53:54 +0800 [thread overview]
Message-ID: <932e2efee70dadb893dcd8498d7da17f68eb9d96.1372175283.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <cover.1372175282.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1372175282.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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/clean.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 643a5e..bf03a 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -717,6 +717,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);
@@ -731,6 +765,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"
@@ -748,6 +783,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.1.756.g2e9b71f
next prev parent reply other threads:[~2013-06-25 15:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-25 15:53 [PATCH v15 00/16] Interactive git clean Jiang Xin
2013-06-25 15:53 ` [PATCH v15 01/16] test: add test cases for relative_path Jiang Xin
2013-06-26 17:44 ` Junio C Hamano
2013-06-27 1:00 ` Jiang Xin
2013-06-25 15:53 ` [PATCH v15 02/16] path.c: refactor relative_path(), not only strip prefix Jiang Xin
2013-06-26 17:44 ` Junio C Hamano
2013-06-27 3:31 ` Jiang Xin
2013-06-25 15:53 ` [PATCH v15 03/16] quote.c: substitute path_relative with relative_path Jiang Xin
2013-06-26 17:44 ` Junio C Hamano
2013-06-25 15:53 ` [PATCH v15 04/16] Refactor quote_path_relative, remove unused params Jiang Xin
2013-06-26 17:47 ` Junio C Hamano
2013-06-27 1:47 ` Jiang Xin
2013-06-25 15:53 ` [PATCH v15 05/16] Refactor write_name_quoted_relative, " Jiang Xin
2013-06-25 15:53 ` [PATCH v15 06/16] git-clean: refactor git-clean into two phases Jiang Xin
2013-06-25 15:53 ` [PATCH v15 07/16] git-clean: add support for -i/--interactive Jiang Xin
2013-06-25 15:53 ` [PATCH v15 08/16] git-clean: show items of del_list in columns Jiang Xin
2013-06-25 15:53 ` [PATCH v15 09/16] git-clean: add colors to interactive git-clean Jiang Xin
2013-06-25 15:53 ` [PATCH v15 10/16] git-clean: use a git-add-interactive compatible UI Jiang Xin
2013-06-25 15:53 ` [PATCH v15 11/16] git-clean: add filter by pattern interactive action Jiang Xin
2013-06-25 15:53 ` [PATCH v15 12/16] git-clean: add select by numbers " Jiang Xin
2013-06-25 15:53 ` Jiang Xin [this message]
2013-06-25 15:53 ` [PATCH v15 14/16] git-clean: add documentation for interactive git-clean Jiang Xin
2013-06-25 15:53 ` [PATCH v15 15/16] test: add t7301 for git-clean--interactive Jiang Xin
2013-06-25 15:53 ` [PATCH v15 16/16] test: run testcases with POSIX absolute paths on Windows Jiang Xin
2013-06-26 18:03 ` [PATCH v15 00/16] Interactive git clean Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=932e2efee70dadb893dcd8498d7da17f68eb9d96.1372175283.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).