From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Xin Subject: [PATCH v15 12/16] git-clean: add select by numbers interactive action Date: Tue, 25 Jun 2013 23:53:53 +0800 Message-ID: References: Cc: Git List , Jiang Xin To: Junio C Hamano , Johannes Sixt X-From: git-owner@vger.kernel.org Tue Jun 25 17:56:38 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 1UrVbg-0005RV-Nz for gcvg-git-2@plane.gmane.org; Tue, 25 Jun 2013 17:56:37 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597Ab3FYPzB (ORCPT ); Tue, 25 Jun 2013 11:55:01 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:59783 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752534Ab3FYPy6 (ORCPT ); Tue, 25 Jun 2013 11:54:58 -0400 Received: by mail-pa0-f45.google.com with SMTP id bi5so12873812pad.4 for ; Tue, 25 Jun 2013 08:54:57 -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=05pBTZv9V1DrWv/ZAZktNMLy/4Po1OzxIQf0R3l+zOY=; b=W0rilX+RvZbfJx9NZ9cCG98gRkgqhCyx2LQe1E7mUv81z9V4OG2sg31DABJYaKXcmV XN0P9nysRF0ZAvb1x1Ju0Ok+F+uMbMbY2h1N3O7MCzpL+e/0nRYzbeGZkSxQxJNJ68vQ 3FCj3fISOIrA6b3eQ9LWHSy8SbV8c6KZv53GA2+UpoUWAN8dIpQFDLWgRAJzydGAa6ri KkSnSbQy6vpZDF/SCkI4x9CV0OICLLltXW/2afuC/KTCxXWdjIpqyxQoeeO1Q+epuCGM FWU6kZd6goQoh1Y4rnXGfO4PcnBh9K4XeN1RfjIFbHhNpMewtA3p72qIGgJPjJYSIkuG 0gOQ== X-Received: by 10.66.251.202 with SMTP id zm10mr513024pac.53.1372175697694; Tue, 25 Jun 2013 08:54:57 -0700 (PDT) Received: from localhost.localdomain ([114.248.133.39]) by mx.google.com with ESMTPSA id pb5sm23760930pbc.29.2013.06.25.08.54.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Jun 2013 08:54:56 -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: 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.1.756.g2e9b71f