git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Dragan Simic <dsimic@manjaro.org>, Jeff King <peff@peff.net>
Subject: [PATCH v4 0/6] use the pager in 'add -p'
Date: Mon, 3 Jun 2024 22:35:36 +0200	[thread overview]
Message-ID: <1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@gmail.com> (raw)
In-Reply-To: <b7e24b08-40a1-4b18-89f6-e25ab96facaf@gmail.com>

This iteration is a quick reroll to address the interactive.singleKey
option in the new '|' interactive command.

I've also used the improved wording for the help text, suggested by
Dragan.

The rest of the series remains the same.  Here is the range-diff from
v3:

Range-diff against v3:
-:  ---------- > 1:  49481da8a7 add-patch: test for 'p' command
-:  ---------- > 2:  865bb68508 pager: do not close fd 2 unnecessarily
-:  ---------- > 3:  9fcf244dac pager: introduce wait_for_pager
-:  ---------- > 4:  1e817a9ec0 pager: introduce setup_custom_pager
-:  ---------- > 5:  87dd368346 test-terminal: introduce --no-stdin-pty
1:  9fa538478d ! 6:  b691764a17 add-patch: introduce the command '|'
    @@ add-patch.c: N_("j - leave this hunk undecided, see next undecided hunk\n"
         "s - split the current hunk into smaller hunks\n"
         "e - manually edit the current hunk\n"
         "p - print the current hunk\n"
    -+   "| - pipe the current hunk to the pager, or |<program> to use a program'\n"
    ++   "| - use pager to show the current hunk, or use |<program> to customize\n"
         "? - print help\n");
      
      static int patch_update_file(struct add_p_state *s,
    @@ add-patch.c: static int patch_update_file(struct add_p_state *s,
      		} else if (s->answer.buf[0] == 'p') {
      			rendered_hunk_index = -1;
     +		} else if (ch == '|') {
    ++			strbuf_remove(&s->answer, 0, 1);
    ++			if (s->s.use_single_key && s->answer.len == 0) {
    ++				printf("%s", _("program? "));
    ++				fflush(stdout);
    ++				strbuf_getline(&s->answer, stdin);
    ++				strbuf_trim_trailing_newline(&s->answer);
    ++			}
    ++			strbuf_trim(&s->answer);
    ++			pager = s->answer.buf;
     +			rendered_hunk_index = -1;
    -+			pager = s->answer.buf + 1;
      		} else if (s->answer.buf[0] == '?') {
      			const char *p = _(help_patch_remainder), *eol = p;
      

base-commit: d3f616a4e56f359d84a9d439aa03dca1fe9ac280
-- 
2.45.0.97.gb691764a17


  parent reply	other threads:[~2024-06-03 20:35 UTC|newest]

Thread overview: 113+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-19  7:06 [PATCH 0/5] use the pager in 'add -p' Rubén Justo
2024-05-19  7:10 ` [PATCH 1/5] add-patch: test for 'p' command Rubén Justo
2024-05-19  7:12 ` [PATCH 2/5] pager: do not close fd 2 unnecessarily Rubén Justo
2024-05-20 19:14   ` Junio C Hamano
2024-05-20 22:33     ` Rubén Justo
2024-05-21 20:57       ` Junio C Hamano
2024-05-21 21:35         ` Rubén Justo
2024-05-21 22:00           ` Junio C Hamano
2024-05-22 17:19             ` Rubén Justo
2024-05-22 17:40               ` Junio C Hamano
2024-05-26  6:48                 ` Rubén Justo
2024-05-26 21:26                   ` Junio C Hamano
2024-05-19  7:13 ` [PATCH 3/5] pager: introduce wait_for_pager Rubén Justo
2024-05-19  7:14 ` [PATCH 4/5] test-terminal: introduce --no-stdin-pty Rubén Justo
2024-05-19  7:14 ` [PATCH 5/5] add-patch: render hunks through the pager Rubén Justo
2024-05-20 19:30   ` Junio C Hamano
2024-05-20 19:45     ` Dragan Simic
2024-05-20 22:35       ` Rubén Justo
2024-05-20 23:54         ` Dragan Simic
2024-05-21 19:56           ` Rubén Justo
2024-05-21  7:07       ` Jeff King
2024-05-21 19:59         ` Rubén Justo
2024-05-23  9:06           ` Jeff King
2024-05-23 14:00             ` Junio C Hamano
2024-05-23 14:18               ` Dragan Simic
2024-05-23 23:04                 ` Junio C Hamano
2024-05-23 23:28                   ` Dragan Simic
2024-05-23 23:43                     ` Dragan Simic
2024-05-23 23:54                     ` Junio C Hamano
2024-05-23 23:57                       ` Dragan Simic
2024-05-25  4:54               ` Jeff King
2024-05-23 22:25             ` Rubén Justo
2024-05-23 23:03               ` Dragan Simic
2024-05-20 22:47     ` Rubén Justo
2024-05-20 23:18       ` Junio C Hamano
2024-05-20 23:27         ` Rubén Justo
2024-05-21 20:49 ` [PATCH v2 0/5] use the pager in 'add -p' Rubén Justo
2024-05-21 20:51   ` [PATCH v2 1/5] add-patch: test for 'p' command Rubén Justo
2024-05-21 20:52   ` [PATCH v2 2/5] pager: do not close fd 2 unnecessarily Rubén Justo
2024-05-21 20:52   ` [PATCH v2 3/5] pager: introduce wait_for_pager Rubén Justo
2024-05-21 20:52   ` [PATCH v2 4/5] test-terminal: introduce --no-stdin-pty Rubén Justo
2024-05-21 20:52   ` [PATCH v2 5/5] add-patch: render hunks through the pager Rubén Justo
2024-05-22  8:09     ` Dragan Simic
2024-05-22 18:47       ` Junio C Hamano
2024-05-22 21:23       ` Rubén Justo
2024-05-22 21:27         ` Dragan Simic
2024-06-02 15:38   ` [PATCH v3 0/6] use the pager in 'add -p' Rubén Justo
2024-06-02 15:42     ` [PATCH v3 1/6] add-patch: test for 'p' command Rubén Justo
2024-06-02 15:42     ` [PATCH v3 2/6] pager: do not close fd 2 unnecessarily Rubén Justo
2024-06-02 15:43     ` [PATCH v3 3/6] pager: introduce wait_for_pager Rubén Justo
2024-06-02 15:43     ` [PATCH v3 4/6] pager: introduce setup_custom_pager Rubén Justo
2024-06-02 15:43     ` [PATCH v3 5/6] test-terminal: introduce --no-stdin-pty Rubén Justo
2024-06-02 15:44     ` [PATCH v3 6/6] add-patch: introduce the command '|' Rubén Justo
2024-06-02 16:36     ` [PATCH v3 0/6] use the pager in 'add -p' Junio C Hamano
2024-06-02 17:11       ` Junio C Hamano
2024-06-02 17:33         ` Rubén Justo
2024-06-02 17:13       ` Rubén Justo
2024-06-02 17:46       ` Dragan Simic
2024-06-03  9:03         ` Junio C Hamano
2024-06-03 10:21           ` Dragan Simic
2024-06-03 15:28             ` Junio C Hamano
2024-06-04 17:34               ` Dragan Simic
2024-06-02 17:36     ` Dragan Simic
2024-06-03 16:01       ` Junio C Hamano
2024-06-04 17:41         ` Dragan Simic
2024-06-04 17:42           ` Dragan Simic
2024-06-03 20:19       ` Rubén Justo
2024-06-04 18:13         ` Dragan Simic
2024-06-03 20:35     ` Rubén Justo [this message]
2024-06-03 20:38       ` [PATCH v4 1/6] add-patch: test for 'p' command Rubén Justo
2024-06-03 20:38       ` [PATCH v4 2/6] pager: do not close fd 2 unnecessarily Rubén Justo
2024-06-04 15:50         ` Junio C Hamano
2024-06-03 20:38       ` [PATCH v4 3/6] pager: introduce wait_for_pager Rubén Justo
2024-06-04 10:00         ` Phillip Wood
2024-06-04 16:29           ` Junio C Hamano
2024-06-05 22:03           ` Rubén Justo
2024-06-04 16:25         ` Junio C Hamano
2024-06-03 20:38       ` [PATCH v4 4/6] pager: introduce setup_custom_pager Rubén Justo
2024-06-04 16:43         ` Junio C Hamano
2024-06-03 20:38       ` [PATCH v4 5/6] test-terminal: introduce --no-stdin-pty Rubén Justo
2024-06-04 10:05         ` Phillip Wood
2024-06-04 10:33           ` Jeff King
2024-06-05 15:39             ` Junio C Hamano
2024-06-06  8:24               ` Jeff King
2024-06-05 22:50           ` Rubén Justo
2024-06-06  8:27             ` Jeff King
2024-06-09  7:26               ` Rubén Justo
2024-06-03 20:38       ` [PATCH v4 6/6] add-patch: introduce the command '|' Rubén Justo
2024-06-04 17:12         ` Junio C Hamano
2024-06-04 20:05           ` Dragan Simic
2024-06-05  5:16           ` Junio C Hamano
2024-06-04 10:17     ` [PATCH v3 0/6] use the pager in 'add -p' Jeff King
2024-06-04 15:32       ` Junio C Hamano
2024-06-05  9:09         ` Jeff King
2024-06-05 13:21           ` Phillip Wood
2024-06-08  5:54             ` Dragan Simic
2024-06-09  7:44               ` Rubén Justo
2024-06-09  7:57                 ` Dragan Simic
2024-06-10 19:09                   ` Rubén Justo
2024-06-10 21:02                     ` Dragan Simic
2024-06-10 14:09                 ` Phillip Wood
2024-06-10 16:13                   ` Junio C Hamano
2024-06-10 19:14                   ` Rubén Justo
2024-06-10 19:56                     ` Junio C Hamano
2024-06-10 21:08                     ` Dragan Simic
2024-06-10 19:28                   ` Dragan Simic
2024-06-10 20:08                     ` Junio C Hamano
2024-06-10 21:16                       ` Dragan Simic
2024-06-09 14:29               ` phillip.wood123
2024-06-09 17:20                 ` Dragan Simic
2024-06-10  8:27                   ` Phillip Wood
2024-06-10  9:09                     ` Dragan Simic
2024-06-05 17:24           ` Junio C Hamano

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=1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@gmail.com \
    --to=rjusto@gmail.com \
    --cc=dsimic@manjaro.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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 NNTP newsgroup(s).