From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 508E11F404 for ; Mon, 26 Mar 2018 16:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752519AbeCZQ4O (ORCPT ); Mon, 26 Mar 2018 12:56:14 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35524 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221AbeCZQ4L (ORCPT ); Mon, 26 Mar 2018 12:56:11 -0400 Received: by mail-lf0-f68.google.com with SMTP id t132-v6so29211556lfe.2 for ; Mon, 26 Mar 2018 09:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+l5Pjr5aa+YvpzMOOQzOtcjYSrjbLFCjj0LmJgbudUw=; b=Ka04kJ6LO/amGOU4fxsT+qb7CTh/geG8/M+cCJt16HlRTUshUdC0j8to8WBemGe/jD ra44lmOGtT9Cfw6A0ltpyosronwqG2wsUo9ZFHZsIXvmoLtyBEb+jAUy3aSqtyyAX7B/ KUAdxTnbhu3dIFI+h2qjnUk4T767VlYPRJSjx6zQ1pX6+UlEcHHm82qLHtnHxNFpS9Yk H4zBpCHTWmlWY8LYNtYBuAMHsnTy3etxJKlAfrt5rXS3YIvAbn5dv3MPo6DHYfPR1dru +fSfkOdh5mIMfRCNZ6ijlEulvwf7WFkwHwDcJkL8qsRGyIIIukioMyyhNg0Y7UdbB7xV oGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+l5Pjr5aa+YvpzMOOQzOtcjYSrjbLFCjj0LmJgbudUw=; b=CqJWlsW7clsMryAiDJHWnUSWTB2MnU1YYO02+lrE/1ziSDOA5Kno8xFGaB4dNxXq4W LdSAaooyb/fHX054BWrXiT43s4TrRKGVN+UD+A+mzSXNCCXynxfn9Lxaoy15zPtmZNwo 4KE/+qUR6SeMFzA8/G/ug0tArtYQPdRPF9shk0X81F5JnQSWtmYdYs0zZOhV9RlS+4pP nHCJviqI9wVm6IqSUYg2K6AQEwklU9EL6IKy0rmvhhx/aSWEB86jdMqF70EqZ1wFW+S4 JVsN66LMivjuHmccXH+lGW2F2eUIB6O52w3CEbyx8v9f76dB4UAZbIGRUyQyMA6AqOje peBw== X-Gm-Message-State: AElRT7FxrAxSbK70xSvPoQHmaLU70tEKzg4gHm9UVbFE+HHy9oEPKpvi PrXjgxINO63w31rMJtAJ43hrig== X-Google-Smtp-Source: AG47ELss3QQcqHPTfJkzbNvIPqLaV/fR+KKm1zi54Rp7jKHkS5uNYeOQpN9XNE50TDwoebjq4YB7Lw== X-Received: by 10.46.48.15 with SMTP id w15mr20347241ljw.79.1522083369110; Mon, 26 Mar 2018 09:56:09 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id j8sm814451lje.83.2018.03.26.09.56.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 09:56:08 -0700 (PDT) From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org Cc: =?UTF-8?q?SZEDER=20G=C3=A1bor?= , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH/RFC 3/5] generate-cmdlist.sh: keep all information in common-cmds.h Date: Mon, 26 Mar 2018 18:55:18 +0200 Message-Id: <20180326165520.802-4-pclouds@gmail.com> X-Mailer: git-send-email 2.17.0.rc0.348.gd5a49e0b6f In-Reply-To: <20180326165520.802-1-pclouds@gmail.com> References: <20180326165520.802-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org common-cmds.h is used to extract the list of common commands (by group) and a one-line summary of each command. Some information is dropped, for example command category or summary of other commands. Update generate-cmdlist.sh to keep all the information. The extra info will be used shortly. Signed-off-by: Nguyễn Thái Ngọc Duy --- generate-cmdlist.sh | 46 ++++++++++++++++++++++++++++++++++----------- help.c | 43 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 17 deletions(-) diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index eeea4b67ea..72235e7296 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -2,9 +2,10 @@ echo "/* Automatically generated by generate-cmdlist.sh */ struct cmdname_help { - char name[16]; + char name[32]; char help[80]; - unsigned char group; + unsigned int category; + unsigned int group; }; static const char *common_cmd_groups[] = {" @@ -23,27 +24,50 @@ sed -n ' ' "$1" printf '};\n\n' +echo "#define GROUP_NONE 0xff /* no common group */" +echo "#define GROUP_ 0xff /* no common group */" n=0 -substnum= while read grp do - echo "^git-..*[ ]$grp" - substnum="$substnum${substnum:+;}s/[ ]$grp/$n/" + echo "#define GROUP_$grp $n" n=$(($n+1)) -done <"$grps" >"$match" +done <"$grps" +echo -printf 'static struct cmdname_help common_cmds[] = {\n' -grep -f "$match" "$1" | +echo '/*' +printf 'static const char *cmd_categories[] = {\n' +grep '^git-' "$1" | +awk '{print $2;}' | +sort | +uniq | +while read category; do + printf '\t\"'$category'\",\n' +done +printf '\tNULL\n};\n\n' +echo '*/' + +n=0 +grep '^git-' "$1" | +awk '{print $2;}' | +sort | +uniq | +while read category; do + echo "#define CAT_$category $n" + n=$(($n+1)) +done +echo + +printf 'static struct cmdname_help command_list[] = {\n' +grep "^git-" "$1" | sed 's/^git-//' | sort | -while read cmd tags +while read cmd category tags do - tag=$(echo "$tags" | sed "$substnum; s/[^0-9]//g") sed -n ' /^NAME/,/git-'"$cmd"'/H ${ x - s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", N_("\1"), '$tag'},/ + s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", N_("\1"), CAT_'$category', GROUP_'$tags' },/ p }' "Documentation/git-$cmd.txt" done diff --git a/help.c b/help.c index f3f35dfbb1..4d07ea3913 100644 --- a/help.c +++ b/help.c @@ -190,6 +190,28 @@ void list_commands(unsigned int colopts, } } +static void extract_common_cmds(struct cmdname_help **p_common_cmds, + int *p_nr) +{ + int i, nr = 0; + struct cmdname_help *common_cmds; + + ALLOC_ARRAY(common_cmds, ARRAY_SIZE(command_list)); + + for (i = 0; i < ARRAY_SIZE(command_list); i++) { + const struct cmdname_help *cmd = command_list + i; + + if (cmd->category != CAT_mainporcelain || + cmd->group == GROUP_NONE) + continue; + + common_cmds[nr++] = *cmd; + } + + *p_common_cmds = common_cmds; + *p_nr = nr; +} + static int cmd_group_cmp(const void *elem1, const void *elem2) { const struct cmdname_help *e1 = elem1; @@ -206,17 +228,21 @@ void list_common_cmds_help(void) { int i, longest = 0; int current_grp = -1; + int nr = 0; + struct cmdname_help *common_cmds; + + extract_common_cmds(&common_cmds, &nr); - for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { + for (i = 0; i < nr; i++) { if (longest < strlen(common_cmds[i].name)) longest = strlen(common_cmds[i].name); } - QSORT(common_cmds, ARRAY_SIZE(common_cmds), cmd_group_cmp); + QSORT(common_cmds, nr, cmd_group_cmp); puts(_("These are common Git commands used in various situations:")); - for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { + for (i = 0; i < nr; i++) { if (common_cmds[i].group != current_grp) { printf("\n%s\n", _(common_cmd_groups[common_cmds[i].group])); current_grp = common_cmds[i].group; @@ -226,6 +252,7 @@ void list_common_cmds_help(void) mput_char(' ', longest - strlen(common_cmds[i].name)); puts(_(common_cmds[i].help)); } + free(common_cmds); } void list_all_cmds(void) @@ -298,8 +325,9 @@ static const char bad_interpreter_advice[] = const char *help_unknown_cmd(const char *cmd) { - int i, n, best_similarity = 0; + int i, n, best_similarity = 0, nr_common; struct cmdnames main_cmds, other_cmds; + struct cmdname_help *common_cmds; memset(&main_cmds, 0, sizeof(main_cmds)); memset(&other_cmds, 0, sizeof(other_cmds)); @@ -314,6 +342,8 @@ const char *help_unknown_cmd(const char *cmd) QSORT(main_cmds.names, main_cmds.cnt, cmdname_compare); uniq(&main_cmds); + extract_common_cmds(&common_cmds, &nr_common); + /* This abuses cmdname->len for levenshtein distance */ for (i = 0, n = 0; i < main_cmds.cnt; i++) { int cmp = 0; /* avoid compiler stupidity */ @@ -328,10 +358,10 @@ const char *help_unknown_cmd(const char *cmd) die(_(bad_interpreter_advice), cmd, cmd); /* Does the candidate appear in common_cmds list? */ - while (n < ARRAY_SIZE(common_cmds) && + while (n < nr_common && (cmp = strcmp(common_cmds[n].name, candidate)) < 0) n++; - if ((n < ARRAY_SIZE(common_cmds)) && !cmp) { + if ((n < nr_common) && !cmp) { /* Yes, this is one of the common commands */ n++; /* use the entry from common_cmds[] */ if (starts_with(candidate, cmd)) { @@ -344,6 +374,7 @@ const char *help_unknown_cmd(const char *cmd) main_cmds.names[i]->len = levenshtein(cmd, candidate, 0, 2, 1, 3) + 1; } + FREE_AND_NULL(common_cmds); QSORT(main_cmds.names, main_cmds.cnt, levenshtein_compare); -- 2.17.0.rc0.348.gd5a49e0b6f