From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77DA5C43217 for ; Thu, 13 Oct 2022 15:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230028AbiJMPlk (ORCPT ); Thu, 13 Oct 2022 11:41:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229905AbiJMPk6 (ORCPT ); Thu, 13 Oct 2022 11:40:58 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C61D1733C5 for ; Thu, 13 Oct 2022 08:40:12 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id r13so3416309wrj.11 for ; Thu, 13 Oct 2022 08:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SYbeJayQNIvCAos2P7NSkkDvnKKEb/oqg7/MrrUq/ng=; b=l4NdEZm7/wBkg7ta8Y3w2SFbZz5w/Afg3CA1i3DV4B4KZTUnR6DJFSCJmbW56+LwSw dOmV8pVofnMEspyjTbLOQ7r7vEdJUhv/fXqs6HKEvCv7dydvarGX7dRGj/ebSMhDOO+X HuJUpxM+QZmkm41xMfhdnspMXzZlWMMVvbKYWiklPRNZ9XfQB6DOUSfZk8hUiRqZk9gh u9nXPkKnVqw171OzN9hzZexDFWFPbGofXo7CL3MmPF1emXby1yFGkED8dE0DErqR4iZn m6hexhaRVVd0CZzTFm/KZY4/5QbqotJuTfH39L24D35E02uomKh6IHGmSaZ/7mVaZbi/ L3Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SYbeJayQNIvCAos2P7NSkkDvnKKEb/oqg7/MrrUq/ng=; b=sSHXVQj3NnmJq/M3T4SIJU78kaJSyIh1gXWE9O3a6mAIaWa0O72xpcyW2BrHF1zaet vYrG9uGg5r6JOslurLDHX5N9+th9FzRl/H+YAdip1IXlqYjIKINTdlS2GI9XHfFKIStN ieS4Cueqh5lo8Pwa2w+n8RCBntwUd6tMHR/1wltb+ep2SkU8s1qLGV0rhPv1BavRckS9 P2lizqLbLbfug4e4nqADvLK+BsG6gIWtiocOhaz40T7KXPxNp6IKiOYF5pGeFBAkST8l UbJegVzPsCM8u/NUZFcssP1ehtMUEMKepfy05BMCfVRhMfgunl2mjiedpLy8EdQhfMil SAqw== X-Gm-Message-State: ACrzQf0CXqSzV052vcukE9CbGMo5OxmS1p2YvFCW/4X+ya3j3M/+P9CQ XpVn9b04JepuYvUa+CXdNkFipzywUGMDPg== X-Google-Smtp-Source: AMsMyM4CGHmeWIIq3EiPXS64/zcFpcc+UTKCCqIbqyaZLN/WzgEW/Wwdc1fx+JepcHvIsXADlTKAvw== X-Received: by 2002:a05:6000:90b:b0:22c:beec:5b26 with SMTP id bz11-20020a056000090b00b0022cbeec5b26mr405115wrb.490.1665675608156; Thu, 13 Oct 2022 08:40:08 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id da12-20020a056000408c00b0022a3a887ceasm2258130wrb.49.2022.10.13.08.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 08:40:07 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Victoria Dye , Taylor Blau , Emily Shaffer , Jonathan Nieder , John Cai , Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v5 31/34] worktree: define subcommand -h in terms of command -h Date: Thu, 13 Oct 2022 17:39:25 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.1085.gb7e61c3016c In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Avoid repeating the "-h" output for the "git worktree" command, and instead define the usage of each subcommand with macros, so that the "-h" output for the command itself can re-use those definitions. See [1], [2] and [3] for prior art using the same pattern. 1. b25b727494f (builtin/multi-pack-index.c: define common usage with a macro, 2021-03-30) 2. 8757b35d443 (commit-graph: define common usage with a macro, 2021-08-23) 3. 1e91d3faf6c (reflog: move "usage" variables and use macros, 2022-03-17) Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/worktree.c | 109 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 5bfc18e5a24..ba6846c3788 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -15,15 +15,72 @@ #include "worktree.h" #include "quote.h" -static const char * const worktree_usage[] = { - N_("git worktree add [] []"), - N_("git worktree list []"), - N_("git worktree lock [] "), - N_("git worktree move "), - N_("git worktree prune []"), - N_("git worktree remove [] "), - N_("git worktree repair [...]"), - N_("git worktree unlock "), +#define BUILTIN_WORKTREE_ADD_USAGE \ + N_("git worktree add [] []") +#define BUILTIN_WORKTREE_LIST_USAGE \ + N_("git worktree list []") +#define BUILTIN_WORKTREE_LOCK_USAGE \ + N_("git worktree lock [] ") +#define BUILTIN_WORKTREE_MOVE_USAGE \ + N_("git worktree move ") +#define BUILTIN_WORKTREE_PRUNE_USAGE \ + N_("git worktree prune []") +#define BUILTIN_WORKTREE_REMOVE_USAGE \ + N_("git worktree remove [] ") +#define BUILTIN_WORKTREE_REPAIR_USAGE \ + N_("git worktree repair [...]") +#define BUILTIN_WORKTREE_UNLOCK_USAGE \ + N_("git worktree unlock ") + +static const char * const git_worktree_usage[] = { + BUILTIN_WORKTREE_ADD_USAGE, + BUILTIN_WORKTREE_LIST_USAGE, + BUILTIN_WORKTREE_LOCK_USAGE, + BUILTIN_WORKTREE_MOVE_USAGE, + BUILTIN_WORKTREE_PRUNE_USAGE, + BUILTIN_WORKTREE_REMOVE_USAGE, + BUILTIN_WORKTREE_REPAIR_USAGE, + BUILTIN_WORKTREE_UNLOCK_USAGE, + NULL +}; + +static const char * const git_worktree_add_usage[] = { + BUILTIN_WORKTREE_ADD_USAGE, + NULL, +}; + +static const char * const git_worktree_list_usage[] = { + BUILTIN_WORKTREE_LIST_USAGE, + NULL +}; + +static const char * const git_worktree_lock_usage[] = { + BUILTIN_WORKTREE_LOCK_USAGE, + NULL +}; + +static const char * const git_worktree_move_usage[] = { + BUILTIN_WORKTREE_MOVE_USAGE, + NULL +}; + +static const char * const git_worktree_prune_usage[] = { + BUILTIN_WORKTREE_PRUNE_USAGE, + NULL +}; + +static const char * const git_worktree_remove_usage[] = { + BUILTIN_WORKTREE_REMOVE_USAGE, + NULL +}; + +static const char * const git_worktree_repair_usage[] = { + BUILTIN_WORKTREE_REPAIR_USAGE, + NULL +}; + +static const char * const git_worktree_unlock_usage[] = { + BUILTIN_WORKTREE_UNLOCK_USAGE, NULL }; @@ -153,9 +210,10 @@ static int prune(int ac, const char **av, const char *prefix) }; expire = TIME_MAX; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_prune_usage, + 0); if (ac) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_prune_usage, options); prune_worktrees(); return 0; } @@ -573,7 +631,7 @@ static int add(int ac, const char **av, const char *prefix) memset(&opts, 0, sizeof(opts)); opts.checkout = 1; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_add_usage, 0); if (!!opts.detach + !!new_branch + !!new_branch_force > 1) die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach"); if (lock_reason && !keep_locked) @@ -584,7 +642,7 @@ static int add(int ac, const char **av, const char *prefix) opts.keep_locked = _("added with --lock"); if (ac < 1 || ac > 2) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_add_usage, options); path = prefix_filename(prefix, av[0]); branch = ac < 2 ? "HEAD" : av[1]; @@ -772,9 +830,9 @@ static int list(int ac, const char **av, const char *prefix) }; expire = TIME_MAX; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_list_usage, 0); if (ac) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_list_usage, options); else if (verbose && porcelain) die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain"); else if (!line_terminator && !porcelain) @@ -811,9 +869,9 @@ static int lock_worktree(int ac, const char **av, const char *prefix) }; struct worktree **worktrees, *wt; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_lock_usage, 0); if (ac != 1) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_lock_usage, options); worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); @@ -844,9 +902,9 @@ static int unlock_worktree(int ac, const char **av, const char *prefix) struct worktree **worktrees, *wt; int ret; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_unlock_usage, 0); if (ac != 1) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_unlock_usage, options); worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); @@ -914,9 +972,10 @@ static int move_worktree(int ac, const char **av, const char *prefix) const char *reason = NULL; char *path; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_move_usage, + 0); if (ac != 2) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_move_usage, options); path = prefix_filename(prefix, av[1]); strbuf_addstr(&dst, path); @@ -1042,9 +1101,9 @@ static int remove_worktree(int ac, const char **av, const char *prefix) const char *reason = NULL; int ret = 0; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_remove_usage, 0); if (ac != 1) - usage_with_options(worktree_usage, options); + usage_with_options(git_worktree_remove_usage, options); worktrees = get_worktrees(); wt = find_worktree(worktrees, prefix, av[0]); @@ -1102,7 +1161,7 @@ static int repair(int ac, const char **av, const char *prefix) }; int rc = 0; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_repair_usage, 0); p = ac > 0 ? av : self; for (; *p; p++) repair_worktree_at_path(*p, report_repair, &rc); @@ -1130,6 +1189,6 @@ int cmd_worktree(int ac, const char **av, const char *prefix) if (!prefix) prefix = ""; - ac = parse_options(ac, av, prefix, options, worktree_usage, 0); + ac = parse_options(ac, av, prefix, options, git_worktree_usage, 0); return fn(ac, av, prefix); } -- 2.38.0.1085.gb7e61c3016c