git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 00/19] Implement the git add --patch backend in C
Date: Fri, 13 Dec 2019 08:07:47 +0000	[thread overview]
Message-ID: <pull.173.git.1576224486.gitgitgadget@gmail.com> (raw)

Out of all the patch series on the journey to provide git add --interactive 
and git add --patch in built-in versions, this is the big one, as can be
expected from the fact that the git add --patch functionality makes up over
half of the 1,800+ lines of git-add--interactive.perl.

The two patches that stick out are of course the ones to implement hunk
splitting and hunk editing: these operations are fundamentally more
complicated, and less obvious, than the entire rest of the operations.

Johannes Schindelin (19):
  built-in add -i: start implementing the `patch` functionality in C
  built-in add -i: wire up the new C code for the `patch` command
  built-in add -p: show colored hunks by default
  built-in add -p: adjust hunk headers as needed
  built-in add -p: color the prompt and the help text
  built-in add -p: offer a helpful error message when hunk navigation
    failed
  built-in add -p: support multi-file diffs
  built-in add -p: handle deleted empty files
  built-in app -p: allow selecting a mode change as a "hunk"
  built-in add -p: show different prompts for mode changes and deletions
  built-in add -p: implement the hunk splitting feature
  built-in add -p: coalesce hunks after splitting them
  strbuf: add a helper function to call the editor "on an strbuf"
  built-in add -p: implement hunk editing
  built-in add -p: implement the 'g' ("goto") command
  built-in add -p: implement the '/' ("search regex") command
  built-in add -p: implement the 'q' ("quit") command
  built-in add -p: only show the applicable parts of the help text
  built-in add -p: show helpful hint when nothing can be staged

 Makefile                   |    1 +
 add-interactive.c          |   29 +-
 add-interactive.h          |   19 +
 add-patch.c                | 1338 ++++++++++++++++++++++++++++++++++++
 builtin/add.c              |   15 +-
 strbuf.c                   |   28 +
 strbuf.h                   |   11 +
 t/t3701-add-interactive.sh |   42 ++
 8 files changed, 1464 insertions(+), 19 deletions(-)
 create mode 100644 add-patch.c


base-commit: b4bbbbd5a247e0e75d079bca591b657ec9084a46
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-173%2Fdscho%2Fadd-p-in-c-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-173/dscho/add-p-in-c-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/173
-- 
gitgitgadget

             reply	other threads:[~2019-12-13  8:08 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-13  8:07 Johannes Schindelin via GitGitGadget [this message]
2019-12-13  8:07 ` [PATCH 01/19] built-in add -i: start implementing the `patch` functionality in C Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 02/19] built-in add -i: wire up the new C code for the `patch` command Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 03/19] built-in add -p: show colored hunks by default Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 04/19] built-in add -p: adjust hunk headers as needed Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 05/19] built-in add -p: color the prompt and the help text Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 06/19] built-in add -p: offer a helpful error message when hunk navigation failed Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 07/19] built-in add -p: support multi-file diffs Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 08/19] built-in add -p: handle deleted empty files Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 09/19] built-in app -p: allow selecting a mode change as a "hunk" Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 10/19] built-in add -p: show different prompts for mode changes and deletions Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 11/19] built-in add -p: implement the hunk splitting feature Johannes Schindelin via GitGitGadget
2019-12-13  8:07 ` [PATCH 12/19] built-in add -p: coalesce hunks after splitting them Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 13/19] strbuf: add a helper function to call the editor "on an strbuf" Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 14/19] built-in add -p: implement hunk editing Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 15/19] built-in add -p: implement the 'g' ("goto") command Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 16/19] built-in add -p: implement the '/' ("search regex") command Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 17/19] built-in add -p: implement the 'q' ("quit") command Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 18/19] built-in add -p: only show the applicable parts of the help text Johannes Schindelin via GitGitGadget
2019-12-13  8:08 ` [PATCH 19/19] built-in add -p: show helpful hint when nothing can be staged Johannes Schindelin via GitGitGadget

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.173.git.1576224486.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).