From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: git@vger•kernel.org, Stefan Beller <sbeller@google•com>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH/WIP v2 07/19] am: extract patch, message and authorship with git-mailinfo
Date: Sun, 14 Jun 2015 15:10:24 -0700 [thread overview]
Message-ID: <xmqqvbeqkkkv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1434018125-31804-8-git-send-email-pyokagan@gmail.com> (Paul Tan's message of "Thu, 11 Jun 2015 18:21:53 +0800")
Paul Tan <pyokagan@gmail•com> writes:
> For the purpose of applying the patch and committing the results,
> implement extracting the patch data, commit message and authorship from
> an e-mail message using git-mailinfo.
>
> git-mailinfo is run as a separate process, but ideally in the future,
> we should be be able to access its functionality directly without
> spawning a new process.
>
> Helped-by: Junio C Hamano <gitster@pobox•com>
> Helped-by: Jeff King <peff@peff•net>
> Signed-off-by: Paul Tan <pyokagan@gmail•com>
> ---
>
> Notes:
> v2
>
> * use die_errno()
>
> * use '%*d' as the format specifier for msgnum()
>
> builtin/am.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 228 insertions(+)
>
> diff --git a/builtin/am.c b/builtin/am.c
> index 7379b97..a1db474 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -9,6 +9,23 @@
> #include "parse-options.h"
> #include "dir.h"
> #include "run-command.h"
> +#include "quote.h"
> +
> +/**
> + * Returns 1 if the file is empty or does not exist, 0 otherwise.
> + */
> +static int is_empty_file(const char *filename)
> +{
> + struct stat st;
> +
> + if (stat(filename, &st) < 0) {
> + if (errno == ENOENT)
> + return 1;
> + die_errno(_("could not stat %s"), filename);
> + }
> +
> + return !st.st_size;
> +}
>
> enum patch_format {
> PATCH_FORMAT_UNKNOWN = 0,
> @@ -23,6 +40,12 @@ struct am_state {
> int cur;
> int last;
>
> + /* commit message and metadata */
> + struct strbuf author_name;
> + struct strbuf author_email;
> + struct strbuf author_date;
> + struct strbuf msg;
> +
> /* number of digits in patch filename */
> int prec;
> };
> @@ -35,6 +58,10 @@ static void am_state_init(struct am_state *state)
> memset(state, 0, sizeof(*state));
>
> strbuf_init(&state->dir, 0);
> + strbuf_init(&state->author_name, 0);
> + strbuf_init(&state->author_email, 0);
> + strbuf_init(&state->author_date, 0);
> + strbuf_init(&state->msg, 0);
> state->prec = 4;
> }
>
> @@ -44,6 +71,10 @@ static void am_state_init(struct am_state *state)
> static void am_state_release(struct am_state *state)
> {
> strbuf_release(&state->dir);
> + strbuf_release(&state->author_name);
> + strbuf_release(&state->author_email);
> + strbuf_release(&state->author_date);
> + strbuf_release(&state->msg);
> }
>
> /**
> @@ -93,6 +124,95 @@ static int read_state_file(struct strbuf *sb, const char *file, size_t hint, int
> }
>
> /**
> + * Parses the "author script" `filename`, and sets state->author_name,
> + * state->author_email and state->author_date accordingly. We are strict with
> + * our parsing, as the author script is supposed to be eval'd, and loosely
> + * parsing it may not give the results the user expects.
> + *
> + * The author script is of the format:
> + *
> + * GIT_AUTHOR_NAME='$author_name'
It seems that you have SP * SP TAB GIT_AUTHOR_... here; lose SP
before the TAB?
> + if (!skip_prefix(sb.buf, "GIT_AUTHOR_NAME=", (const char**) &value))
Style:
if (!skip_prefix(sb.buf, "GIT_AUTHOR_NAME=", (const char **)&value))
next prev parent reply other threads:[~2015-06-14 22:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-11 10:21 [PATCH/WIP v2 00/19] Make git-am a builtin Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 01/19] wrapper: implement xopen() Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 02/19] wrapper: implement xfopen() Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 03/19] am: implement skeletal builtin am Paul Tan
2015-06-14 22:08 ` Junio C Hamano
2015-06-15 9:49 ` Paul Tan
2015-06-15 17:14 ` Junio C Hamano
2015-06-15 17:20 ` Paul Tan
2015-06-15 17:54 ` Junio C Hamano
2015-06-18 8:44 ` Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 04/19] am: implement patch queue mechanism Paul Tan
2015-06-11 17:39 ` Stefan Beller
2015-06-15 10:46 ` Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 05/19] am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-06-11 17:45 ` Stefan Beller
2015-06-15 10:08 ` Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 06/19] am: detect mbox patches Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 07/19] am: extract patch, message and authorship with git-mailinfo Paul Tan
2015-06-14 22:10 ` Junio C Hamano [this message]
2015-06-11 10:21 ` [PATCH/WIP v2 08/19] am: apply patch with git-apply Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 09/19] am: commit applied patch Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 10/19] am: refresh the index at start Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 11/19] am: refuse to apply patches if index is dirty Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 12/19] am: implement --resolved/--continue Paul Tan
2015-06-11 10:21 ` [PATCH/WIP v2 13/19] am: implement --skip Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 14/19] am: implement --abort Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 15/19] am: implement quiet option Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 16/19] am: exit with user friendly message on patch failure Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 17/19] am: implement am --signoff Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 18/19] cache-tree: introduce write_index_as_tree() Paul Tan
2015-06-11 10:22 ` [PATCH/WIP v2 19/19] am: implement 3-way merge Paul Tan
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=xmqqvbeqkkkv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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