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-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 23A0A1F670 for ; Sun, 1 Nov 2020 19:34:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727345AbgKATeg (ORCPT ); Sun, 1 Nov 2020 14:34:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727298AbgKATeV (ORCPT ); Sun, 1 Nov 2020 14:34:21 -0500 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCF15C061A48 for ; Sun, 1 Nov 2020 11:34:20 -0800 (PST) Received: by mail-lj1-x244.google.com with SMTP id y16so12702599ljk.1 for ; Sun, 01 Nov 2020 11:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+8V7Y46XOAS5DpdF3SLr1BaTYKu0peNkOrQhxAmHBA=; b=uk0tpvGHQlTtjKLc8EKt9HOwEbJhTnLs4asYbOVIS+gB9zHCEIIV6lp226k3GWXynk 19c+Wvs8YhSxayetdGtvS/WekhqAJma89kQ7F8uVfwtRp6NngdLUVvFII36nSq8hI07L UcCm+p/g5pjHPErzoW4YZUWH/51ChW7fhnxkC5WagYGoJpycV11a9vuSPv1rJRq1t04B R701Mvvpoa1Et1myAjPZ898cf4MDeCa1hXU/bfsfhMVdFQDyacGI9FH/Ykd5YTf1wvyp wvm8IcdkFh3nak+FhOwnSKpL2EoG+soFUcVx1gVACYM1QsXomBnrcbag2+xQ0ZJgge9E bxgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4+8V7Y46XOAS5DpdF3SLr1BaTYKu0peNkOrQhxAmHBA=; b=B4wE5RsCnpuDcCRCQaCRVhmNBe0SfR9LeP0ob6Now4oIz/YeMHOQ7079vbO/ZVtIPK y0+jdOnIHPGXncUl5b7gJiiPI54judLmAaXKcexe4sM1vMFZ0SaCNRjFlQsD1TEpGuOo jvPd/4fKfjXuHm98HlVC8rEnKT4I8tRs4LsvE4h3CEryC0fMqYti8qdX7mRJVIEkldRe qgL8BObghqJ9GAceb0MdVH70gsdGUS3uGJ7YGFrF+deGgcX2KlGDajjDV4QL1HsBdQ7z yhV6r6XUZLjrZfX8m5rkQHKeAdJ5BQ7I1k3grjIiuyQBUPELf+qL/1qGoT5TembYSWhI vHIw== X-Gm-Message-State: AOAM5328UTb8O8KRHdVZDbB4ftXC79T3+WlY8KzjNIlu6E157zFidlGV uf5wTBE5uSSW3P7bklHAIbw= X-Google-Smtp-Source: ABdhPJzUArXt2d8sETEGoZhoqDAH6fuwuCy493AG8oWIS/ZnzzxA3tZBsgP8BT2CIZG/njEBqIb1MQ== X-Received: by 2002:a05:651c:512:: with SMTP id o18mr4966034ljp.315.1604259259368; Sun, 01 Nov 2020 11:34:19 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id m12sm1766526ljc.88.2020.11.01.11.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 11:34:18 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , git@vger.kernel.org, Sergey Organov Subject: [PATCH 17/26] diff-merges: split 'ignore_merges' field Date: Sun, 1 Nov 2020 22:33:21 +0300 Message-Id: <20201101193330.24775-18-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201101193330.24775-1-sorganov@gmail.com> References: <20201101193330.24775-1-sorganov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 'ignore_meres' was 3-way field that served two distinct purposes that we now assign to 2 new independent flags: 'separate_merges', and 'explicit_diff_merges'. 'separate_merges' tells that we need to output diff format containing separate diff for every parent (as opposed to 'combine_merges'). 'explicit_diff_merges' tells that at least one of diff-merges options has been explicitly specified on the command line, so no defaults should apply. Signed-off-by: Sergey Organov --- diff-merges.c | 29 ++++++++++++----------------- log-tree.c | 15 ++++++++------- revision.h | 3 ++- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/diff-merges.c b/diff-merges.c index f2b9ed789ca8..19cdad1aa4a1 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -3,7 +3,7 @@ #include "revision.h" static void suppress(struct rev_info *revs) { - revs->ignore_merges = 1; + revs->separate_merges = 0; revs->first_parent_merges = 0; revs->combine_merges = 0; revs->dense_combined_merges = 0; @@ -20,7 +20,6 @@ static void set_dense_combined(struct rev_info *revs) { */ void diff_merges_init_revs(struct rev_info *revs) { - revs->ignore_merges = -1; } int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { @@ -35,7 +34,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { * family of commands, it means "show full diff for merges". Set * both fields appropriately. */ - revs->ignore_merges = 0; + revs->separate_merges = 1; revs->match_missing = 1; } else if (!strcmp(arg, "-c")) { revs->dense_combined_merges = 0; @@ -55,6 +54,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { } else return 0; + revs->explicit_diff_merges = 1; return 1; } @@ -63,20 +63,15 @@ void diff_merges_suppress(struct rev_info *revs) { } void diff_merges_default_to_first_parent(struct rev_info *revs) { - if (revs->ignore_merges < 0) /* No -m */ - revs->ignore_merges = 0; - if (!revs->combine_merges) /* No -c/--cc" */ + if (!revs->explicit_diff_merges) + revs->separate_merges = 1; + if (revs->separate_merges) revs->first_parent_merges = 1; } void diff_merges_default_to_dense_combined(struct rev_info *revs) { - if (revs->ignore_merges < 0) { /* No -m */ - revs->ignore_merges = 0; - if (!revs->combine_merges) { /* No -c/--cc" */ - revs->combine_merges = 1; - revs->dense_combined_merges = 1; - } - } + if (!revs->explicit_diff_merges) + set_dense_combined(revs); } void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) { @@ -86,10 +81,10 @@ void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) { void diff_merges_setup_revs(struct rev_info *revs) { - if (revs->combine_merges && revs->ignore_merges < 0) - revs->ignore_merges = 0; - if (revs->ignore_merges < 0) - revs->ignore_merges = 1; + if (revs->combine_merges == 0) + revs->dense_combined_merges = 0; + if (revs->separate_merges == 0) + revs->first_parent_merges = 0; if (revs->combined_all_paths && !revs->combine_merges) die("--combined-all-paths makes no sense without -c or --cc"); if (revs->combine_merges) diff --git a/log-tree.c b/log-tree.c index 3fdc0fc64bfb..f9385b1dae6f 100644 --- a/log-tree.c +++ b/log-tree.c @@ -918,14 +918,15 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log /* More than one parent? */ if (parents->next) { - if (opt->ignore_merges) - return 0; - else if (opt->combine_merges) + if (opt->combine_merges) return do_diff_combined(opt, commit); - else if (!opt->first_parent_merges) { - /* If we show multiple diffs, show the parent info */ - log->parent = parents->item; - } + if (opt->separate_merges) { + if (!opt->first_parent_merges) { + /* Show parent info for multiple diffs */ + log->parent = parents->item; + } + } else + return 0; } showed_log = 0; diff --git a/revision.h b/revision.h index ba2aef79215e..fcc532c873d1 100644 --- a/revision.h +++ b/revision.h @@ -191,12 +191,13 @@ struct rev_info { match_missing:1, no_commit_id:1, verbose_header:1, + explicit_diff_merges: 1, + separate_merges: 1, combine_merges:1, combined_all_paths:1, dense_combined_merges:1, first_parent_merges:1, always_show_header:1; - int ignore_merges:2; /* Format info */ int show_notes; -- 2.25.1