From patchwork Tue Sep 8 07:16:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sunshine X-Patchwork-Id: 11762653 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B1B516C0 for ; Tue, 8 Sep 2020 07:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 212E521D42 for ; Tue, 8 Sep 2020 07:17:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Oby7PFfq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729129AbgIHHRX (ORCPT ); Tue, 8 Sep 2020 03:17:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728759AbgIHHRU (ORCPT ); Tue, 8 Sep 2020 03:17:20 -0400 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B827C061755 for ; Tue, 8 Sep 2020 00:17:20 -0700 (PDT) Received: by mail-il1-x143.google.com with SMTP id t16so14379990ilf.13 for ; Tue, 08 Sep 2020 00:17:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1H+cV+eVhyQQ1oem3DSYqbGoPyiWZiLyN2+tTh/nxdA=; b=Oby7PFfqSQB7NAac5ZI4Ne+kNMVTv+DwTpRsoZZgn2dXOy16A4AvpoVjczyNx9ZsQY fwxW366VaKwpi+v4I97cWNbp2uYdtBd0BLKY93dhpiSrsL0DaBnoISFRjQaQrIsVaqV9 5/Jyme/Tq/J2WuMXn+jUWhv9axXDAuhhP3JHJ3jZIH9Fzeejd4sb0wKD4Ztjb+RQB7Ns KSqiujrOiQRDwzywaLOa7ZCcKMT69xh5XkC+T+f6pIuN9IEQi5IDyAu05HQ4SWcqqZV/ 7kBpalkVY0pLzUuu0ihy9v2Xs3XnW1HJlZoem/K0mQM9Tdlj0GoHdf3fh8THIo2IJDEN fMZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1H+cV+eVhyQQ1oem3DSYqbGoPyiWZiLyN2+tTh/nxdA=; b=mGuvxnqEhAA7lw5IfDu5uV+Q9rAK9KeSDczlGixNazEKpX0T1mPBNSqUG4W0J/Mfhf 4/NP+BS3qRj0Rxk2QU4CMRZWZ0svEE9BqhHtpuINwKSTqkyYbWyaHI+jr7FdSjKcflEO xkP/fUh41tIYm2KZKbr6SK/o66G5VsOR1EeoL9iw+4gFnrlQoe1y/qIbpbGZSGTVwk58 dVaKu06oowvWoa2zjCyAwHRce3qfy3sDjAhunnnRNjGN409A9OPcLrPxHnJ2S3iGnUOh v7SAbXxLAoHphwE9h0ei35H58ndD8tDAzOK+XAPJbgYUqrqvzKvNqVfq+3jmJ4fJ+ksG lUmw== X-Gm-Message-State: AOAM530S42WRm0ZHmbjMIdRlNA3sXbsCLRozPuDAs3RfSTtZU0a9jiRX 5Cau0gWj941/V89bpHKxv/0qyPLTyfU= X-Google-Smtp-Source: ABdhPJxFJeE/qJukIVvPXtPf3z2GHgJuoRqyidnXLwwb7FGwPNnB/XiJ2dMD7ltY9ANdlsFHAEHzpw== X-Received: by 2002:a92:9ec3:: with SMTP id s64mr22151427ilk.294.1599549439255; Tue, 08 Sep 2020 00:17:19 -0700 (PDT) Received: from localhost.localdomain (user-12l2dpj.cable.mindspring.com. [69.81.55.51]) by smtp.gmail.com with ESMTPSA id m18sm9587778iln.80.2020.09.08.00.17.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 00:17:18 -0700 (PDT) From: Eric Sunshine To: git@vger.kernel.org Cc: Junio C Hamano , Duy Nguyen , Eric Sunshine Subject: [PATCH 1/3] diff: move show_interdiff() from its own file to diff-lib Date: Tue, 8 Sep 2020 03:16:08 -0400 Message-Id: <20200908071610.16714-2-sunshine@sunshineco.com> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7 In-Reply-To: <20200908071610.16714-1-sunshine@sunshineco.com> References: <20200908071610.16714-1-sunshine@sunshineco.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org show_interdiff() is a relatively small function and not likely to grow larger or more complicated. Rather than dedicating an entire source file to it, relocate it to diff-lib.c which houses other "take two things and compare them" functions meant to be re-used but not so low-level as to reside in the core diff implementation. Signed-off-by: Eric Sunshine --- Notes: Suggested by Duy[1] and seconded by Junio[2] during review. [1]: https://lore.kernel.org/git/CACsJy8C8RK6HkfoEYJGZg=sgtJS0WksHD3=7Souw3jYebRo=Sg@mail.gmail.com/ [2]: https://lore.kernel.org/git/xmqqh8kp4otz.fsf@gitster-ct.c.googlers.com/ Makefile | 1 - builtin/log.c | 1 - diff-lib.c | 24 ++++++++++++++++++++++++ diff.h | 2 ++ interdiff.c | 28 ---------------------------- interdiff.h | 8 -------- log-tree.c | 1 - 7 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 interdiff.c delete mode 100644 interdiff.h diff --git a/Makefile b/Makefile index 86e5411f39..cf47141939 100644 --- a/Makefile +++ b/Makefile @@ -883,7 +883,6 @@ LIB_OBJS += hashmap.o LIB_OBJS += help.o LIB_OBJS += hex.o LIB_OBJS += ident.o -LIB_OBJS += interdiff.o LIB_OBJS += json-writer.o LIB_OBJS += kwset.o LIB_OBJS += levenshtein.o diff --git a/builtin/log.c b/builtin/log.c index b58f8da09e..ae9380da1b 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -33,7 +33,6 @@ #include "commit-slab.h" #include "repository.h" #include "commit-reach.h" -#include "interdiff.h" #include "range-diff.h" #define MAIL_DEFAULT_WRAP 72 diff --git a/diff-lib.c b/diff-lib.c index 50521e2093..9bab907412 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -571,3 +571,27 @@ int index_differs_from(struct repository *r, object_array_clear(&rev.pending); return (rev.diffopt.flags.has_changes != 0); } + +static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) +{ + return data; +} + +void show_interdiff(struct rev_info *rev, int indent) +{ + struct diff_options opts; + struct strbuf prefix = STRBUF_INIT; + + memcpy(&opts, &rev->diffopt, sizeof(opts)); + opts.output_format = DIFF_FORMAT_PATCH; + opts.output_prefix = idiff_prefix_cb; + strbuf_addchars(&prefix, ' ', indent); + opts.output_prefix_data = &prefix; + diff_setup_done(&opts); + + diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts); + diffcore_std(&opts); + diff_flush(&opts); + + strbuf_release(&prefix); +} diff --git a/diff.h b/diff.h index e0c0af6286..308937c94b 100644 --- a/diff.h +++ b/diff.h @@ -600,6 +600,8 @@ int index_differs_from(struct repository *r, const char *def, const struct diff_flags *flags, int ita_invisible_in_index); +void show_interdiff(struct rev_info *, int indent); + /* * Fill the contents of the filespec "df", respecting any textconv defined by * its userdiff driver. The "driver" parameter must come from a diff --git a/interdiff.c b/interdiff.c deleted file mode 100644 index c81d680a6c..0000000000 --- a/interdiff.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "cache.h" -#include "commit.h" -#include "revision.h" -#include "interdiff.h" - -static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) -{ - return data; -} - -void show_interdiff(struct rev_info *rev, int indent) -{ - struct diff_options opts; - struct strbuf prefix = STRBUF_INIT; - - memcpy(&opts, &rev->diffopt, sizeof(opts)); - opts.output_format = DIFF_FORMAT_PATCH; - opts.output_prefix = idiff_prefix_cb; - strbuf_addchars(&prefix, ' ', indent); - opts.output_prefix_data = &prefix; - diff_setup_done(&opts); - - diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts); - diffcore_std(&opts); - diff_flush(&opts); - - strbuf_release(&prefix); -} diff --git a/interdiff.h b/interdiff.h deleted file mode 100644 index 01c730a5c9..0000000000 --- a/interdiff.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef INTERDIFF_H -#define INTERDIFF_H - -struct rev_info; - -void show_interdiff(struct rev_info *, int indent); - -#endif diff --git a/log-tree.c b/log-tree.c index 55a68d0c61..39bb362d5e 100644 --- a/log-tree.c +++ b/log-tree.c @@ -15,7 +15,6 @@ #include "sequencer.h" #include "line-log.h" #include "help.h" -#include "interdiff.h" #include "range-diff.h" static struct decoration name_decoration = { "object names" }; From patchwork Tue Sep 8 07:16:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sunshine X-Patchwork-Id: 11762655 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FA3C59D for ; Tue, 8 Sep 2020 07:17:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45DF421D43 for ; Tue, 8 Sep 2020 07:17:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lckjjyTp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729161AbgIHHRY (ORCPT ); Tue, 8 Sep 2020 03:17:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729080AbgIHHRV (ORCPT ); Tue, 8 Sep 2020 03:17:21 -0400 Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E03EC061573 for ; Tue, 8 Sep 2020 00:17:21 -0700 (PDT) Received: by mail-io1-xd41.google.com with SMTP id u126so15942971iod.12 for ; Tue, 08 Sep 2020 00:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BP2KcdJQOQUmLEdlu7UuJOrfrCv9wj1GL9Hf5Hcgfsk=; b=lckjjyTpHy/BJ1s2ySw/LCXAwPbsIaprK9KU0a5IIcD9RmPh9TIf3vMpJVvAa/VXpP uTApDL2OQALflWUJuj12PM5en8OyMn2G8tSCgz0cXjcqFTdTkLJxNpuXyKxizsjEDUjC PgfCpl8mcRDSQOq1i4oK1WtUGl7kmQwIzArTDoWgg4tdKz3kWzbDgbpI2mOb8utWbgGR 6YWoODxEGZKdKGoBFVM/7oPPtgyLnDGOrpnQqHxAPd5hEZ6E/MoJyywqjICjl9H2WNbD 8vTVMGecZdShyaQ+4MB1aQBMd2ddJvZzo2Yr2NSN9i5uwDUlTobmgQfIxlZwai1MTHD9 KyTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BP2KcdJQOQUmLEdlu7UuJOrfrCv9wj1GL9Hf5Hcgfsk=; b=uJdFQqwLCga4pPqOcilUPadqEYda0431AR8JQNfl13xJhzqgVPCTgHGGH/zn14HuPy MVERQCfj9IBwVHYDWpTUtNqDitMVhAU5Yu4xbT+4MOdKfSifbm4s0MMwc4Aaku1V6PsL iM70fpeS3xdxE6Btv6OjKGtFFAENghN7Pw1AmZRttTgUswC+9qo0ZyLZtLKCOlukY+KG mT7mYcOz/ElfMj6adjwqAtMCgmoMqoIKTcU6VAgKmCAoef0pHmhKPdnjTHuB1pSsqGyY 73ZUwCrAWJlkbD/pFXUyT/Ls17xAeiTjOM7vXbu2YhlDy56TEkeQ6+Z4aLl1BY08pcWv sQag== X-Gm-Message-State: AOAM531VRCzT5Z6mJRs8mPtJndWmtFXziWqzjDqWeUkj9i0AZEPHFEH2 YPzsifYjJsXKfyoTEE9b8jiqvcHDKis= X-Google-Smtp-Source: ABdhPJzwE2QH39lt4/6dYLKiYq6J+S3rOJ+m4Iv/bBOGLsiEOOMaj+eb0/p/f1WVcKidXmbRgpPBsQ== X-Received: by 2002:a05:6602:1602:: with SMTP id x2mr5248249iow.22.1599549440335; Tue, 08 Sep 2020 00:17:20 -0700 (PDT) Received: from localhost.localdomain (user-12l2dpj.cable.mindspring.com. [69.81.55.51]) by smtp.gmail.com with ESMTPSA id m18sm9587778iln.80.2020.09.08.00.17.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 00:17:19 -0700 (PDT) From: Eric Sunshine To: git@vger.kernel.org Cc: Junio C Hamano , Duy Nguyen , Eric Sunshine Subject: [PATCH 2/3] diff-lib: tighten show_interdiff()'s interface Date: Tue, 8 Sep 2020 03:16:09 -0400 Message-Id: <20200908071610.16714-3-sunshine@sunshineco.com> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7 In-Reply-To: <20200908071610.16714-1-sunshine@sunshineco.com> References: <20200908071610.16714-1-sunshine@sunshineco.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org To compute and show an interdiff, show_interdiff() needs only the two OID's to compare and a diffopts, yet it expects callers to supply an entire rev_info. The demand for rev_info is not only overkill, but also places unnecessary burden on potential future callers which might not otherwise have a rev_info at hand. Address this by tightening its signature to require only the items it needs instead of a full rev_info. Signed-off-by: Eric Sunshine --- Notes: Suggested by Sunshine[1] during review. [1]: https://lore.kernel.org/git/CAPig+cSuYUYSPTuKx08wcmQM-G12_-W2T4BS07fA=6grM1b8Gw@mail.gmail.com/ builtin/log.c | 3 ++- diff-lib.c | 7 ++++--- diff.h | 7 ++++++- log-tree.c | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ae9380da1b..37177b3e7f 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1206,7 +1206,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, if (rev->idiff_oid1) { fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title); - show_interdiff(rev, 0); + show_interdiff(rev->idiff_oid1, rev->idiff_oid2, 0, + &rev->diffopt); } if (rev->rdiff1) { diff --git a/diff-lib.c b/diff-lib.c index 9bab907412..a17becc509 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -577,19 +577,20 @@ static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) return data; } -void show_interdiff(struct rev_info *rev, int indent) +void show_interdiff(const struct object_id *oid1, const struct object_id *oid2, + int indent, struct diff_options *diffopt) { struct diff_options opts; struct strbuf prefix = STRBUF_INIT; - memcpy(&opts, &rev->diffopt, sizeof(opts)); + memcpy(&opts, diffopt, sizeof(opts)); opts.output_format = DIFF_FORMAT_PATCH; opts.output_prefix = idiff_prefix_cb; strbuf_addchars(&prefix, ' ', indent); opts.output_prefix_data = &prefix; diff_setup_done(&opts); - diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts); + diff_tree_oid(oid1, oid2, "", &opts); diffcore_std(&opts); diff_flush(&opts); diff --git a/diff.h b/diff.h index 308937c94b..49242d2733 100644 --- a/diff.h +++ b/diff.h @@ -600,7 +600,12 @@ int index_differs_from(struct repository *r, const char *def, const struct diff_flags *flags, int ita_invisible_in_index); -void show_interdiff(struct rev_info *, int indent); +/* + * Emit an interdiff of two object ID's to 'diff_options.file' optionally + * indented by 'indent' spaces. + */ +void show_interdiff(const struct object_id *, const struct object_id *, + int indent, struct diff_options *); /* * Fill the contents of the filespec "df", respecting any textconv defined by diff --git a/log-tree.c b/log-tree.c index 39bb362d5e..ad1e7e31f8 100644 --- a/log-tree.c +++ b/log-tree.c @@ -799,7 +799,8 @@ void show_log(struct rev_info *opt) next_commentary_block(opt, NULL); fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); - show_interdiff(opt, 2); + show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2, + &opt->diffopt); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } From patchwork Tue Sep 8 07:16:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sunshine X-Patchwork-Id: 11762657 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1FB4815E4 for ; Tue, 8 Sep 2020 07:17:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 027AA218AC for ; Tue, 8 Sep 2020 07:17:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fRIwpjPi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729181AbgIHHR0 (ORCPT ); Tue, 8 Sep 2020 03:17:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729103AbgIHHRW (ORCPT ); Tue, 8 Sep 2020 03:17:22 -0400 Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F916C061755 for ; Tue, 8 Sep 2020 00:17:22 -0700 (PDT) Received: by mail-io1-xd43.google.com with SMTP id m17so16028592ioo.1 for ; Tue, 08 Sep 2020 00:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2lkwjp7UPMKhHgzBK6XefuplR6y5wKQ/6ezJQMP9ZDc=; b=fRIwpjPiivZfcPyelEPlsc/DzRvcyXu8z0A0ww8zRCHa6yKUZpbXUcjYMXFJfQ9tb+ rqt0CZHEKc/z0x70WO864Gk6+wOqnOsJ2FDAmPfwvmnQl59YNSOXfAtA+58OvFkcUBZL Hch4n574rp/gD3Af0OjiQ32yADlqMJeDwJS/3ImbEJJGUCl12sOYOdUv51IQEi3x7mrU m/OQcz0J++IhnkZqdDuzPEQkHCMYKkKHVQrBcwxltLwbV9m5QZXLfEHGn2IKABcX/Gum 1U42pV4zUIZE9IY1cdoVi/+7P1PaLUc7EesBVQt5qcLcW1osuh4emPndJKuMcs3TOvjg sFhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2lkwjp7UPMKhHgzBK6XefuplR6y5wKQ/6ezJQMP9ZDc=; b=FWZw6z2UW2Ea65gHLi+pGGswn6hTPhKNiHqJsTSpPBPao1qAF8I6etWJhPdroXlNsX 4uBitupVqHAbVV5KSylYt/Tk7Uf6c68Wv/zG22a5sWYotrV8dLfwWuHbaBowoUgviPeO 5IQGGAHbDxS3ZqCYlfcSQlj2IjfuGaV+vXgcpPVkUh0GZQSTY9lnMsnG6JC6tmbxPADj lPV369rGRJyo/d+ENkKOLVUqdmC4f36Z1uArJt2YVvpSIQ3rZBvvK/UlIigjD0wUe8OE xbpnA7aX9KUFgGxN7rXeH+icN82BAqQkFR8Ai4LJzz49hxw1VTDwutYw3a3RB6M27hhc HIhg== X-Gm-Message-State: AOAM533hGF7LHuVM9PXvk/Dv5+9iX/EbGp/gxJEEo3A53kGP0wcO/4lo sABqxYggezteXY9xBGJSzKvrRd2+qTg= X-Google-Smtp-Source: ABdhPJxai6FhCJTLi+U/Uu+05XoFvGJl0SE4HWpAUGlGT2dG+NTd62dsq1nCso6T9bkAzJZL71vCuw== X-Received: by 2002:a5e:dc08:: with SMTP id b8mr19568611iok.13.1599549441263; Tue, 08 Sep 2020 00:17:21 -0700 (PDT) Received: from localhost.localdomain (user-12l2dpj.cable.mindspring.com. [69.81.55.51]) by smtp.gmail.com with ESMTPSA id m18sm9587778iln.80.2020.09.08.00.17.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 00:17:20 -0700 (PDT) From: Eric Sunshine To: git@vger.kernel.org Cc: Junio C Hamano , Duy Nguyen , Eric Sunshine Subject: [PATCH 3/3] format-patch: use 'origin' as start of current-series-range when known Date: Tue, 8 Sep 2020 03:16:10 -0400 Message-Id: <20200908071610.16714-4-sunshine@sunshineco.com> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7 In-Reply-To: <20200908071610.16714-1-sunshine@sunshineco.com> References: <20200908071610.16714-1-sunshine@sunshineco.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When formatting a patch series over `origin..HEAD`, one would expect that range to be used as the current-series-range when computing a range-diff between the previous and current versions of a patch series. However, infer_range_diff_ranges() ignores `origin..HEAD` when --range-diff= specifies a single revision rather than a range, and instead unexpectedly computes the current-series-range based upon . Address this anomaly by unconditionally using `origin..HEAD` as the current-series-range regardless of as long as `origin` is known, and only fall back to basing current-series-range on when `origin` is not known. Signed-off-by: Eric Sunshine --- Notes: Suggested by Junio[1] during review. I had some difficulty composing the commit message and am not convinced that it does a good job of explaining the change or justifying it. If anyone can suggest improvements, I'd appreciate the help. I'm also not sure if this change deserves a test. If it does, it isn't clear to me exactly how to craft one. So, again, assistance would be appreciated. [1]: https://lore.kernel.org/git/xmqqva93t4u7.fsf@gitster-ct.c.googlers.com/ builtin/log.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 37177b3e7f..f79b2b8775 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1595,16 +1595,20 @@ static void infer_range_diff_ranges(struct strbuf *r1, struct commit *head) { const char *head_oid = oid_to_hex(&head->object.oid); + int prev_is_range = !!strstr(prev, ".."); - if (!strstr(prev, "..")) { + if (prev_is_range) + strbuf_addstr(r1, prev); + else strbuf_addf(r1, "%s..%s", head_oid, prev); + + if (origin) + strbuf_addf(r2, "%s..%s", oid_to_hex(&origin->object.oid), head_oid); + else if (prev_is_range) + die(_("failed to infer range-diff origin of current series")); + else { + warning(_("using '%s' as range-diff origin of current series"), prev); strbuf_addf(r2, "%s..%s", prev, head_oid); - } else if (!origin) { - die(_("failed to infer range-diff ranges")); - } else { - strbuf_addstr(r1, prev); - strbuf_addf(r2, "%s..%s", - oid_to_hex(&origin->object.oid), head_oid); } }