From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Jiang Xin" <zhiyou.jx@alibaba-inc.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/4] pack-objects: use revision.c's --stdin parsing
Date: Thu, 17 Jun 2021 12:57:33 +0200 [thread overview]
Message-ID: <cover-0.4-0000000000-20210617T105537Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.4-0000000000-20210608T121008Z-avarab@gmail.com>
A re-roll of
https://lore.kernel.org/git/cover-0.4-0000000000-20210608T121008Z-avarab@gmail.com/
Fixes whitespace issues in v1, and uses the named enums I added
instead of their implicit values in the documentation. I also
conflated BREAK and CONTINUE in that same explanation.
Ævar Arnfjörð Bjarmason (4):
upload-pack: run is_repository_shallow() before setup_revisions()
revision.h: unify "disable_stdin" and "read_from_stdin"
pack-objects.c: do stdin parsing via revision.c's API
pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
builtin/am.c | 4 +--
builtin/blame.c | 2 +-
builtin/diff-tree.c | 2 +-
builtin/pack-objects.c | 64 +++++++++++++++++++---------------------
builtin/rev-list.c | 2 +-
revision.c | 35 +++++++++++++++++++---
revision.h | 66 ++++++++++++++++++++++++++++++++++++++----
sequencer.c | 4 +--
8 files changed, 129 insertions(+), 50 deletions(-)
Range-diff against v1:
1: c56a302e09 = 1: 6a8b20a7cf upload-pack: run is_repository_shallow() before setup_revisions()
2: 002e0f1cf7 = 2: d88b2c0410 revision.h: unify "disable_stdin" and "read_from_stdin"
3: 1a9eb26587 ! 3: d433d7b24a pack-objects.c: do stdin parsing via revision.c's API
@@ revision.c: static void read_revisions_from_stdin(struct rev_info *revs,
+ int do_break = 0;
+ enum rev_info_stdin_line ret = revs->handle_stdin_line(
+ revs, &sb, revs->stdin_line_priv);
-+
++
+ switch (ret) {
+ case REV_INFO_STDIN_LINE_PROCESS:
+ break;
@@ revision.h: struct rev_info {
+ * When reading from stdin (see "stdin_handling" above) define
+ * a handle_stdin_line function to consume the lines.
+ *
-+ * - Return 0 to continue revision.c's normal processing of the
-+ * line (after possibly munging the provided strbuf).
++ * - Return REV_INFO_STDIN_LINE_PROCESS to continue
++ * revision.c's normal processing of the line (after
++ * possibly munging the provided strbuf).
+ *
-+ * - Return 1 to indicate that the line is fully processed,
-+ * moving onto the next line (if any)
++ * - Return REV_INFO_STDIN_LINE_BREAK to process no further
++ * lines, or anything further from the current line (just
++ * like REV_INFO_STDIN_LINE_CONTINUE).
+ *
-+ * - Return 2 to process no further lines.
++ * - Return REV_INFO_STDIN_LINE_CONTINUE to indicate that the
++ * line is fully processed, moving onto the next line (if
++ * any)
+ *
+ * Use the "stdin_line_priv" to optionally pass your own data
+ * around.
4: 15a3a5d047 ! 4: e59a06c314 pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
@@ revision.c: static void read_revisions_from_stdin(struct rev_info *revs,
## revision.h ##
@@ revision.h: struct rev_info {
- * - Return 0 to continue revision.c's normal processing of the
- * line (after possibly munging the provided strbuf).
+ * revision.c's normal processing of the line (after
+ * possibly munging the provided strbuf).
*
+ * Change "revarg_flags" to affect the subsequent handling
+ * in handle_revision_arg()
+ *
- * - Return 1 to indicate that the line is fully processed,
- * moving onto the next line (if any)
+ * - Return REV_INFO_STDIN_LINE_BREAK to process no further
+ * lines, or anything further from the current line (just
+ * like REV_INFO_STDIN_LINE_CONTINUE).
+ *
+ * - Return REV_INFO_STDIN_LINE_CONTINUE to indicate that the
++ *
++ * - Return REV_INFO_STDIN_LINE_BREAK to indicate that the
+ * line is fully processed, moving onto the next line (if
+ * any)
*
@@ revision.h: struct rev_info {
* around.
--
2.32.0.571.gdba276db2c
next prev parent reply other threads:[~2021-06-17 10:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 12:16 [PATCH 0/4] pack-objects: use revision.c's --stdin parsing Ævar Arnfjörð Bjarmason
2021-06-08 12:16 ` [PATCH 1/4] upload-pack: run is_repository_shallow() before setup_revisions() Ævar Arnfjörð Bjarmason
2021-06-08 12:16 ` [PATCH 2/4] revision.h: unify "disable_stdin" and "read_from_stdin" Ævar Arnfjörð Bjarmason
2021-06-08 12:16 ` [PATCH 3/4] pack-objects.c: do stdin parsing via revision.c's API Ævar Arnfjörð Bjarmason
2021-06-09 8:10 ` Junio C Hamano
2021-06-08 12:16 ` [PATCH 4/4] pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS Ævar Arnfjörð Bjarmason
2021-06-17 10:57 ` Ævar Arnfjörð Bjarmason [this message]
2021-06-17 10:57 ` [PATCH v2 1/4] upload-pack: run is_repository_shallow() before setup_revisions() Ævar Arnfjörð Bjarmason
2021-06-17 10:57 ` [PATCH v2 2/4] revision.h: unify "disable_stdin" and "read_from_stdin" Ævar Arnfjörð Bjarmason
2021-06-17 23:44 ` Emily Shaffer
2021-06-18 17:54 ` Jonathan Tan
2021-06-17 10:57 ` [PATCH v2 3/4] pack-objects.c: do stdin parsing via revision.c's API Ævar Arnfjörð Bjarmason
2021-06-18 18:57 ` Jonathan Tan
2021-06-17 10:57 ` [PATCH v2 4/4] pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS Ævar Arnfjörð Bjarmason
2021-06-21 15:10 ` [PATCH v3 0/4] pack-objects: use revision.c's --stdin parsing Ævar Arnfjörð Bjarmason
2021-06-21 15:10 ` [PATCH v3 1/4] upload-pack: run is_repository_shallow() before setup_revisions() Ævar Arnfjörð Bjarmason
2021-06-21 15:10 ` [PATCH v3 2/4] revision.h: refactor "disable_stdin" and "read_from_stdin" Ævar Arnfjörð Bjarmason
2021-07-08 22:10 ` Junio C Hamano
2021-06-21 15:10 ` [PATCH v3 3/4] pack-objects.c: do stdin parsing via revision.c's API Ævar Arnfjörð Bjarmason
2021-07-08 22:21 ` Junio C Hamano
2021-06-21 15:10 ` [PATCH v3 4/4] pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS Ævar Arnfjörð Bjarmason
2021-07-08 22:21 ` Junio C Hamano
2021-07-09 11:06 ` [PATCH v4 0/5] revision.[ch]: add --stdin parsing API, use in pack-objects Ævar Arnfjörð Bjarmason
2021-07-09 11:06 ` [PATCH v4 1/5] upload-pack: run is_repository_shallow() before setup_revisions() Ævar Arnfjörð Bjarmason
2021-07-09 11:06 ` [PATCH v4 2/5] revision.h: refactor "disable_stdin" and "read_from_stdin" Ævar Arnfjörð Bjarmason
2021-07-09 20:17 ` Junio C Hamano
2021-07-09 11:06 ` [PATCH v4 3/5] revision.[ch]: add a "handle_stdin_line" API Ævar Arnfjörð Bjarmason
2021-07-09 11:06 ` [PATCH v4 4/5] pack-objects.c: do stdin parsing via revision.c's API Ævar Arnfjörð Bjarmason
2021-07-09 11:06 ` [PATCH v4 5/5] pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 0/5] add --stdin parsing API, use in pack-objects Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 1/5] upload-pack: run is_repository_shallow() before setup_revisions() Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 2/5] revision.h: refactor "disable_stdin" and "read_from_stdin" Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 3/5] revision.[ch]: add a "handle_stdin_line" API Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 4/5] pack-objects.c: do stdin parsing via revision.c's API Ævar Arnfjörð Bjarmason
2021-07-26 12:46 ` [PATCH v5 5/5] pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS Ævar Arnfjörð Bjarmason
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=cover-0.4-0000000000-20210617T105537Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=zhiyou.jx@alibaba-inc.com \
/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).