From patchwork Sat Apr 2 16:10:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12799379 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 87FDCC433EF for ; Sat, 2 Apr 2022 16:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357806AbiDBQNi (ORCPT ); Sat, 2 Apr 2022 12:13:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357791AbiDBQMw (ORCPT ); Sat, 2 Apr 2022 12:12:52 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D47D960AA5 for ; Sat, 2 Apr 2022 09:10:57 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id f6-20020a1c3806000000b0038e4a0fc5easo3110183wma.3 for ; Sat, 02 Apr 2022 09:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=6DaPrcjxVMvvzmMZmrPrzIEb2xqD07AEYgYG0ai+j0Y=; b=OZpz/BU80G7uOWaq4DaxExzVk21wSxGJlIciVujli4on/+67kGWjZTVLBdUZJQvQaV 8eUL8yw9Ji+XNqeHkzUh4xJV3U+QTOfn/T0wPTbJrXhX2YrET846j+sm3GmWAjxlvk8u izPUf4KlvafhcLfsSPd1KvlVc1s0W4xFyKtByrO2rwDldvF/RvZdLd6bs1NRWvVcgfwJ aYw1FksOvc/VyYwe7vYb2vXmhjUCNE/559pDgjNKydvQF7PCaN9yBs0j6Pt/Cb/9XvEN uGZiDfkbaq84LWUfjpq7EnuZJdVvfMoVe0CxguCBbWohOqmmtqlZ/SzriMWQClTfpSBs 39sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=6DaPrcjxVMvvzmMZmrPrzIEb2xqD07AEYgYG0ai+j0Y=; b=o/Ww9N6SwmTxn5ZS4+gEHeJSMwzkQeqMsRKgJuYw9LhV3+UAnO6PE7NaMfBghFXvOD 5HJRDd6jI7SCzhUBlwFTcKnoGj+JB8WWeOHb0t7E9gxZYiS5dxwpqZvvgaiPC3vPXMRf a8AH6EAHTflaEFRSbsttzXyLicJE1CbslYuJV84pPnyeCr8zWf02XCbJMbPWgYzgJon7 kHCSkWytKQiOf3ts/b06H9BSjW1tUhGXRR1j2K5+hBhOsVpw14YR38K0cOmK6UwbOzYF oNGQmYscfxgKtL61phsj8Efl+fIKrbuU1H+BYpOJF3OrE0SG+tVQUIddRuRefODTwZ3p E5Og== X-Gm-Message-State: AOAM532V96lHFBMWo5ZYdIs33GSWcfmkzau0OuL62fYHCnToX/m2onnP TyJ0pzJA01eTa/xOalOyXxVJV1ECyJA= X-Google-Smtp-Source: ABdhPJw39/Yf+u0b6n9iEmTimD4NbliuIs08b8sg7eWZcaen+PuMOH33Ic3smSkWtkIZINtxISiQBA== X-Received: by 2002:a1c:f705:0:b0:37d:f2e5:d8ec with SMTP id v5-20020a1cf705000000b0037df2e5d8ecmr13192222wmh.21.1648915855983; Sat, 02 Apr 2022 09:10:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e13-20020a05600c4e4d00b0038e44e316c1sm6777631wmq.6.2022.04.02.09.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:10:55 -0700 (PDT) Message-Id: <4bba3e1f6cb9cdc35b0dc8da440e38de256b4d2b.1648915853.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:48 +0000 Subject: [PATCH v2 1/6] i18n: factorize generic failure messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= In these message the command or the function that failed should not be translated. So it is simpler to just remove these parts from the message. Signed-off-by: Jean-Noël Avila --- add-patch.c | 4 ++-- builtin/am.c | 2 +- builtin/gc.c | 4 ++-- builtin/merge.c | 6 +++--- builtin/revert.c | 4 ++-- fetch-pack.c | 2 +- remote-curl.c | 2 +- setup.c | 4 ++-- t/t3510-cherry-pick-sequence.sh | 8 ++++---- t/t6436-merge-overwrite.sh | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/add-patch.c b/add-patch.c index 55d719f7845..8c9e81ec78e 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1181,7 +1181,7 @@ static int run_apply_check(struct add_p_state *s, "apply", "--check", NULL); strvec_pushv(&cp.args, s->mode->apply_check_args); if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0)) - return error(_("'git apply --cached' failed")); + return error(_("the command '%s' failed"), "git apply --cached"); return 0; } @@ -1683,7 +1683,7 @@ soft_increment: strvec_pushv(&cp.args, s->mode->apply_args); if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0)) - error(_("'git apply' failed")); + error(_("the command '%s' failed"), "git apply"); } if (repo_read_index(s->s.r) >= 0) repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0, diff --git a/builtin/am.c b/builtin/am.c index 0f4111bafa0..a0a57049510 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -586,7 +586,7 @@ static int is_mail(FILE *fp) int ret = 1; if (fseek(fp, 0L, SEEK_SET)) - die_errno(_("fseek failed")); + die_errno(_("the function '%s' failed"), "fseek"); if (regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) die("invalid pattern: %s", header_regex); diff --git a/builtin/gc.c b/builtin/gc.c index ffaf0daf5d9..c062d7bceeb 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1104,7 +1104,7 @@ static int multi_pack_index_expire(struct maintenance_run_opts *opts) strvec_push(&child.args, "--no-progress"); if (run_command(&child)) - return error(_("'git multi-pack-index expire' failed")); + return error(_("the command '%s' failed"), "git multi-pack-index expire"); return 0; } @@ -1163,7 +1163,7 @@ static int multi_pack_index_repack(struct maintenance_run_opts *opts) (uintmax_t)get_auto_pack_size()); if (run_command(&child)) - return error(_("'git multi-pack-index repack' failed")); + return error(_("the command '%s' failed"), "git multi-pack-index repack"); return 0; } diff --git a/builtin/merge.c b/builtin/merge.c index f178f5a3ee1..78468ff43a4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -325,7 +325,7 @@ static int save_state(struct object_id *stash) close(cp.out); if (finish_command(&cp) || len < 0) - die(_("stash failed")); + die(_("the command '%s' failed"), "stash"); else if (!len) /* no changes */ goto out; strbuf_setlen(&buffer, buffer.len-1); @@ -352,7 +352,7 @@ static void read_empty(const struct object_id *oid, int verbose) args[i] = NULL; if (run_command_v_opt(args, RUN_GIT_CMD)) - die(_("read-tree failed")); + die(_("the command '%s' failed"), "read-tree"); } static void reset_hard(const struct object_id *oid, int verbose) @@ -369,7 +369,7 @@ static void reset_hard(const struct object_id *oid, int verbose) args[i] = NULL; if (run_command_v_opt(args, RUN_GIT_CMD)) - die(_("read-tree failed")); + die(_("the command '%s' failed"), "read-tree"); } static void restore_state(const struct object_id *head, diff --git a/builtin/revert.c b/builtin/revert.c index 51776abea63..d293036e790 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -238,7 +238,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix) sequencer_init_config(&opts); res = run_sequencer(argc, argv, &opts); if (res < 0) - die(_("revert failed")); + die(_("the command '%s' failed"), "revert"); return res; } @@ -251,6 +251,6 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) sequencer_init_config(&opts); res = run_sequencer(argc, argv, &opts); if (res < 0) - die(_("cherry-pick failed")); + die(_("the command '%s' failed"), "cherry-pick"); return res; } diff --git a/fetch-pack.c b/fetch-pack.c index 87657907e78..2e6795cd439 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -989,7 +989,7 @@ static int get_pack(struct fetch_pack_args *args, args->check_self_contained_and_connected && ret == 0; else - die(_("%s failed"), cmd_name); + die(_("the command '%s' failed"), cmd_name); if (use_sideband && finish_async(&demux)) die(_("error in sideband demultiplexer")); diff --git a/remote-curl.c b/remote-curl.c index ff44f41011e..8393f56652b 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -1287,7 +1287,7 @@ static int push_dav(int nr_spec, const char **specs) strvec_push(&child.args, specs[i]); if (run_command(&child)) - die(_("git-http-push failed")); + die(_("the command '%s' failed"), "git-http-push"); return 0; } diff --git a/setup.c b/setup.c index 04ce33cdcd4..30a4b81257d 100644 --- a/setup.c +++ b/setup.c @@ -1506,12 +1506,12 @@ int daemonize(void) case 0: break; case -1: - die_errno(_("fork failed")); + die_errno(_("the function '%s' failed"), "fork"); default: exit(0); } if (setsid() == -1) - die_errno(_("setsid failed")); + die_errno(_("the function '%s' failed"), "setsid"); close(0); close(1); close(2); diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 3b0fa66c33d..141d217dc3f 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -193,7 +193,7 @@ test_expect_success 'check advice when we move HEAD by committing' ' error: there is nothing to skip hint: have you committed already? hint: try "git cherry-pick --continue" - fatal: cherry-pick failed + fatal: the command '\''cherry-pick'\'' failed EOF test_must_fail git cherry-pick base..yetanotherpick && echo c >foo && @@ -208,7 +208,7 @@ test_expect_success 'selectively advise --skip while launching another sequence' cat >expect <<-EOF && error: cherry-pick is already in progress hint: try "git cherry-pick (--continue | --skip | --abort | --quit)" - fatal: cherry-pick failed + fatal: the command '\''cherry-pick'\'' failed EOF test_must_fail git cherry-pick picked..yetanotherpick && test_must_fail git cherry-pick picked..yetanotherpick 2>advice && @@ -216,7 +216,7 @@ test_expect_success 'selectively advise --skip while launching another sequence' cat >expect <<-EOF && error: cherry-pick is already in progress hint: try "git cherry-pick (--continue | --abort | --quit)" - fatal: cherry-pick failed + fatal: the command '\''cherry-pick'\'' failed EOF git reset --merge && test_must_fail git cherry-pick picked..yetanotherpick 2>advice && @@ -227,7 +227,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' ' pristine_detach initial && cat >expect <<-EOF && error: cannot abort from a branch yet to be born - fatal: cherry-pick failed + fatal: the command '\''cherry-pick'\'' failed EOF git checkout --orphan new_disconnected && git reset --hard && diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh index c0b7bd7c3fe..c714ac2cbc5 100755 --- a/t/t6436-merge-overwrite.sh +++ b/t/t6436-merge-overwrite.sh @@ -166,7 +166,7 @@ test_expect_success 'will not be confused by symlink in leading path' ' cat >expect <<\EOF error: Untracked working tree file 'c0.c' would be overwritten by merge. -fatal: read-tree failed +fatal: the command 'read-tree' failed EOF test_expect_success 'will not overwrite untracked file on unborn branch' ' From patchwork Sat Apr 2 16:10:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 12799381 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 57B3AC433F5 for ; Sat, 2 Apr 2022 16:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357855AbiDBQNp (ORCPT ); Sat, 2 Apr 2022 12:13:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357797AbiDBQMx (ORCPT ); Sat, 2 Apr 2022 12:12:53 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BCC360063 for ; Sat, 2 Apr 2022 09:10:59 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id f6-20020a1c3806000000b0038e4a0fc5easo3110199wma.3 for ; Sat, 02 Apr 2022 09:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MeEzhbEHtTaBVg6MOBhhPaE+R0IoY5wZDi9UCIaHSQg=; b=qQ3mmZGmrwO2VkGXezDqzD2SnKGJgygyFIraTsYqVcBP0Bnca1L1uANe/p+h52d8mu mUVv/IgvsZX6yOTuCg/5mK9fnmHOOcRYRW97HcwxmzMZh5eqU2HxHzostQftPV8nRpm6 9N+dwwEQy1Zr0btmsWnCG9cfQo5dHXw8c75t2AV8KECFocLKXy5sy+PpFIvjYptew061 7tiNnQf/qeXfLUIQnKwe2JuPQ30J8jfRCiDaeKkDbUIxZT/8whE3G2pW5jzYfKhwGSOa EUqbBytJtMCI+fSUx60JwU5kXv1encO1/n7RrS+fbzgo1zJK5YjWx7KCD7yfGU0PcdHx bjPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MeEzhbEHtTaBVg6MOBhhPaE+R0IoY5wZDi9UCIaHSQg=; b=p2ov/WU1xGDSPp3UeonIIBIb+00atJJMzJGwGtJXejkCZw1Bh19dCCT/KWp0p2PyUv B6oVjZsEFJDHyrjU34JRTSJ0TjcciJEYSqEK3qOygesSRM3od6QJkxz5AHtHY1hqlbl1 4/3NByFpI5mOoP5lGi74iW04HzxM8KlqS0Ap16rsMdnhSyRdEvY2g9DwfDhR8DaMR9nG ia4zvymG0VAVYVwk1ys96kh5KusCj1OAfikPN3FRrXXL/ew/HW2HoV4ZzjIdNyd/eoZK lhBu6CKwp9I8s6aQG0w559cCtQ5DH2rr/3Z5Gbfj68/MNAvz0GHE7g4DTrZkmxlNnee5 sDcQ== X-Gm-Message-State: AOAM532fKdc627otcpHMe9ftb7y+r9Kbg1P9aGp1d1sVWnmei8b5jvO5 i7AWj9DaydRFPNALh/0dlKjqK3eZHws= X-Google-Smtp-Source: ABdhPJwwMtgXx9+67ULxuUy9zkX9Iq86V2sUZZ9QVa1y90D5Qud3rBsrTprnOqSBFIDp1oGsJrnlKQ== X-Received: by 2002:a05:600c:19cd:b0:38c:b84f:41fb with SMTP id u13-20020a05600c19cd00b0038cb84f41fbmr12898049wmq.137.1648915856795; Sat, 02 Apr 2022 09:10:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n23-20020a05600c3b9700b0038b7c4c0803sm13904268wms.30.2022.04.02.09.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:10:56 -0700 (PDT) Message-Id: <03022a2fcd14bad453925c616d86bc2f69926456.1648915853.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:49 +0000 Subject: [PATCH v2 2/6] sequencer: factor GIT_AUTHOR_* from message strings Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , Bagas Sanjaya Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Bagas Sanjaya From: Bagas Sanjaya Factor messages containing GIT_AUTHOR_* variable. Signed-off-by: Bagas Sanjaya --- sequencer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index 84eed9e96bc..647f5efa656 100644 --- a/sequencer.c +++ b/sequencer.c @@ -848,17 +848,17 @@ int read_author_script(const char *path, char **name, char **email, char **date, for (i = 0; i < kv.nr; i++) { if (!strcmp(kv.items[i].string, "GIT_AUTHOR_NAME")) { if (name_i != -2) - name_i = error(_("'GIT_AUTHOR_NAME' already given")); + name_i = error(_("'%s' already given"), "GIT_AUTHOR_NAME"); else name_i = i; } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_EMAIL")) { if (email_i != -2) - email_i = error(_("'GIT_AUTHOR_EMAIL' already given")); + email_i = error(_("'%s' already given"), "GIT_AUTHOR_EMAIL"); else email_i = i; } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_DATE")) { if (date_i != -2) - date_i = error(_("'GIT_AUTHOR_DATE' already given")); + date_i = error(_("'%s' already given"), "GIT_AUTHOR_DATE"); else date_i = i; } else { @@ -867,11 +867,11 @@ int read_author_script(const char *path, char **name, char **email, char **date, } } if (name_i == -2) - error(_("missing 'GIT_AUTHOR_NAME'")); + error(_("missing '%s'"), "GIT_AUTHOR_NAME"); if (email_i == -2) - error(_("missing 'GIT_AUTHOR_EMAIL'")); + error(_("missing '%s'"), "GIT_AUTHOR_EMAIL"); if (date_i == -2) - error(_("missing 'GIT_AUTHOR_DATE'")); + error(_("missing '%s'"), "GIT_AUTHOR_DATE"); if (date_i < 0 || email_i < 0 || date_i < 0 || err) goto finish; *name = kv.items[name_i].util; From patchwork Sat Apr 2 16:10:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12799380 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 B62BFC433EF for ; Sat, 2 Apr 2022 16:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357838AbiDBQNm (ORCPT ); Sat, 2 Apr 2022 12:13:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357799AbiDBQMx (ORCPT ); Sat, 2 Apr 2022 12:12:53 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11E2C2BB04 for ; Sat, 2 Apr 2022 09:11:00 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id n63-20020a1c2742000000b0038d0c31db6eso3128303wmn.1 for ; Sat, 02 Apr 2022 09:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=EwPq+9rE7e8zBOOW8EY1TMYNsoLygqEpgTGSLz2TGu8=; b=JDGMNaWv8x7DtrGNfHvugeMfvSj/h+3CiHqyI/2EAOF068HIAxFT+fqWHFeQNSRgaw LBcw15TfS6TUSsycnfI3GJZ9l27EeDszaebptwEM0tQmQghBOvuPNiIMdQMHlDa5XLHc uw8aE6gaFNIXQIC3dAzm/ot0d/qZjcxykYo1E7h1ALwmuDRMZ/JUynd5k0i38t7cmMZS c25WMD8w5SiC05Lm+gw8Hb4RUq1siocrRSeVUGmjw9A/UldSGJH/6Ne6g9aYw7kF+o/8 BZoJUr8lrGSbrLzwDGT6gkGTe4nyEk+Db8WlyQcwjEtrq9zUBdhIJvX6hz63tejj3jcD Ny6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=EwPq+9rE7e8zBOOW8EY1TMYNsoLygqEpgTGSLz2TGu8=; b=766KLi12IisOayGd7xjN0+DGSs5x6aDmxFijTB2eu6ffX945RJ8JSCTVw/mYxQGFE4 AQcnxG5lCZ+U0XjF8TajqDT7dfG8boBZW1Mx7/7bUuhSc+fpzVuV5H3FfG33XTy/JeiN 07uRW/lfyWGg2e92CQfTAKz40ZzsmA16dQBuqy1b1NcJDIamt5+m0dvQnYYQT7u0HlVF vKw7Mb3/GXRd35e2mIpwCONj/Nxxu1qbIKNZMhNh49yv/ojeq3w4OpM7jcqLUVkIkzLh KWNhBo0RukqRPkCGE/GJOx35BjHhQpedvokNkZeuM5kfpEJub5GaXNJ6rC6AvmIJbpKb 9dZg== X-Gm-Message-State: AOAM531gz97kAHIirOyXrv4wjkifjHYbNsDa54P3DiVTf0K05bdhwBAQ bXyYYbsFtYBoT15AI7BiI9PIGSnpmso= X-Google-Smtp-Source: ABdhPJzKXD83I0o4jvbSUXe1fE+tZrCarCmBx4oTjdkEBkKUUzSU6kralfWFV0rNCZ8BRVT7lHk5cw== X-Received: by 2002:a7b:c381:0:b0:37b:e01f:c1c0 with SMTP id s1-20020a7bc381000000b0037be01fc1c0mr13333739wmj.98.1648915858373; Sat, 02 Apr 2022 09:10:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b5-20020adfde05000000b00205bdc6bd57sm5146430wrm.95.2022.04.02.09.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:10:58 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:50 +0000 Subject: [PATCH v2 3/6] i18n: factorize server support messages in fetch-pack MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= The messages "Server supports foo" and "Server does not support bar" are uniformized and options are quoted. Signed-off-by: Jean-Noël Avila --- fetch-pack.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 2e6795cd439..da3075f61f2 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1044,78 +1044,78 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, advertise_sid = 0; if (server_supports("shallow")) - print_verbose(args, _("Server supports %s"), "shallow"); + print_verbose(args, _("Server supports '%s'"), "shallow"); else if (args->depth > 0 || is_repository_shallow(r)) die(_("Server does not support shallow clients")); if (args->depth > 0 || args->deepen_since || args->deepen_not) args->deepen = 1; if (server_supports("multi_ack_detailed")) { - print_verbose(args, _("Server supports %s"), "multi_ack_detailed"); + print_verbose(args, _("Server supports '%s'"), "multi_ack_detailed"); multi_ack = 2; if (server_supports("no-done")) { - print_verbose(args, _("Server supports %s"), "no-done"); + print_verbose(args, _("Server supports '%s'"), "no-done"); if (args->stateless_rpc) no_done = 1; } } else if (server_supports("multi_ack")) { - print_verbose(args, _("Server supports %s"), "multi_ack"); + print_verbose(args, _("Server supports '%s'"), "multi_ack"); multi_ack = 1; } if (server_supports("side-band-64k")) { - print_verbose(args, _("Server supports %s"), "side-band-64k"); + print_verbose(args, _("Server supports '%s'"), "side-band-64k"); use_sideband = 2; } else if (server_supports("side-band")) { - print_verbose(args, _("Server supports %s"), "side-band"); + print_verbose(args, _("Server supports '%s'"), "side-band"); use_sideband = 1; } if (server_supports("allow-tip-sha1-in-want")) { - print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want"); + print_verbose(args, _("Server supports '%s'"), "allow-tip-sha1-in-want"); allow_unadvertised_object_request |= ALLOW_TIP_SHA1; } if (server_supports("allow-reachable-sha1-in-want")) { - print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want"); + print_verbose(args, _("Server supports '%s'"), "allow-reachable-sha1-in-want"); allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; } if (server_supports("thin-pack")) - print_verbose(args, _("Server supports %s"), "thin-pack"); + print_verbose(args, _("Server supports '%s'"), "thin-pack"); else args->use_thin_pack = 0; if (server_supports("no-progress")) - print_verbose(args, _("Server supports %s"), "no-progress"); + print_verbose(args, _("Server supports '%s'"), "no-progress"); else args->no_progress = 0; if (server_supports("include-tag")) - print_verbose(args, _("Server supports %s"), "include-tag"); + print_verbose(args, _("Server supports '%s'"), "include-tag"); else args->include_tag = 0; if (server_supports("ofs-delta")) - print_verbose(args, _("Server supports %s"), "ofs-delta"); + print_verbose(args, _("Server supports '%s'"), "ofs-delta"); else prefer_ofs_delta = 0; if (server_supports("filter")) { server_supports_filtering = 1; - print_verbose(args, _("Server supports %s"), "filter"); + print_verbose(args, _("Server supports '%s'"), "filter"); } else if (args->filter_options.choice) { warning("filtering not recognized by server, ignoring"); } if (server_supports("deepen-since")) { - print_verbose(args, _("Server supports %s"), "deepen-since"); + print_verbose(args, _("Server supports '%s'"), "deepen-since"); deepen_since_ok = 1; } else if (args->deepen_since) - die(_("Server does not support --shallow-since")); + die(_("Server does not support '%s'"), "--shallow-since"); if (server_supports("deepen-not")) { - print_verbose(args, _("Server supports %s"), "deepen-not"); + print_verbose(args, _("Server supports '%s'"), "deepen-not"); deepen_not_ok = 1; } else if (args->deepen_not) - die(_("Server does not support --shallow-exclude")); + die(_("Server does not support '%s'"), "--shallow-exclude"); if (server_supports("deepen-relative")) - print_verbose(args, _("Server supports %s"), "deepen-relative"); + print_verbose(args, _("Server supports '%s'"), "deepen-relative"); else if (args->deepen_relative) - die(_("Server does not support --deepen")); + die(_("Server does not support '%s'"), "--deepen"); if (!server_supports_hash(the_hash_algo->name, NULL)) die(_("Server does not support this repository's object format")); From patchwork Sat Apr 2 16:10:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12799383 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 E4B9FC433FE for ; Sat, 2 Apr 2022 16:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244986AbiDBQNw (ORCPT ); Sat, 2 Apr 2022 12:13:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357801AbiDBQMx (ORCPT ); Sat, 2 Apr 2022 12:12:53 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D743C62115 for ; Sat, 2 Apr 2022 09:11:00 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 123-20020a1c1981000000b0038b3616a71aso3106886wmz.4 for ; Sat, 02 Apr 2022 09:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=oPGaaJhxrabAKvb/cOHoN2g3vo5BKYuWyxUt8mGzUow=; b=PYB07+kZJDDCwbDomPJnc6839gY32DyyUjrGnatNUgQ+Ei4Cm0mtxHCBQF4sKo+WzT 52G/szyZnbYW/D1b5qn5FHCpPtXNCRu4dnOnOzgjf1dELmeZ96UDRaU4AwQaon5lZ3Ce hfgvXpju3lsxlxrLE+DCWxXEDA0HfbXzZBAWVg/BdykhBwIAvds/c4s/PB44e9ZEcmdl vVhdp1ykpbTJlKITuJD9eg1FXnM9ZRbSzS+gFClLrqXrflXg7+2hweeMSciCpKFRW25O fhSYFjFrfQZsOaAvLJVOtP/fOkjrdT2ZEm+7ajhYoYd1BA24RsECpjukWNMU+HiZ9vOv NXGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=oPGaaJhxrabAKvb/cOHoN2g3vo5BKYuWyxUt8mGzUow=; b=A3mxhpfx1Zo1R0iyfKTxZzyBb9Zldxxh/J7TSe7J5+hUnU7E4KaEr8eXlJ084LedYa 1kPhx3Zm5gza1/Q2b7BcSu3nWS2LjZDyLc8/pKbXM7uuhnMksbhEXfRJfXRmezkxxYsD yvw3yLobNPYkENoRdBfDy2wbzi+j8D+dbH2ZNx9T5sHhRhH8M0t9TEvS73omysXInC63 afEOyCNfw8UPIReHoUsUdNEjtNAAjCw+u0Y8nFA/nkBqY5YeVia+1hd+UD4ke6MwejiA tp91nE6bkyf9bSQIRCuWuKp1ErNuwgofO8gEtDi3hrl6SDs2npf2Vy9s28RZ2z5XXH+W O/dw== X-Gm-Message-State: AOAM532b2I8I2/4AjKnywVj3/4s8idUEi1qgZsIpEISFVhVgooAD8cII NkPmpGUriCck6jR7ds6Rm0s33M9zCX4= X-Google-Smtp-Source: ABdhPJyAS5ZjNPm4TV7/8wI13OEWuWoXsn7AwCSJRXLWMpdyvSD8DyZw1gd+bXspxup8OX6ShZ6ndA== X-Received: by 2002:a05:600c:3c8c:b0:38e:4c59:6852 with SMTP id bg12-20020a05600c3c8c00b0038e4c596852mr9393881wmb.194.1648915859194; Sat, 02 Apr 2022 09:10:59 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i206-20020a1c3bd7000000b0038bfc3ab76csm4749482wma.48.2022.04.02.09.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:10:58 -0700 (PDT) Message-Id: <6221c37145c22a79bc1598be1e82be50d61636cc.1648915853.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:51 +0000 Subject: [PATCH v2 4/6] i18n: factorize "foo does not take arguments" messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= The messages are split into the ones for ref-filter which deal with atoms and scalar which has an option. Signed-off-by: Jean-Noël Avila --- contrib/scalar/scalar.c | 2 +- ref-filter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c index 7db2a97416e..7ef1f141366 100644 --- a/contrib/scalar/scalar.c +++ b/contrib/scalar/scalar.c @@ -502,7 +502,7 @@ cleanup: static int cmd_list(int argc, const char **argv) { if (argc != 1) - die(_("`scalar list` does not take arguments")); + die(_("the '%s' command does not take arguments"), "scalar list"); if (run_git("config", "--global", "--get-all", "scalar.repo", NULL) < 0) return -1; diff --git a/ref-filter.c b/ref-filter.c index 7838bd22b8d..8497f9e25d8 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -317,7 +317,7 @@ static int objecttype_atom_parser(struct ref_format *format, struct used_atom *a const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(objecttype) does not take arguments")); + return strbuf_addf_ret(err, -1, _("the atom '%s' does not take arguments"), "%(objecttype)"); if (*atom->name == '*') oi_deref.info.typep = &oi_deref.type; else @@ -349,7 +349,7 @@ static int deltabase_atom_parser(struct ref_format *format, struct used_atom *at const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments")); + return strbuf_addf_ret(err, -1, _("the atom '%s' does not take arguments"), "%(deltabase)"); if (*atom->name == '*') oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid; else @@ -361,7 +361,7 @@ static int body_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(body) does not take arguments")); + return strbuf_addf_ret(err, -1, _("the atom '%s' does not take arguments"), "%(body)"); atom->u.contents.option = C_BODY_DEP; return 0; } @@ -565,7 +565,7 @@ static int rest_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(rest) does not take arguments")); + return strbuf_addf_ret(err, -1, _("the atom '%s' does not take arguments"), "%(rest)"); format->use_rest = 1; return 0; } From patchwork Sat Apr 2 16:10:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12799382 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 14956C433EF for ; Sat, 2 Apr 2022 16:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345070AbiDBQNs (ORCPT ); Sat, 2 Apr 2022 12:13:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357802AbiDBQMy (ORCPT ); Sat, 2 Apr 2022 12:12:54 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8BA164BD5 for ; Sat, 2 Apr 2022 09:11:01 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id h4so8197632wrc.13 for ; Sat, 02 Apr 2022 09:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=1R2UzCg28D/ALA1Cki6FHlH7wtdUVpK2izrcgPgAf9I=; b=ktPGmjbfMrzcYNuZoo9GOg9830pQ4Uh/yT4H17xZL0WRrLwM+E8kXSinNMPyhDOw6q qbU82k8Kx4rAhagGlHx5yEm/nekXVEPoX3l0WNylpuDpXJ1LRjxGReEL0FqJPb4nXoZv QUCorxKxri1rhfC8y/GRn9vhWdA7qxWjPsJnEN9jND2hrvIY0NGgNRN3nmNvsGhL5FOI EwogsmIea3YNUb1ul1GWmYXPEnFQb+SMmgV8XQ4LaKYXcNKLFaWwx4vwtOuJ5gTfN6NJ i0YOZoZP53XYQL9LkXnvLtqT2LL64M2ujOAlvuQmXAkqnBq/ZpGWHthJsIVdI2+icFmy A/sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=1R2UzCg28D/ALA1Cki6FHlH7wtdUVpK2izrcgPgAf9I=; b=6QJreM9JeEUeKLbvC4IC0xwb9df80xufJbQVrkv3RXzt2Y6iWkkMVclgHEAlK7znik 8PLcwQzMvpum8Y4We3dp/Df2B/vjht6gkMAPEbptYaFVEzC0njdtWlbLvE4azm/Bn2F6 BeEgRQxkuZw63uXwIuuym61gHqIVsG+J+PQyIDC59tQbD20zYfKFRhxBgWUq+gzHWxGV RfEjQCs4wHIFnIKZnQr8tU/Fgcy+u85RIrpwC9+2EQWi3T7tRBwyp9dK3IJ3kckbFLlJ aeIwOtYbBqdgtV0CAYZIQdxRFStb4MA4gg96pA6kPle8s4pgG+ae6CpglnQoGm+4ocu7 KoDg== X-Gm-Message-State: AOAM532J+7D1XHGZLgOEHU3x9oKRdHsfZsBRaXqScTk10EUJYHe3WK0c kFGa6lnsaMw+dyXo+bZl6RouJOsXBIc= X-Google-Smtp-Source: ABdhPJyvXinbJSXZA3mTzFOjLJppbYlKoptUdfe+muyuoPRSWMVuLZtWJZw83lI5lUPZuSV4uWHbIA== X-Received: by 2002:adf:d1e5:0:b0:205:85f5:656c with SMTP id g5-20020adfd1e5000000b0020585f5656cmr11316603wrd.65.1648915860034; Sat, 02 Apr 2022 09:11:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g17-20020a05600c4ed100b0038ca32d0f26sm5202430wmq.17.2022.04.02.09.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:10:59 -0700 (PDT) Message-Id: <1888778902aa1d0d2cf118cfb7fe4b2e407953c6.1648915853.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:52 +0000 Subject: [PATCH v2 5/6] i18n: factorize read-cache error messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- read-cache.c | 8 ++++---- t/t1600-index.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/read-cache.c b/read-cache.c index 1ad56d02e1d..639765e8ff1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1735,8 +1735,8 @@ static unsigned int get_index_format_default(struct repository *r) if (r->settings.index_version >= 0) version = r->settings.index_version; if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { - warning(_("index.version set, but the value is invalid.\n" - "Using version %i"), INDEX_FORMAT_DEFAULT); + warning(_("'%s' set, but the value is invalid.\n" + "Using version %i"), "index.version", INDEX_FORMAT_DEFAULT); return INDEX_FORMAT_DEFAULT; } return version; @@ -1745,8 +1745,8 @@ static unsigned int get_index_format_default(struct repository *r) version = strtoul(envversion, &endp, 10); if (*endp || version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { - warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n" - "Using version %i"), INDEX_FORMAT_DEFAULT); + warning(_("'%s' set, but the value is invalid.\n" + "Using version %i"), "GIT_INDEX_VERSION", INDEX_FORMAT_DEFAULT); version = INDEX_FORMAT_DEFAULT; } return version; diff --git a/t/t1600-index.sh b/t/t1600-index.sh index 010989f90e6..60339db529f 100755 --- a/t/t1600-index.sh +++ b/t/t1600-index.sh @@ -19,7 +19,7 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' ' git add a 2>err && sed "s/[0-9]//" err >actual.err && sed -e "s/ Z$/ /" <<-\EOF >expect.err && - warning: GIT_INDEX_VERSION set, but the value is invalid. + warning: '\''GIT_INDEX_VERSION'\'' set, but the value is invalid. Using version Z EOF test_cmp expect.err actual.err @@ -34,7 +34,7 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' ' git add a 2>err && sed "s/[0-9]//" err >actual.err && sed -e "s/ Z$/ /" <<-\EOF >expect.err && - warning: GIT_INDEX_VERSION set, but the value is invalid. + warning: '\''GIT_INDEX_VERSION'\'' set, but the value is invalid. Using version Z EOF test_cmp expect.err actual.err @@ -58,7 +58,7 @@ test_expect_success 'out of bounds index.version issues warning' ' git add a 2>err && sed "s/[0-9]//" err >actual.err && sed -e "s/ Z$/ /" <<-\EOF >expect.err && - warning: index.version set, but the value is invalid. + warning: '\''index.version'\'' set, but the value is invalid. Using version Z EOF test_cmp expect.err actual.err From patchwork Sat Apr 2 16:10:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12799384 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 DCD9DC433F5 for ; Sat, 2 Apr 2022 16:12:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357835AbiDBQNx (ORCPT ); Sat, 2 Apr 2022 12:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357807AbiDBQMz (ORCPT ); Sat, 2 Apr 2022 12:12:55 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6FFF60AA5 for ; Sat, 2 Apr 2022 09:11:02 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id i132-20020a1c3b8a000000b0038ce25c870dso5204962wma.1 for ; Sat, 02 Apr 2022 09:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=7It6bH5SbEm2fNaRJODy5NYnivF4JboZW01xvzCjn4E=; b=WKZj2tkviIKF8B0c1PDU6tLy+yyqV6v1hNQ4peVUuOVBQI3xHqzTTCB5RDGk1XFiqE UBqi8E5+GDsUQRHWmw4ucsq3Mw8gvbtnQzIoDq3URDOiSr6F+KFsBJAohUYNKVmblaQa vVoEcu9dz2X0yGmLJiMIwCWRpROzhd3ltShsHOIz7ZcRjgpIP976Vjf0pwwodeLJM1Lf uIyaKuZVptEdxoWTY8/xhUTUJcmwGhz7Hx2hAJXTpgJSgH7xdtn8/PN+OYukFlNC7TKd aZqSsa5P6EWr9D1yyFeAf3V/jhG8KuHpdWhm+UdsxreRSrV9dZfBRWVPqsIrPT873pKG qBlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=7It6bH5SbEm2fNaRJODy5NYnivF4JboZW01xvzCjn4E=; b=T0sR/TwF+2z+VUcVNenUnEP1Ot9p31WQjsmDzeDKcFhv8RftZIfmEAgkqwpJA4qfAU MWIs9OpNIqvOvAJ4IUahs4DilRJ+eOKDItELWLS+Aih5Wdgv6tUE6zmMJ5a8TDzeAhfS 9lUn1ah/LudGYEAmBn659HKBFJMimocfmnvixlp2FETsz9bkzf4cwBFSJiaEpQdlvhrE wqZIRfsEiAe7LFCqls9DM9SephZgUpiFpHCmpvam8MB6zxLrVCRNAb9/ioSGQjgyHifb nHyesfK1Sz5GpCjo01JULq9ELCfs+MbAMkWTtbpL4RG4wi+2gudhns2nkavhVhnpoXxr oxDA== X-Gm-Message-State: AOAM53278ghHV63sJtX9GNep+SXkqVAbsqSDC6JoVkTk+OtFRWgAuQVr 5W3DbkwqnzDZjfx3tYEPv9ZLq2gCGA8= X-Google-Smtp-Source: ABdhPJzSrr3vVnwlh5TKSiGEHYPMN0oGHaRaNIQQColTbSdH57tt3MrE55R0xgRQE7k7hnjsG/8Fqg== X-Received: by 2002:a05:600c:34c5:b0:38c:30e3:1e6c with SMTP id d5-20020a05600c34c500b0038c30e31e6cmr13206793wmq.144.1648915860876; Sat, 02 Apr 2022 09:11:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n14-20020a7bcbce000000b0038c7776a300sm18149041wmi.0.2022.04.02.09.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 09:11:00 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 02 Apr 2022 16:10:53 +0000 Subject: [PATCH v2 6/6] i18n: factorize "bad argument" messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Bagas Sanjaya , Johannes Sixt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= We also quote the placeholders as they replace constant strings. Signed-off-by: Jean-Noël Avila --- builtin/bisect--helper.c | 2 +- builtin/commit-graph.c | 2 +- builtin/config.c | 2 +- builtin/env--helper.c | 2 +- builtin/gc.c | 4 ++-- diff.c | 4 ++-- grep.c | 2 +- send-pack.c | 2 +- submodule-config.c | 8 ++++---- submodule.c | 2 +- t/t1300-config.sh | 2 +- t/t7900-maintenance.sh | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8b2b259ff0d..3ed8a5f40b6 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -268,7 +268,7 @@ static int bisect_write(const char *state, const char *rev, } else if (one_of(state, terms->term_good, "skip", NULL)) { strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev); } else { - res = error(_("Bad bisect_write argument: %s"), state); + res = error(_("bad '%s' argument: '%s'"), "bisect_write", state); goto finish; } diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 51c4040ea6c..913478bb029 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -134,7 +134,7 @@ static int write_option_parse_split(const struct option *opt, const char *arg, else if (!strcmp(arg, "replace")) *flags = COMMIT_GRAPH_SPLIT_REPLACE; else - die(_("unrecognized --split argument, %s"), arg); + die(_("bad '%s' argument: '%s'"), "--split", arg); return 0; } diff --git a/builtin/config.c b/builtin/config.c index e7b88a9c08d..2ac36e4f641 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -106,7 +106,7 @@ static int option_parse_type(const struct option *opt, const char *arg, else if (!strcmp(arg, "color")) new_type = TYPE_COLOR; else - die(_("unrecognized --type argument, %s"), arg); + die(_("bad '%s' argument: '%s'"), "--type", arg); } to_type = opt->value; diff --git a/builtin/env--helper.c b/builtin/env--helper.c index 27349098b07..49790dfa2fb 100644 --- a/builtin/env--helper.c +++ b/builtin/env--helper.c @@ -24,7 +24,7 @@ static int option_parse_type(const struct option *opt, const char *arg, else if (!strcmp(arg, "ulong")) *cmdmode = ENV_HELPER_TYPE_ULONG; else - die(_("unrecognized --type argument, %s"), arg); + die(_("bad '%s' argument: '%s'"), "--type", arg); return 0; } diff --git a/builtin/gc.c b/builtin/gc.c index c062d7bceeb..cca6987fcbd 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -750,7 +750,7 @@ static int maintenance_opt_schedule(const struct option *opt, const char *arg, *priority = parse_schedule(arg); if (!*priority) - die(_("unrecognized --schedule argument '%s'"), arg); + die(_("bad '%s' argument: '%s'"), "--schedule", arg); return 0; } @@ -2393,7 +2393,7 @@ static int maintenance_opt_scheduler(const struct option *opt, const char *arg, *scheduler = parse_scheduler(arg); if (*scheduler == SCHEDULER_INVALID) - return error(_("unrecognized --scheduler argument '%s'"), arg); + return error(_("bad '%s' argument: '%s'"), "--scheduler", arg); return 0; } diff --git a/diff.c b/diff.c index 6b22946cd0e..c74f6e7b920 100644 --- a/diff.c +++ b/diff.c @@ -5010,7 +5010,7 @@ static int diff_opt_color_moved(const struct option *opt, } else { int cm = parse_color_moved(arg); if (cm < 0) - return error(_("bad --color-moved argument: %s"), arg); + return error(_("bad '%s' argument: '%s'"), "--color-moved", arg); options->color_moved = cm; } return 0; @@ -5334,7 +5334,7 @@ static int diff_opt_word_diff(const struct option *opt, else if (!strcmp(arg, "none")) options->word_diff = DIFF_WORDS_NONE; else - return error(_("bad --word-diff argument: %s"), arg); + return error(_("bad '%s' argument: '%s'"), "--word-diff", arg); } else { if (options->word_diff == DIFF_WORDS_NONE) options->word_diff = DIFF_WORDS_PLAIN; diff --git a/grep.c b/grep.c index 82eb7da1022..6aabfc58bb3 100644 --- a/grep.c +++ b/grep.c @@ -43,7 +43,7 @@ static int parse_pattern_type_arg(const char *opt, const char *arg) return GREP_PATTERN_TYPE_FIXED; else if (!strcmp(arg, "perl")) return GREP_PATTERN_TYPE_PCRE; - die("bad %s argument: %s", opt, arg); + die("bad '%s' argument: '%s'", opt, arg); } define_list_config_array_extra(color_grep_slots, {"match"}); diff --git a/send-pack.c b/send-pack.c index bc0fcdbb000..68205e8a913 100644 --- a/send-pack.c +++ b/send-pack.c @@ -36,7 +36,7 @@ int option_parse_push_signed(const struct option *opt, *(int *)(opt->value) = SEND_PACK_PUSH_CERT_IF_ASKED; return 0; } - die("bad %s argument: %s", opt->long_name, arg); + die("bad '%s' argument: '%s'", opt->long_name, arg); } static void feed_object(const struct object_id *oid, FILE *fh, int negative) diff --git a/submodule-config.c b/submodule-config.c index 29668b0620d..76264c6e6b6 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -292,7 +292,7 @@ static int parse_fetch_recurse(const char *opt, const char *arg, * git-completion.bash when you add new options. */ if (die_on_error) - die("bad %s argument: %s", opt, arg); + die("bad '%s' argument: '%s'", opt, arg); else return RECURSE_SUBMODULES_ERROR; } @@ -342,7 +342,7 @@ static int parse_update_recurse(const char *opt, const char *arg, return RECURSE_SUBMODULES_OFF; default: if (die_on_error) - die("bad %s argument: %s", opt, arg); + die("bad '%s' argument: '%s'", opt, arg); return RECURSE_SUBMODULES_ERROR; } } @@ -359,7 +359,7 @@ static int parse_push_recurse(const char *opt, const char *arg, case 1: /* There's no simple "on" value when pushing */ if (die_on_error) - die("bad %s argument: %s", opt, arg); + die("bad '%s' argument: '%s'", opt, arg); else return RECURSE_SUBMODULES_ERROR; case 0: @@ -376,7 +376,7 @@ static int parse_push_recurse(const char *opt, const char *arg, * git-completion.bash when you add new modes. */ else if (die_on_error) - die("bad %s argument: %s", opt, arg); + die("bad '%s' argument: '%s'", opt, arg); else return RECURSE_SUBMODULES_ERROR; } diff --git a/submodule.c b/submodule.c index 5ace18a7d94..c08477762d9 100644 --- a/submodule.c +++ b/submodule.c @@ -470,7 +470,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, else if (!strcmp(arg, "dirty")) diffopt->flags.ignore_dirty_submodules = 1; else if (strcmp(arg, "none")) - die(_("bad --ignore-submodules argument: %s"), arg); + die(_("bad '%s' argument: '%s'"), "--ignore-submodules", arg); /* * Please update _git_status() in git-completion.bash when you * add new options diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 7dd9b325d90..69cb3af0885 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2215,7 +2215,7 @@ test_expect_success 'unset type specifiers may be reset to conflicting ones' ' test_expect_success '--type rejects unknown specifiers' ' test_must_fail git config --type=nonsense section.foo 2>error && - test_i18ngrep "unrecognized --type argument" error + test_i18ngrep "bad '\''--type'\'' argument" error ' test_expect_success '--replace-all does not invent newlines' ' diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 74aa6384755..c5e62e95533 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -401,7 +401,7 @@ test_expect_success '--auto and --schedule incompatible' ' test_expect_success 'invalid --schedule value' ' test_must_fail git maintenance run --schedule=annually 2>err && - test_i18ngrep "unrecognized --schedule" err + test_i18ngrep "bad '\''--schedule'\''" err ' test_expect_success '--schedule inheritance weekly -> daily -> hourly' ' @@ -529,7 +529,7 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' ' test_expect_success 'start --scheduler=' ' test_expect_code 129 git maintenance start --scheduler=foo 2>err && - test_i18ngrep "unrecognized --scheduler argument" err && + test_i18ngrep "bad '\''--scheduler'\'' argument" err && test_expect_code 129 git maintenance start --no-scheduler 2>err && test_i18ngrep "unknown option" err &&