From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id CC19A1F59D for ; Sat, 16 Jul 2022 07:41:21 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MI6EcxKU"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230022AbiGPHlT (ORCPT ); Sat, 16 Jul 2022 03:41:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiGPHlR (ORCPT ); Sat, 16 Jul 2022 03:41:17 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB3111055F for ; Sat, 16 Jul 2022 00:41:16 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id j1-20020a17090aeb0100b001ef777a7befso9615440pjz.0 for ; Sat, 16 Jul 2022 00:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DCmC8i8ashrRnHfFoSvLmXY456g/qnefS1Bfp7aVcsc=; b=MI6EcxKUnNeQ3RFNHFkKpjHSHDKrL72hEbpTiTxqesTYBG+DjPqMq3qX6aLgqphEKr ohZNUOElqqQtGSjY7HI63K+8owVGSGXgXUHkcdBTu1lNMpELjauVG9j0Muw3ar82aq3d GY6geghETUw5JOYAMhyTorHt6lm3bNz6HfomRM7tS4q9pMOZtWhd9KiTN1vJYtvZOBkd FzH01Z8N1mHegYjA0AfDtmKNOiYx0TILpq1yuaskNbTMBJgY9bHW/yaIt9Cg5kfLOz1C ybM2GPwkFqAehathTiugr6f3rdSHL8uOtE4sGDOH3tU/BT0A778OLtRsqWbPK7r8ofrs aX6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DCmC8i8ashrRnHfFoSvLmXY456g/qnefS1Bfp7aVcsc=; b=vWjyWBRvE9fgkrcno69XpVHG63L0tutqarVkkHz40l5sP1nbs/ks4KFi9vFBMFMAh9 V6ngZvKTNfGRHj/cEmfiBylowIC6ufPVfJcYb959GqDr2fTkWp3bsgyHmWCOD9VGRPiB DAJxtqoLZckxhcIeYG5p4jfM4doEZ8aWgcF0TBFgy7NJWe3ZJblRQWC5gaBe3lAQU+mb Y+ePX6RmdztSbAfYfLFSkwKcPp+h0iKjKmbFRgPgDM4AimzonXz6GssyJq1RxdiF2/Ea r9JYj/+OSiu5iKcMEJhPPTd2lG2Q+9TaiPLHh8cVUCxWWCNeNYPd5tVQb0apH0lzKFWw 3Buw== X-Gm-Message-State: AJIora9qgpWKA2OidJFQbXanaMabZA5k8kz32oSR9c1qBEvGnSxrqcfC n0NbbCSQWQ522srKSoa3TVwaRs8HccGL8KV5 X-Google-Smtp-Source: AGRyM1uKFi4Yxh2ZX6x5ZoTlJ/7a5S5wuvuSFd1evZoOnTmOf++ryPGPOOsDIRp0didxA6gRY+0tEQ== X-Received: by 2002:a17:90b:33cd:b0:1f0:3655:17a8 with SMTP id lk13-20020a17090b33cd00b001f0365517a8mr20117838pjb.33.1657957275710; Sat, 16 Jul 2022 00:41:15 -0700 (PDT) Received: from HB2.. ([110.225.168.189]) by smtp.gmail.com with ESMTPSA id i27-20020a63541b000000b004161e62a3a5sm4325923pgb.78.2022.07.16.00.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jul 2022 00:41:15 -0700 (PDT) From: Siddharth Asthana To: git@vger.kernel.org Cc: phillip.wood123@gmail.com, congdanhqx@gmail.com, christian.couder@gmail.com, avarab@gmail.com, gitster@pobox.com, Johannes.Schindelin@gmx.de, johncai86@gmail.com, Siddharth Asthana Subject: [PATCH v5 1/4] revision: improve commit_rewrite_person() Date: Sat, 16 Jul 2022 13:10:52 +0530 Message-Id: <20220716074055.1786231-2-siddharthasthana31@gmail.com> X-Mailer: git-send-email 2.37.1.120.g001f220fb8 In-Reply-To: <20220716074055.1786231-1-siddharthasthana31@gmail.com> References: <20220712160634.213956-1-siddharthasthana31@gmail.com> <20220716074055.1786231-1-siddharthasthana31@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The function, commit_rewrite_person(), is designed to find and replace an ident string in the header part, and the way it avoids a random occurrence of "author A U Thor Mentored-by: John Cai Helped-by: Đoàn Trần Công Danh Helped-by: Johannes Schindelin Signed-off-by: Siddharth Asthana --- revision.c | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/revision.c b/revision.c index 211352795c..9909da928e 100644 --- a/revision.c +++ b/revision.c @@ -3755,19 +3755,18 @@ int rewrite_parents(struct rev_info *revs, struct commit *commit, return 0; } -static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap) +/* + * Returns the difference between the new and old length of the ident line. + */ +static ssize_t rewrite_ident_line(const char *person, struct strbuf *buf, + struct string_list *mailmap) { - char *person, *endp; + char *endp; size_t len, namelen, maillen; const char *name; const char *mail; struct ident_split ident; - person = strstr(buf->buf, what); - if (!person) - return 0; - - person += strlen(what); endp = strchr(person, '\n'); if (!endp) return 0; @@ -3784,6 +3783,7 @@ static int commit_rewrite_person(struct strbuf *buf, const char *what, struct st if (map_user(mailmap, &mail, &maillen, &name, &namelen)) { struct strbuf namemail = STRBUF_INIT; + size_t newlen; strbuf_addf(&namemail, "%.*s <%.*s>", (int)namelen, name, (int)maillen, mail); @@ -3792,14 +3792,44 @@ static int commit_rewrite_person(struct strbuf *buf, const char *what, struct st ident.mail_end - ident.name_begin + 1, namemail.buf, namemail.len); + newlen = namemail.len; + strbuf_release(&namemail); - return 1; + return newlen - (ident.mail_end - ident.name_begin + 1); } return 0; } +static void commit_rewrite_person(struct strbuf *buf, const char **header, + struct string_list *mailmap) +{ + size_t buf_offset = 0; + + if (!mailmap) + return; + + for (;;) { + const char *person, *line; + size_t i; + + line = buf->buf + buf_offset; + if (!*line || *line == '\n') + return; /* End of header */ + + for (i = 0; header[i]; i++) + if (skip_prefix(line, header[i], &person)) { + rewrite_ident_line(person, buf, mailmap); + break; + } + + buf_offset = strchrnul(buf->buf + buf_offset, '\n') - buf->buf; + if (buf->buf[buf_offset] == '\n') + ++buf_offset; + } +} + static int commit_match(struct commit *commit, struct rev_info *opt) { int retval; @@ -3832,11 +3862,12 @@ static int commit_match(struct commit *commit, struct rev_info *opt) strbuf_addstr(&buf, message); if (opt->grep_filter.header_list && opt->mailmap) { + const char *commit_headers[] = { "author ", "committer ", NULL }; + if (!buf.len) strbuf_addstr(&buf, message); - commit_rewrite_person(&buf, "\nauthor ", opt->mailmap); - commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap); + commit_rewrite_person(&buf, commit_headers, opt->mailmap); } /* Append "fake" message parts as needed */ -- 2.37.1.120.g001f220fb8