From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Xin Subject: [PATCH v13 12/15] git-clean: add select by numbers interactive action Date: Wed, 22 May 2013 09:40:33 +0800 Message-ID: References: Cc: Git List , Jiang Xin To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed May 22 03:41:41 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 1Uey3b-0001cT-9K for gcvg-git-2@plane.gmane.org; Wed, 22 May 2013 03:41:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754693Ab3EVBl0 (ORCPT ); Tue, 21 May 2013 21:41:26 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:41231 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754606Ab3EVBlW (ORCPT ); Tue, 21 May 2013 21:41:22 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz10so1292450pad.2 for ; Tue, 21 May 2013 18:41:22 -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=B6YO7q+/zBILDNMfTmNRMTcV/voCvedZKzP/nEeY2pU=; b=PwkxzMdL9/+BuE/RUT0FJQDpOAPna6Zf2j2BYhnOUHrHdrZnmqABLYaTsOcQKEThDD lRZzTP40nmiDWnTxpj7556DHreP9DOyuZ9cVsZRpuagGH6IGGyRDm98KIm8AT7J2wF2u Q2KK+ZYfImY5ZhmWEG6wxMpXoOfSQ/kXtoXb4TBFYkgOFfSuMd5E7D07xkdSWBk8NW0T A2BJo+fd/40/kdqove7X28Ma5Er3me8k7IhsrO1Sp9tXIrFQIHhi6wTk4SgNssVtPwh3 i5dSxSOXr6aONYkdgRNFq6P+1FLtmoPuMsgR/vJQW/8bEVvF38XhG3BP74CCmJzj4l/l IhEw== X-Received: by 10.68.189.8 with SMTP id ge8mr5253777pbc.199.1369186882315; Tue, 21 May 2013 18:41:22 -0700 (PDT) Received: from localhost.localdomain ([114.248.150.82]) by mx.google.com with ESMTPSA id at1sm4939345pbc.10.2013.05.21.18.41.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 May 2013 18:41:21 -0700 (PDT) X-Mailer: git-send-email 1.8.3.rc3.368.g7c798dd In-Reply-To: In-Reply-To: References: <7vhahwm5n6.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Draw a multiple choice menu using `list_and_choose` to select items to be deleted by numbers. User can input: * 1,5-7 : select 1,5,6,7 items to be deleted * * : select all items to be deleted * -* : unselect all, nothing will be deleted * : (empty) finish selecting, and return back to main menu Signed-off-by: Jiang Xin Signed-off-by: Junio C Hamano --- builtin/clean.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/builtin/clean.c b/builtin/clean.c index 36369..643a5e 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -680,6 +680,43 @@ static int filter_by_patterns_cmd(void) return 0; } +static int select_by_numbers_cmd(void) +{ + struct menu_opts menu_opts; + struct menu_stuff menu_stuff; + struct string_list_item *items; + int *chosen; + int i, j; + + menu_opts.header = NULL; + menu_opts.prompt = N_("Select items to delete"); + menu_opts.flags = 0; + + menu_stuff.type = MENU_STUFF_TYPE_STRING_LIST; + menu_stuff.stuff = &del_list; + menu_stuff.nr = del_list.nr; + + chosen = list_and_choose(&menu_opts, &menu_stuff); + items = del_list.items; + for (i = 0, j = 0; i < del_list.nr; i++) { + if (i < chosen[j]) { + *(items[i].string) = '\0'; + } else if (i == chosen[j]) { + /* delete selected item */ + j++; + continue; + } else { + /* end of chosen (chosen[j] == EOF), won't delete */ + *(items[i].string) = '\0'; + } + } + + string_list_remove_empty_items(&del_list, 0); + + free(chosen); + return 0; +} + static int quit_cmd(void) { string_list_clear(&del_list, 0); @@ -693,6 +730,7 @@ static int help_cmd(void) printf_ln(_( "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" + "select by numbers - select items to be deleted by numbers\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" @@ -709,6 +747,7 @@ static void interactive_main_loop(void) struct menu_item menus[] = { {'c', "clean", 0, clean_cmd}, {'f', "filter by pattern", 0, filter_by_patterns_cmd}, + {'s', "select by numbers", 0, select_by_numbers_cmd}, {'q', "quit", 0, quit_cmd}, {'h', "help", 0, help_cmd}, }; -- 1.8.3.rc3.368.g7c798dd