Re: [PATCH v2 0/2] improve interactive-patch

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 30, 2024, 17:06 UTC
Message-ID: <xmqqsf07lkef.fsf@gitster.g>
In-Reply-To: <c19f444c-f4ad-497b-a82d-4f6195b44fce@gmail.com>

Rubén Justo <rjusto@gmail.com> writes:

Show 12 quoted lines

> I do not plan to address this in this series, but while the topic is
> warm;  Perhaps?:
>
> --- >8 ---
> @@ -1450,7 +1451,7 @@ static int patch_update_file(struct add_p_state *s,
>  		if (file_diff->hunk_nr) {
>  			if (rendered_hunk_index != hunk_index) {
>  				render_hunk(s, hunk, 0, colored, &s->buf);
> -				fputs(s->buf.buf, stdout);
> +				fputs_to_pager(s->buf.buf);
>  				rendered_hunk_index = hunk_index;
>  			}

For this particular application, such a "I have the whole thing in core, send it to the pater" API might be sufficient, but it may not be usable if the existing code sends its output in pieces already.

I was envisioning an API more along the lines of

	/*
	 * pager control data structure
	 */
	struct pager_control;

	/*
	 * Start a pager, from now on, what we write to our fd #0
	 * and stdout are fed to the pager.  The function returns
	 * 0 on success, or -1 on failure.
	 */
	int redirect_fd_to_pager(struct pager_control *);

	/*
	 * We have written everything we want to write to the
	 * pager.  Tell the pager that we are done.  Wait until
	 * the end-user quits the pager and then give us control
	 * back.  The fd #0 and stdout are restored.
	 */
	int wait_for_pager(struct pager_control *);

so that any subpart of existing code can be enclosed inside the two calls, keep writing to fd#0/stdout as before, and we'd page only that part of the output from the program without changing anything else.