Re: [RFC PATCH 4/7] fetch: --stdin

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2020, 20:33 UTC
Message-ID: <xmqqft90omsw.fsf@gitster.c.googlers.com>
In-Reply-To: <9ebcc5808a21e1f87370b6c18ea28168e63d4e3a.1596590295.git.jonathantanmy@google.com>

Jonathan Tan <jonathantanmy@google.com> writes:

Show 14 quoted lines

> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
>  builtin/fetch.c | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 3ccf69753f..a5498646bf 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -80,6 +80,7 @@ static struct list_objects_filter_options filter_options;
>  static struct string_list server_options = STRING_LIST_INIT_DUP;
>  static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
>  static int fetch_write_commit_graph = -1;
> +static int stdin_refspecs = 0;

Don't initialize statics to 0 (leave that to BSS).

Show 29 quoted lines

> @@ -209,6 +210,8 @@ static struct option builtin_fetch_options[] = {
>  		 N_("check for forced-updates on all updated branches")),
>  	OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph,
>  		 N_("write the commit-graph after fetching")),
> +	OPT_BOOL(0, "stdin", &stdin_refspecs,
> +		 N_("accept refspecs from stdin")),
>  	OPT_END()
>  };
>  
> @@ -1684,7 +1687,8 @@ static inline void fetch_one_setup_partial(struct remote *remote)
>  	return;
>  }
>  
> -static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
> +static int fetch_one(struct remote *remote, int argc, const char **argv,
> +		     int prune_tags_ok, int use_stdin_refspecs)
>  {
>  	struct refspec rs = REFSPEC_INIT_FETCH;
>  	int i;
> @@ -1741,6 +1745,13 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru
>  		}
>  	}
>  
> +	if (use_stdin_refspecs) {
> +		struct strbuf line = STRBUF_INIT;
> +		while (strbuf_getline_lf(&line, stdin) != EOF)
> +			refspec_append(&rs, line.buf);
> +		strbuf_release(&line);
> +	}

This will use refspecs both from the command line and the standard input by appending? IOW, these refspecs that came from the standard input are treated otherwise identically to those that came from the command line?

I do not particularly care whether it is "append to command line" or "replace command line", as I do not think it makes much difference in usability. Just wanted to be sure you coded the behaviour you wanted.

Show 7 quoted lines

> @@ -1849,6 +1860,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
>  			die(_("--filter can only be used with the remote "
>  			      "configured in extensions.partialclone"));
>  
> +		if (stdin_refspecs)
> +			die(_("--stdin can only be used when fetching "
> +			      "from one remote"));

Is that only because you happened to have implemented the reading in fetch_one() that is designed to be called once per remote?

You could read them here to a refspec for everybody, and then pass a pointer to that refspec as the extra parameter to fetch_one(), and fetch_one() can use that by duplicating and appending to its "rs", if we wanted to, no? I do not know how important to support such a use case, though. It just feels a bit of shame if this restriction is purely imposed by the implementation, when lifting the refstiction does not seem too involved.

Thanks.

>  		if (max_children < 0)
>  			max_children = fetch_parallel_config;