[17/19] built-in add -p: implement the 'q' ("quit") command

Message ID	6c33fbb68453707c874fde14347ce368b555c449.1576224486.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=h4OP=2D=vger.kernel.org=git-owner@kernel.org> Message-Id: <6c33fbb68453707c874fde14347ce368b555c449.1576224486.git.gitgitgadget@gmail.com> In-Reply-To: <pull.173.git.1576224486.gitgitgadget@gmail.com> References: <pull.173.git.1576224486.gitgitgadget@gmail.com> From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> Date: Fri, 13 Dec 2019 08:08:04 +0000 Subject: [PATCH 17/19] built-in add -p: implement the 'q' ("quit") command Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <johannes.schindelin@gmx.de> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Implement the git add --patch backend in C \| expand [00/19] Implement the git add --patch backend in C [01/19] built-in add -i: start implementing the `patch` functionality in C [02/19] built-in add -i: wire up the new C code for the `patch` command [03/19] built-in add -p: show colored hunks by default [04/19] built-in add -p: adjust hunk headers as needed [05/19] built-in add -p: color the prompt and the help text [06/19] built-in add -p: offer a helpful error message when hunk navigation failed [07/19] built-in add -p: support multi-file diffs [08/19] built-in add -p: handle deleted empty files [09/19] built-in app -p: allow selecting a mode change as a "hunk" [10/19] built-in add -p: show different prompts for mode changes and deletions [11/19] built-in add -p: implement the hunk splitting feature [12/19] built-in add -p: coalesce hunks after splitting them [13/19] strbuf: add a helper function to call the editor "on an strbuf" [14/19] built-in add -p: implement hunk editing [15/19] built-in add -p: implement the 'g' ("goto") command [16/19] built-in add -p: implement the '/' ("search regex") command [17/19] built-in add -p: implement the 'q' ("quit") command [18/19] built-in add -p: only show the applicable parts of the help text [19/19] built-in add -p: show helpful hint when nothing can be staged

Message ID

6c33fbb68453707c874fde14347ce368b555c449.1576224486.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <6c33fbb68453707c874fde14347ce368b555c449.1576224486.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.173.git.1576224486.gitgitgadget@gmail.com>
References: <pull.173.git.1576224486.gitgitgadget@gmail.com>
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Date: Fri, 13 Dec 2019 08:08:04 +0000
Subject: [PATCH 17/19] built-in add -p: implement the 'q' ("quit") command
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
        Junio C Hamano <gitster@pobox.com>,
        Johannes Schindelin <johannes.schindelin@gmx.de>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Implement the git add --patch backend in C | expand

Commit Message

Linus Arver via GitGitGadget Dec. 13, 2019, 8:08 a.m. UTC

From: Johannes Schindelin <johannes.schindelin@gmx.de>

This command is actually very similar to the 'd' ("do not stage this
hunk or any of the later hunks in the file") command: it just does
something on top, namely leave the loop and return a value indicating
that we're quittin'.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 add-patch.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/add-patch.c b/add-patch.c
index fd72850c65..5e9829a8b4 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -12,9 +12,9 @@  enum prompt_mode_type {
 };
 
 static const char *prompt_mode[] = {
-	N_("Stage mode change [y,n,a,d%s,?]? "),
-	N_("Stage deletion [y,n,a,d%s,?]? "),
-	N_("Stage this hunk [y,n,a,d%s,?]? ")
+	N_("Stage mode change [y,n,a,q,d%s,?]? "),
+	N_("Stage deletion [y,n,a,q,d%s,?]? "),
+	N_("Stage this hunk [y,n,a,q,d%s,?]? ")
 };
 
 struct hunk_header {
@@ -1006,6 +1006,7 @@  static size_t display_hunks(struct add_p_state *s,
 static const char help_patch_text[] =
 N_("y - stage this hunk\n"
    "n - do not stage this hunk\n"
+   "q - quit; do not stage this hunk or any of the remaining ones\n"
    "a - stage this and all the remaining hunks\n"
    "d - do not stage this hunk nor any of the remaining hunks\n"
    "j - leave this hunk undecided, see next undecided hunk\n"
@@ -1026,7 +1027,7 @@  static int patch_update_file(struct add_p_state *s,
 	struct hunk *hunk;
 	char ch;
 	struct child_process cp = CHILD_PROCESS_INIT;
-	int colored = !!s->colored.len;
+	int colored = !!s->colored.len, quit = 0;
 	enum prompt_mode_type prompt_mode_type;
 
 	if (!file_diff->hunk_nr)
@@ -1115,12 +1116,16 @@  static int patch_update_file(struct add_p_state *s,
 				if (hunk->use == UNDECIDED_HUNK)
 					hunk->use = USE_HUNK;
 			}
-		} else if (ch == 'd') {
+		} else if (ch == 'd' || ch == 'q') {
 			for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
 				hunk = file_diff->hunk + hunk_index;
 				if (hunk->use == UNDECIDED_HUNK)
 					hunk->use = SKIP_HUNK;
 			}
+			if (ch == 'q') {
+				quit = 1;
+				break;
+			}
 		} else if (s->answer.buf[0] == 'K') {
 			if (hunk_index)
 				hunk_index--;
@@ -1267,7 +1272,7 @@  static int patch_update_file(struct add_p_state *s,
 	}
 
 	putchar('\n');
-	return 0;
+	return quit;
 }
 
 int run_add_p(struct repository *r, const struct pathspec *ps)

[17/19] built-in add -p: implement the 'q' ("quit") command

Commit Message

Patch