Re: [PATCH v2 1/3] rev-list: refactor --missing=<missing-action>

[Junio C Hamano <gitster@pobox.com>]

Christian Couder <christian.couder@gmail.com> writes:

> Both `git rev-list` and `git pack-objects` support a
> `--missing=<missing-action>` feature, but they currently don't share
> any code for that.
>
> Refactor the support for `--missing=<missing-action>` in
> "builtin/rev-list.c" into new "missing.{c,h}" files. In a following
> commit, that refactored code will be used in "builtin/pack-objects.c"
> too.
>
> In yet a following commit, we are going to add support for a similar
> 'missing-action' feature to another command, and we are also going to
> reuse code from the new "missing.{c,h}" files.
>
> As `enum missing_action` and parse_missing_action_value() are moved to
> "missing.{c,h}", we need to modify the latter a bit, so that it stops
> updating any global variable, but instead returns the parsed value or
> -1 on error.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  Makefile           |  1 +
>  builtin/rev-list.c | 43 ++++++++-----------------------------------
>  missing.c          | 20 ++++++++++++++++++++
>  missing.h          | 17 +++++++++++++++++
>  4 files changed, 46 insertions(+), 35 deletions(-)
>  create mode 100644 missing.c
>  create mode 100644 missing.h

All makes sense.  Will queue.  Thanks.

> diff --git a/Makefile b/Makefile
> index 0285db5630..e0ddcc2cbd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1062,6 +1062,7 @@ LIB_OBJS += merge-recursive.o
>  LIB_OBJS += merge.o
>  LIB_OBJS += midx.o
>  LIB_OBJS += midx-write.o
> +LIB_OBJS += missing.o
>  LIB_OBJS += name-hash.o
>  LIB_OBJS += negotiator/default.o
>  LIB_OBJS += negotiator/noop.o
> diff --git a/builtin/rev-list.c b/builtin/rev-list.c
> index 77803727e0..40aa770c47 100644
> --- a/builtin/rev-list.c
> +++ b/builtin/rev-list.c
> @@ -20,6 +20,7 @@
>  #include "reflog-walk.h"
>  #include "oidset.h"
>  #include "packfile.h"
> +#include "missing.h"
>  
>  static const char rev_list_usage[] =
>  "git rev-list [<options>] <commit>... [--] [<path>...]\n"
> @@ -71,12 +72,6 @@ static struct oidset omitted_objects;
>  static int arg_print_omitted; /* print objects omitted by filter */
>  
>  static struct oidset missing_objects;
> -enum missing_action {
> -	MA_ERROR = 0,    /* fail if any missing objects are encountered */
> -	MA_ALLOW_ANY,    /* silently allow ALL missing objects */
> -	MA_PRINT,        /* print ALL missing objects in special section */
> -	MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */
> -};
>  static enum missing_action arg_missing_action;
>  
>  /* display only the oid of each object encountered */
> @@ -392,34 +387,6 @@ static void print_disk_usage(off_t size)
>  	strbuf_release(&sb);
>  }
>  
> -static inline int parse_missing_action_value(const char *value)
> -{
> -	if (!strcmp(value, "error")) {
> -		arg_missing_action = MA_ERROR;
> -		return 1;
> -	}
> -
> -	if (!strcmp(value, "allow-any")) {
> -		arg_missing_action = MA_ALLOW_ANY;
> -		fetch_if_missing = 0;
> -		return 1;
> -	}
> -
> -	if (!strcmp(value, "print")) {
> -		arg_missing_action = MA_PRINT;
> -		fetch_if_missing = 0;
> -		return 1;
> -	}
> -
> -	if (!strcmp(value, "allow-promisor")) {
> -		arg_missing_action = MA_ALLOW_PROMISOR;
> -		fetch_if_missing = 0;
> -		return 1;
> -	}
> -
> -	return 0;
> -}
> -
>  static int try_bitmap_count(struct rev_info *revs,
>  			    int filter_provided_objects)
>  {
> @@ -569,10 +536,16 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
>  	for (i = 1; i < argc; i++) {
>  		const char *arg = argv[i];
>  		if (skip_prefix(arg, "--missing=", &arg)) {
> +			int res;
>  			if (revs.exclude_promisor_objects)
>  				die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing");
> -			if (parse_missing_action_value(arg))
> +			res = parse_missing_action_value(arg);
> +			if (res >= 0) {
> +				if (res != MA_ERROR)
> +					fetch_if_missing = 0;
> +				arg_missing_action = res;
>  				break;
> +			}
>  		}
>  	}
>  
> diff --git a/missing.c b/missing.c
> new file mode 100644
> index 0000000000..ce3cf734a8
> --- /dev/null
> +++ b/missing.c
> @@ -0,0 +1,20 @@
> +#include "git-compat-util.h"
> +#include "missing.h"
> +#include "object-file.h"
> +
> +int parse_missing_action_value(const char *value)
> +{
> +	if (!strcmp(value, "error"))
> +		return MA_ERROR;
> +
> +	if (!strcmp(value, "allow-any"))
> +		return MA_ALLOW_ANY;
> +
> +	if (!strcmp(value, "print"))
> +		return MA_PRINT;
> +
> +	if (!strcmp(value, "allow-promisor"))
> +		return MA_ALLOW_PROMISOR;
> +
> +	return -1;
> +}
> diff --git a/missing.h b/missing.h
> new file mode 100644
> index 0000000000..1e378d6215
> --- /dev/null
> +++ b/missing.h
> @@ -0,0 +1,17 @@
> +#ifndef MISSING_H
> +#define MISSING_H
> +
> +enum missing_action {
> +	MA_ERROR = 0,      /* fail if any missing objects are encountered */
> +	MA_ALLOW_ANY,      /* silently allow ALL missing objects */
> +	MA_PRINT,          /* print ALL missing objects in special section */
> +	MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */
> +};
> +
> +/*
> +  Return an `enum missing_action` in case parsing is successful or -1
> +  if parsing failed.
> +*/
> +int parse_missing_action_value(const char *value);
> +
> +#endif /* MISSING_H */