From: Eric Sunshine <sunshine@sunshineco.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH/WIP 5/8] am: detect mbox patches
Date: Sun, 31 May 2015 13:16:28 -0400 [thread overview]
Message-ID: <CAPig+cQc6mgfXB3nz01xu8QArPv7zNOVXwb+WskBn1z2RyJCYQ@mail.gmail.com> (raw)
In-Reply-To: <1432733618-25629-6-git-send-email-pyokagan@gmail.com>
On Wed, May 27, 2015 at 9:33 AM, Paul Tan <pyokagan@gmail.com> wrote:
> Since 15ced75 (git-am foreign patch support: autodetect some patch
> formats, 2009-05-27), git-am.sh is able to autodetect mbox, stgit and
> mercurial patches through heuristics.
>
> Re-implement support for autodetecting mbox/maildir files.
A few minor comments below...
> Signed-off-by: Paul Tan <pyokagan@gmail.com>
> ---
> diff --git a/builtin/am.c b/builtin/am.c
> index 9c7b058..d589ec5 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -108,6 +108,97 @@ static void am_destroy(const struct am_state *state)
> strbuf_release(&sb);
> }
>
> +/*
> + * Returns 1 if the file looks like a piece of email a-la RFC2822, 0 otherwise.
> + * We check this by grabbing all the non-indented lines and seeing if they look
> + * like they begin with valid header field names.
> + */
> +static int is_email(const char *filename)
> +{
> + struct strbuf sb = STRBUF_INIT;
> + FILE *fp = xfopen(filename, "r");
> + int ret = 1;
> +
> + while (!strbuf_getline(&sb, fp, '\n')) {
> + const char *x;
> +
> + strbuf_rtrim(&sb);
> +
> + if (!sb.len)
> + break; /* End of header */
> +
> + /* Ignore indented folded lines */
> + if (*sb.buf == '\t' || *sb.buf == ' ')
> + continue;
> +
> + /* It's a header if it matches the regexp "^[!-9;-~]+:" */
> + for (x = sb.buf; *x; x++) {
> + if (('!' <= *x && *x <= '9') || (';' <= *x && *x <= '~'))
> + continue;
> + if (*x == ':' && x != sb.buf)
> + break;
> + ret = 0;
> + goto fail;
> + }
> + }
> +
> +fail:
It's a bit odd seeing a label named "fail" through which both the
successful and failing cases flow. Upon seeing it, I had expected to
find a "return 1" somewhere above for the successful case. Perhaps a
name such as "done" would be clearer.
> + fclose(fp);
> + strbuf_release(&sb);
> + return ret;
> +}
> +
> +/**
> + * Attempts to detect the patch_format of the patches contained in `paths`,
> + * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if
> + * detection fails.
> + */
> +static int detect_patch_format(struct string_list *paths)
> +{
> + enum patch_format ret = PATCH_FORMAT_UNKNOWN;
> + struct strbuf l1 = STRBUF_INIT;
> + struct strbuf l2 = STRBUF_INIT;
> + struct strbuf l3 = STRBUF_INIT;
> + FILE *fp;
> +
> + /*
> + * We default to mbox format if input is from stdin and for directories
> + */
> + if (!paths->nr || !strcmp(paths->items->string, "-") ||
> + is_directory(paths->items->string)) {
> + strbuf_release(&l1);
> + strbuf_release(&l2);
> + strbuf_release(&l3);
> + return PATCH_FORMAT_MBOX;
A couple observations:
Some people will argue that these strbuf_release() calls are pointless
since the strbufs haven't been used yet, thus should be dropped. (I
don't care strongly.)
Perhaps this case could be a bit less noisy if coded like this:
if (... || ...) {
ret = PATCH_FORMAT_MBOX;
goto done;
}
with a corresponding "done" label added before the strbuf_release()
calls near the bottom of the function.
> + }
> +
> + /*
> + * Otherwise, check the first few 3 lines of the first patch, starting
Either: s/few 3/few/ or s/few 3/3/
> + * from the first non-blank line, to try to detect its format.
> + */
> + fp = xfopen(paths->items->string, "r");
> + while (!strbuf_getline(&l1, fp, '\n')) {
> + strbuf_trim(&l1);
> + if (l1.len)
> + break;
> + }
> + strbuf_getline(&l2, fp, '\n');
> + strbuf_trim(&l2);
> + strbuf_getline(&l3, fp, '\n');
> + strbuf_trim(&l3);
> + fclose(fp);
> +
> + if (starts_with(l1.buf, "From ") || starts_with(l1.buf, "From: "))
> + ret = PATCH_FORMAT_MBOX;
> + else if (l1.len && l2.len && l3.len && is_email(paths->items->string))
> + ret = PATCH_FORMAT_MBOX;
> +
> + strbuf_release(&l1);
> + strbuf_release(&l2);
> + strbuf_release(&l3);
> + return ret;
> +}
> +
> /**
> * Splits out individual patches from `paths`, where each path is either a mbox
> * file or a Maildir. Return 0 on success, -1 on failure.
> @@ -162,6 +253,14 @@ static int split_patches(struct am_state *state, enum patch_format patch_format,
> static void am_setup(struct am_state *state, enum patch_format patch_format,
> struct string_list *paths)
> {
> + if (!patch_format)
> + patch_format = detect_patch_format(paths);
> +
> + if (!patch_format) {
> + fprintf_ln(stderr, _("Patch format detection failed."));
> + exit(128);
> + }
> +
> if (mkdir(state->dir.buf, 0777) < 0 && errno != EEXIST)
> die_errno(_("failed to create directory '%s'"), state->dir.buf);
>
> --
> 2.1.4
next prev parent reply other threads:[~2015-05-31 17:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 13:33 [PATCH/WIP 0/8] Make git-am a builtin Paul Tan
2015-05-27 13:33 ` [PATCH/WIP 1/8] wrapper: implement xopen() Paul Tan
2015-05-27 17:52 ` Stefan Beller
2015-05-27 19:03 ` Torsten Bögershausen
2015-05-27 21:53 ` Jeff King
2015-06-03 8:16 ` Paul Tan
2015-06-04 12:05 ` Paul Tan
2015-05-27 13:33 ` [PATCH/WIP 2/8] wrapper: implement xfopen() Paul Tan
2015-05-27 21:55 ` Jeff King
2015-05-27 13:33 ` [PATCH/WIP 3/8] am: implement patch queue mechanism Paul Tan
2015-05-27 20:38 ` Junio C Hamano
2015-05-27 13:33 ` [PATCH/WIP 4/8] am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-05-28 23:05 ` Eric Sunshine
2015-06-02 14:27 ` Paul Tan
2015-05-27 13:33 ` [PATCH/WIP 5/8] am: detect mbox patches Paul Tan
2015-05-31 17:16 ` Eric Sunshine [this message]
2015-05-27 13:33 ` [PATCH/WIP 6/8] am: extract patch, message and authorship with git-mailinfo Paul Tan
2015-05-27 20:44 ` Junio C Hamano
2015-05-27 22:13 ` Jeff King
2015-06-03 7:56 ` Paul Tan
2015-05-27 22:13 ` Junio C Hamano
2015-06-03 7:57 ` Paul Tan
2015-05-27 13:33 ` [PATCH/WIP 7/8] am: apply patch with git-apply Paul Tan
2015-05-27 13:33 ` [PATCH/WIP 8/8] am: commit applied patch 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
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=CAPig+cQc6mgfXB3nz01xu8QArPv7zNOVXwb+WskBn1z2RyJCYQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pyokagan@gmail.com \
--cc=sbeller@google.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).