From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chirayu Desai Subject: [PATCH/GSoC] parse-options: Add a new nousage opt Date: Sun, 20 Mar 2016 12:16:45 +0530 Message-ID: <1458456405-3519-1-git-send-email-chirayudesai1@gmail.com> Cc: Chirayu Desai To: git@vger.kernel.org, peff@peff.net X-From: git-owner@vger.kernel.org Sun Mar 20 07:48:54 2016 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 1ahXAT-0006Px-IR for gcvg-git-2@plane.gmane.org; Sun, 20 Mar 2016 07:48:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751830AbcCTGss (ORCPT ); Sun, 20 Mar 2016 02:48:48 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33799 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751642AbcCTGsq (ORCPT ); Sun, 20 Mar 2016 02:48:46 -0400 Received: by mail-pf0-f194.google.com with SMTP id n5so24332121pfn.1 for ; Sat, 19 Mar 2016 23:48:46 -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; bh=A2m1KxGyr+3S8Dr4IlyOD5K1u+AEJ05PO2fzo36gy5A=; b=tOjvNGfqI4iwA0VwZA9w9DkBiPHF7/BKKbBjneuH23gDp0iCohVMeFQZFzt9zyfqEN uIlMIUelLpfl+i+gxmWpfGeEbzliowxuS/Pn0m4mu/dCOvRsfszG6ifY70ZUV30IptLg bP6kbgtWV4VNsd6YFKE8X/HeBrQDqjSI7+GLyCPw5YmDj3KADS0ZrYe9KxJiv+9BwUpH eoM6lkBT9rhREaM3uMO4EOijfCFnTp13T1OH0R/x2tsmJTfueht/r2Ued1mqUj0i1fR8 uMM+MVQJAsQQEkzVO4CgkEGyI9NtxEvRHlk9mTGY83T++ZLQq3Rz3GarPEhd0tw/yEjD fmdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=A2m1KxGyr+3S8Dr4IlyOD5K1u+AEJ05PO2fzo36gy5A=; b=CxIUqt35dOg+CZ/Nyu0fRkT7tbIPwA9wRc95EVqvcyY4G1oATVbLPotb1TjvYLfj3x d/anzPf4wsi4kx/pnQxfLxzvi3Akb2px6elLSpaSPkZ3iOvoowrNs+MwhssQ5+TcIEGa vilzf5rVEsvYDoQqsRdhwGjdXbpuFqcacgt6ra98mrklOBStQUZaSyrntgqLQJNsHKRA nOa9ysHw3s+NqQSydDvnN9gSixPHyuUgk1tjQu1UkuHY2uzRqIYUg8/Khf2+DW6UU0jf HhTSFT3hlk/+xHvYB6liHglBR7EjSZc0kLtcNWhcrVV39Tquy/Qqap5xwOkSUX5a90Zi mapw== X-Gm-Message-State: AD7BkJJ3pYKiDyhI+w3zZkxdpOH493f1db0SswUuV68aj/p1XKScqZoTJtQJR0DOWhgsmw== X-Received: by 10.66.139.137 with SMTP id qy9mr36122506pab.57.1458456526062; Sat, 19 Mar 2016 23:48:46 -0700 (PDT) Received: from localhost.localdomain ([182.70.63.202]) by smtp.gmail.com with ESMTPSA id fn3sm31829705pab.20.2016.03.19.23.48.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Mar 2016 23:48:45 -0700 (PDT) X-Mailer: git-send-email 2.7.4 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * To show only error text on an error instead of the full usage * Currently used only by commands with options "--with" or "--contains", such as 'tag', 'branch', 'for-each-ref'. It now prints only $ git tag --contains qq error: malformed object name qq instead of the full usage text after the error text. TODO: Add tests --- parse-options-cb.c | 12 ++++++++---- parse-options.c | 5 +++++ parse-options.h | 6 ++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/parse-options-cb.c b/parse-options-cb.c index 239898d946..ac2ea4d674 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -85,11 +85,15 @@ int parse_opt_commits(const struct option *opt, const char *arg, int unset) if (!arg) return -1; - if (get_sha1(arg, sha1)) - return error("malformed object name %s", arg); + if (get_sha1(arg, sha1)) { + error("malformed object name %s", arg); + return -3; + } commit = lookup_commit_reference(sha1); - if (!commit) - return error("no such commit %s", arg); + if (!commit) { + error("no such commit %s", arg); + return -3; + } commit_list_insert(commit, opt->value); return 0; } diff --git a/parse-options.c b/parse-options.c index 47a9192060..d136c1afd0 100644 --- a/parse-options.c +++ b/parse-options.c @@ -158,6 +158,9 @@ static int get_value(struct parse_opt_ctx_t *p, return (*opt->callback)(opt, NULL, 0) ? (-1) : 0; if (get_arg(p, opt, flags, &arg)) return -1; + if (opt->flags & PARSE_OPT_NOUSAGE) { + return (*opt->callback)(opt, arg, 0); + } return (*opt->callback)(opt, arg, 0) ? (-1) : 0; case OPTION_INTEGER: @@ -504,6 +507,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, goto show_usage_error; case -2: goto unknown; + case -3: + return PARSE_OPT_DONE; } continue; unknown: diff --git a/parse-options.h b/parse-options.h index ea4af92a51..628e34c5af 100644 --- a/parse-options.h +++ b/parse-options.h @@ -38,7 +38,8 @@ enum parse_opt_option_flags { PARSE_OPT_LASTARG_DEFAULT = 16, PARSE_OPT_NODASH = 32, PARSE_OPT_LITERAL_ARGHELP = 64, - PARSE_OPT_SHELL_EVAL = 256 + PARSE_OPT_SHELL_EVAL = 256, + PARSE_OPT_NOUSAGE = 512 }; struct option; @@ -89,6 +90,7 @@ typedef int parse_opt_ll_cb(struct parse_opt_ctx_t *ctx, * PARSE_OPT_LITERAL_ARGHELP: says that argh shouldn't be enclosed in brackets * (i.e. '') in the help message. * Useful for options with multiple parameters. + * PARSE_OPT_NOUSAGE: do not print usage / help on error. * * `callback`:: * pointer to the callback to use for OPTION_CALLBACK or @@ -254,7 +256,7 @@ extern int parse_opt_passthru_argv(const struct option *, const char *, int); { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru_argv } #define _OPT_CONTAINS_OR_WITH(name, variable, help, flag) \ { OPTION_CALLBACK, 0, name, (variable), N_("commit"), (help), \ - PARSE_OPT_LASTARG_DEFAULT | flag, \ + PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NOUSAGE | flag, \ parse_opt_commits, (intptr_t) "HEAD" \ } #define OPT_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h, 0) -- 2.7.4