git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 10/14] git-clean: add filter by pattern interactive action
Date: Thu, 16 May 2013 17:53:41 +0800	[thread overview]
Message-ID: <0b37dfa57942d54f73b05675f31d90bd4dff9ab5.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: filter by pattern. When the
user chooses this action, user can input space-separated patterns (the
same syntax as gitignore), and each clean candidate that matches with
one of the patterns will be excluded from cleaning. When the user feels
it's OK, presses ENTER and back to the confirmation dialog.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Suggested-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/clean.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/builtin/clean.c b/builtin/clean.c
index f59ed..35b9f3 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -607,6 +607,72 @@ static int clean_cmd(void)
 	return MENU_RETURN_NO_LOOP;
 }
 
+static int filter_by_patterns_cmd(void)
+{
+	struct dir_struct dir;
+	struct strbuf confirm = STRBUF_INIT;
+	struct strbuf **ignore_list;
+	struct string_list_item *item;
+	struct exclude_list *el;
+	int changed = -1, i;
+
+	for (;;) {
+		if (!del_list.nr)
+			break;
+
+		if (changed)
+			pretty_print_dels();
+
+		clean_print_color(CLEAN_COLOR_PROMPT);
+		printf(_("Input ignore patterns>> "));
+		clean_print_color(CLEAN_COLOR_RESET);
+		if (strbuf_getline(&confirm, stdin, '\n') != EOF)
+			strbuf_trim(&confirm);
+		else
+			putchar('\n');
+
+		/* quit filter_by_pattern mode if press ENTER or Ctrl-D */
+		if (!confirm.len)
+			break;
+
+		memset(&dir, 0, sizeof(dir));
+		el = add_exclude_list(&dir, EXC_CMDL, "manual exclude");
+		ignore_list = strbuf_split_max(&confirm, ' ', 0);
+
+		for (i = 0; ignore_list[i]; i++) {
+			strbuf_trim(ignore_list[i]);
+			if (!ignore_list[i]->len)
+				continue;
+
+			add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1));
+		}
+
+		changed = 0;
+		for_each_string_list_item(item, &del_list) {
+			int dtype = DT_UNKNOWN;
+
+			if (is_excluded(&dir, item->string, &dtype)) {
+				*item->string = '\0';
+				changed++;
+			}
+		}
+
+		if (changed) {
+			string_list_remove_empty_items(&del_list, 0);
+		} else {
+			clean_print_color(CLEAN_COLOR_ERROR);
+			printf_ln(_("WARNING: Cannot find items matched by: %s"), confirm.buf);
+			clean_print_color(CLEAN_COLOR_RESET);
+		}
+
+		strbuf_list_free(ignore_list);
+		clear_directory(&dir);
+	}
+
+	strbuf_release(&confirm);
+	return 0;
+}
+
 static int quit_cmd(void)
 {
 	string_list_clear(&del_list, 0);
@@ -619,6 +685,7 @@ static int help_cmd(void)
 	clean_print_color(CLEAN_COLOR_HELP);
 	printf_ln(_(
 		    "clean               - start cleaning\n"
+		    "filter by pattern   - exclude items from deletion\n"
 		    "quit                - stop cleaning\n"
 		    "help                - this screen\n"
 		    "?                   - help for prompt selection"
@@ -634,6 +701,7 @@ static void interactive_main_loop(void)
 		struct menu_stuff menu_stuff;
 		struct menu_item menus[] = {
 			{'c', "clean",			0, clean_cmd},
+			{'f', "filter by pattern",	0, filter_by_patterns_cmd},
 			{'q', "quit",			0, quit_cmd},
 			{'h', "help",			0, help_cmd},
 		};
-- 
1.8.3.rc1.407.g762149a

  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 ` Jiang Xin [this message]
2013-05-16  9:53 ` [PATCH v10 11/14] git-clean: add select by numbers interactive action Jiang Xin
2013-05-16  9:53 ` [PATCH v10 12/14] git-clean: add ask each " Jiang Xin
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=0b37dfa57942d54f73b05675f31d90bd4dff9ab5.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).