From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Xin Subject: [PATCH v15 08/16] git-clean: show items of del_list in columns Date: Tue, 25 Jun 2013 23:53:49 +0800 Message-ID: <07848ea909b60ad410e9f57e102e48c8c6baaf5c.1372175283.git.worldhello.net@gmail.com> References: Cc: Git List , Jiang Xin To: Junio C Hamano , Johannes Sixt X-From: git-owner@vger.kernel.org Tue Jun 25 17:54:57 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UrVa4-00045v-Cy for gcvg-git-2@plane.gmane.org; Tue, 25 Jun 2013 17:54:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522Ab3FYPyr (ORCPT ); Tue, 25 Jun 2013 11:54:47 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:57954 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269Ab3FYPyn (ORCPT ); Tue, 25 Jun 2013 11:54:43 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so12841998pbb.19 for ; Tue, 25 Jun 2013 08:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=pM1n3FxSLk82Dh0BbHnaTfiJJvjel7F1p5FmokxfwMw=; b=z9czUsekiL06dWWJIEY1cdF4vbbml+6V7HkcZ75QSccDY6gwd00VYjQQGydlANFcfx /BIHxOYsk/CWAcxCiM0Z/y2Um25FPm5PXb2SW8SFccvvnm+PwodrFjD3vp77AwwfsCQk Q3/W11o+WTZkUxg5j1cJLDGkw6zInVVq0jCkkOxOnrx+sV1yStHByalwnmxqvDWYXG7i ZG5MXH/KrlZVNTA1ST2bO+bKmgyGSOZT31ExaJh5yfMhE4qrdbnjZVEYNzMzJ6Hj/3Iz 2xGrhqI5mbPFHPcKcuKxx+iH2G1mtJOkX6fAPgn7fO3ylPrEvay0mXoEspKs/hbDBpQU OIvw== X-Received: by 10.68.243.40 with SMTP id wv8mr29182118pbc.34.1372175682741; Tue, 25 Jun 2013 08:54:42 -0700 (PDT) Received: from localhost.localdomain ([114.248.133.39]) by mx.google.com with ESMTPSA id pb5sm23760930pbc.29.2013.06.25.08.54.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Jun 2013 08:54:41 -0700 (PDT) X-Mailer: git-send-email 1.8.3.1.756.g2e9b71f In-Reply-To: In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When there are lots of items to be cleaned, it is hard to see them all in one screen. Show them in columns will solve this problem. Signed-off-by: Jiang Xin Comments-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/config.txt | 4 ++++ builtin/clean.c | 49 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e203..c415f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -959,6 +959,10 @@ column.branch:: Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details. +column.clean:: + Specify the layout when list items in `git clean -i`, which always + shows files and directories in columns. See `column.ui` for details. + column.status:: Specify whether to output untracked files in `git status` in columns. See `column.ui` for details. diff --git a/builtin/clean.c b/builtin/clean.c index 698fb..75cc6 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -13,10 +13,12 @@ #include "refs.h" #include "string-list.h" #include "quote.h" +#include "column.h" static int force = -1; /* unset */ static int interactive; static struct string_list del_list = STRING_LIST_INIT_DUP; +static unsigned int colopts; static const char *const builtin_clean_usage[] = { N_("git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..."), @@ -31,8 +33,13 @@ static const char *msg_warn_remove_failed = N_("failed to remove %s"); static int git_clean_config(const char *var, const char *value, void *cb) { - if (!strcmp(var, "clean.requireforce")) + if (!prefixcmp(var, "column.")) + return git_column_config(var, value, "clean", &colopts); + + if (!strcmp(var, "clean.requireforce")) { force = !git_config_bool(var, value); + return 0; + } return git_default_config(var, value, cb); } @@ -144,21 +151,46 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, return ret; } -static void interactive_main_loop(void) +static void pretty_print_dels(void) { - struct strbuf confirm = STRBUF_INIT; - struct strbuf buf = STRBUF_INIT; + struct string_list list = STRING_LIST_INIT_DUP; struct string_list_item *item; + struct strbuf buf = STRBUF_INIT; const char *qname; + struct column_options copts; + + for_each_string_list_item(item, &del_list) { + qname = quote_path_relative(item->string, NULL, &buf); + string_list_append(&list, qname); + } + + /* + * always enable column display, we only consult column.* + * about layout strategy and stuff + */ + colopts = (colopts & ~COL_ENABLE_MASK) | COL_ENABLED; + memset(&copts, 0, sizeof(copts)); + copts.indent = " "; + copts.padding = 2; + print_columns(&list, colopts, &copts); + putchar('\n'); + strbuf_release(&buf); + string_list_clear(&list, 0); +} + +static void interactive_main_loop(void) +{ + struct strbuf confirm = STRBUF_INIT; while (del_list.nr) { putchar('\n'); - for_each_string_list_item(item, &del_list) { - qname = quote_path_relative(item->string, NULL, &buf); - printf(_(msg_would_remove), qname); - } + printf_ln(Q_("Would remove the following item:", + "Would remove the following items:", + del_list.nr)); putchar('\n'); + pretty_print_dels(); + printf(_("Remove [y/n]? ")); if (strbuf_getline(&confirm, stdin, '\n') != EOF) { strbuf_trim(&confirm); @@ -184,7 +216,6 @@ static void interactive_main_loop(void) } } - strbuf_release(&buf); strbuf_release(&confirm); } -- 1.8.3.1.756.g2e9b71f