From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: git@vger.kernel.org, John Cai <johncai86@gmail.com>,
Patrick Steinhardt <ps@pks.im>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v2 2/3] pack-objects: use the missing action API
Date: Wed, 15 May 2024 09:46:42 -0700 [thread overview]
Message-ID: <xmqqo797xbt9.fsf@gitster.g> (raw)
In-Reply-To: <20240515132543.851987-3-christian.couder@gmail.com> (Christian Couder's message of "Wed, 15 May 2024 15:25:42 +0200")
Christian Couder <christian.couder@gmail.com> writes:
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index baf0090fc8..55d08c686d 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -39,6 +39,7 @@
> #include "promisor-remote.h"
> #include "pack-mtimes.h"
> #include "parse-options.h"
> +#include "missing.h"
>
> /*
> * Objects we are going to pack are collected in the `to_pack` structure.
> @@ -250,11 +251,6 @@ static unsigned long window_memory_limit = 0;
>
> static struct string_list uri_protocols = STRING_LIST_INIT_NODUP;
>
> -enum missing_action {
> - MA_ERROR = 0, /* fail if any missing objects are encountered */
> - MA_ALLOW_ANY, /* silently allow ALL missing objects */
> - MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */
> -};
Interesting. This used to be private to this file, shared the same
name and most of the values with the one used in rev-list, but not
identical (i.e. the new "missing" API knows about MA_PRINT but this
side has been unaware of that value).
> @@ -3826,33 +3822,39 @@ static void show_object__ma_allow_promisor(struct object *obj, const char *name,
> show_object(obj, name, data);
> }
>
> +static show_object_fn show_object_fn_from_action(enum missing_action action)
> +{
> + switch (action) {
> + case MA_ERROR:
> + return show_object;
> + case MA_ALLOW_ANY:
> + return show_object__ma_allow_any;
> + case MA_ALLOW_PROMISOR:
> + return show_object__ma_allow_promisor;
> + default:
> + BUG("invalid missing action %d", action);
As this is BUG() to catch programming error, ("%d" % action) is OK;
if this were end-user facint, we would also want to pass the "arg"
string the caller had only for error reporting.
> static int option_parse_missing_action(const struct option *opt UNUSED,
> const char *arg, int unset)
> {
> + int res;
> +
> assert(arg);
> assert(!unset);
>
> + res = parse_missing_action_value(arg);
> + if (res < 0 || (res != MA_ERROR &&
> + res != MA_ALLOW_ANY &&
> + res != MA_ALLOW_PROMISOR))
> + die(_("invalid value for '%s': '%s'"), "--missing", arg);
What is our expectation for how <missing.h> API would evolve over
time? I think it is a given that it will always be a superset of
the need of rev-list and the need of pack-objects, but if we were
to add a new value of MA_FOO, do we expect that all of the new ones
are not handled by pack-objects, Some but not all? Or none of the
new ones are handled by pack-objects?
Regardless of the answer to that question, I think a simple helper
is warranted here, which will also help the [3/3] which adds exactly
the same code to upload-pack.c:upload_pack_config(), so that the
callers can do
res = parse_missing_action_value_for_packing(arg);
if (res < 0)
die(_("invalid value for '%s': '%s'"), "--missing", arg);
something like
int parse_missing_action_value_for_packing(const char *arg)
{
int res = parse_missing_action_value(arg);
if (res < 0)
return res;
switch (res) {
case MA_ERROR:
case MA_ALLOW_ANY:
case MA_ALLOW_PROMISOR:
return res;
default:
return -2 - res;
}
}
here, and also in the other place [3/3] adds. This thin wrapper
returns:
0 <= res : MA_FOO values that are OK for packing
-1 = res : parse_missing_action_value() failed
-1 > res : (2 - res) is the MA_FOO which is unsuitable for packing
to allow the caller to recover which value the user gave us that is
unsuitable for packing, if it wanted to.
> + if (res != MA_ERROR)
> fetch_if_missing = 0;
> + arg_missing_action = res;
> + fn_show_object = show_object_fn_from_action(arg_missing_action);
>
> - die(_("invalid value for '%s': '%s'"), "--missing", arg);
> return 0;
> }
Hmph, wouldn't a small array of show_object_fn suffice, making the
whole thing more like:
static show_object_fn const fn[] = {
[MA_ERROR] = show_object,
[MA_ALLOW_ANY] = show_object__ma_allow_any,
[MA_ALLOW_PROMISOR] = show_object__ma_allow_promisor,
};
res = parse_missing_action_value_for_packing(arg);
if (res < 0 || ARRAY_SIZE[fn] <= res)
die(_("invalid value for '%s': '%s'"), "--missing", arg);
fn_show_object = fn[res];
return 0;
without the need for show_object_fn_from_action() helper function?
Other than that, the intention of the code is very clear.
Will queue. Thanks.
next prev parent reply other threads:[~2024-05-15 16:46 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 13:51 [PATCH 0/3] Implement filtering repacks Christian Couder
2022-10-12 13:51 ` [PATCH 1/3] pack-objects: allow --filter without --stdout Christian Couder
2022-10-12 13:51 ` [PATCH 2/3] repack: add --filter=<filter-spec> option Christian Couder
2022-10-12 13:51 ` [PATCH 3/3] repack: introduce --force to force filtering Christian Couder
2022-10-14 16:46 ` [PATCH 0/3] Implement filtering repacks Junio C Hamano
2022-10-20 11:23 ` Christian Couder
2022-10-28 19:49 ` Taylor Blau
2022-10-28 20:26 ` Junio C Hamano
2022-11-07 9:12 ` Christian Couder
2022-11-07 9:00 ` Christian Couder
2022-10-25 12:28 ` [PATCH v2 0/2] " Christian Couder
2022-10-25 12:28 ` [PATCH v2 1/2] pack-objects: allow --filter without --stdout Christian Couder
2022-10-25 12:28 ` [PATCH v2 2/2] repack: add --filter=<filter-spec> option Christian Couder
2022-10-28 19:54 ` [PATCH v2 0/2] Implement filtering repacks Taylor Blau
2022-11-07 9:29 ` Christian Couder
2022-11-22 17:51 ` [PATCH v3 " Christian Couder
2022-11-22 17:51 ` [PATCH v3 1/2] pack-objects: allow --filter without --stdout Christian Couder
2022-11-22 17:51 ` [PATCH v3 2/2] repack: add --filter=<filter-spec> option Christian Couder
2022-11-23 0:31 ` [PATCH v3 0/2] Implement filtering repacks Junio C Hamano
2022-12-21 3:53 ` Christian Couder
2022-11-23 0:35 ` Junio C Hamano
2022-12-21 4:04 ` [PATCH v4 0/3] " Christian Couder
2022-12-21 4:04 ` [PATCH v4 1/3] pack-objects: allow --filter without --stdout Christian Couder
2023-01-04 14:56 ` Patrick Steinhardt
2022-12-21 4:04 ` [PATCH v4 2/3] repack: add --filter=<filter-spec> option Christian Couder
2023-01-04 14:56 ` Patrick Steinhardt
2023-01-05 1:39 ` Junio C Hamano
2022-12-21 4:04 ` [PATCH v4 3/3] gc: add gc.repackFilter config option Christian Couder
2023-01-04 14:57 ` Patrick Steinhardt
2024-05-15 13:25 ` [PATCH v2 0/3] upload-pack: support a missing-action Christian Couder
2024-05-15 13:25 ` [PATCH v2 1/3] rev-list: refactor --missing=<missing-action> Christian Couder
2024-05-15 16:16 ` Junio C Hamano
2024-05-15 13:25 ` [PATCH v2 2/3] pack-objects: use the missing action API Christian Couder
2024-05-15 16:46 ` Junio C Hamano [this message]
2024-05-24 16:40 ` Christian Couder
2024-05-15 13:25 ` [PATCH v2 3/3] upload-pack: allow configuring a missing-action Christian Couder
2024-05-15 17:08 ` Junio C Hamano
2024-05-24 16:41 ` Christian Couder
2024-05-24 21:51 ` Junio C Hamano
2024-05-28 10:10 ` Christian Couder
2024-05-28 15:54 ` Junio C Hamano
2024-05-31 20:43 ` Christian Couder
2024-06-01 9:43 ` Junio C Hamano
2024-05-15 13:59 ` [PATCH v2 0/3] upload-pack: support " Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo797xbt9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).