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 85BC61F66F for ; Sun, 1 Nov 2020 19:34:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727160AbgKATeO (ORCPT ); Sun, 1 Nov 2020 14:34:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727109AbgKATeM (ORCPT ); Sun, 1 Nov 2020 14:34:12 -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 598F7C0617A6 for ; Sun, 1 Nov 2020 11:34:10 -0800 (PST) Received: by mail-lj1-x244.google.com with SMTP id v19so7717614lji.5 for ; Sun, 01 Nov 2020 11:34:10 -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=Xkou6z8JgTQMAxcN6ZoKs5hW1hcfOLTXTU5A76qbu0U=; b=RsX2BgJN/h8HcT55QgtjOd2uCOQuGLnWaO4tbZexY6/mpSBtS0sMyW9V0+wF8hu8jS PxLqm4K2QFGOQPMvRobMeOuEP8OW+7IKyFuU+DIN5cMI1di0GwuxwzHFusO5jbXh3phb h6YAhdZPND0fUmCZDMcBIHBT9KwFLFmwuua+/YOsIZo1mxclLruzNejXYHmfeU7TVFW3 EEEpyEWIpivFNVRdUqqga7WtsHbwn6OXiXDbRdGTfJYAE+Dq5Cc6rWMBC+v2ZhKHzCLa AD1NVslKVyStrQ3EfCjCJ5bWctduBsAfT0O7dAU9oR6deC/rlIubPDChQz0vagDc8KlU 1cow== 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=Xkou6z8JgTQMAxcN6ZoKs5hW1hcfOLTXTU5A76qbu0U=; b=LlCItDDNy1cTH5Y1eanEB9c3gM2i4Ek1aJ25JQi0/qKf2LLFXkRCksCgSOw+sYkdGj XnKZgI8MtKf2A7Z4PtJaRMv5me9HWFYc8At7cn+THnzFNEVyGZFtD9s/euv+yidstKj+ zjlpISqIplDA3xeImWMUz3zQruUTPaRKFEu8sZarOyQ6nK+DX5jY8ppg6+83Eu1WXYjR UmdA/DCHPuYuUoTLHWOq4GV/xpuz2uNLDL65fmwMmXk4CT7hnDn7nPsEYO5LI7w1R00N FE/BmNK4RE2c4hdJX67WBP6wCfJhCLNtDDUckr/lg7svEutdVwm9+abm4HIn0EKml3+X c+xA== X-Gm-Message-State: AOAM530ngbGuIAeHFm6fDNBZ5mUaArQ9e4MXyCWvaEeUy2/PX6K7F2DI d11VkppmQ1io69yrtplGwt4= X-Google-Smtp-Source: ABdhPJyfDis/Vv8OA5CyCPWePQHRAoTVFpZ5urLWbTCfmRnoimfra43MzhEHatOK064sqB49TSmaNg== X-Received: by 2002:a05:651c:101:: with SMTP id a1mr4855691ljb.451.1604259248888; Sun, 01 Nov 2020 11:34:08 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id m12sm1766526ljc.88.2020.11.01.11.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 11:34:08 -0800 (PST) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , git@vger.kernel.org, Sergey Organov Subject: [PATCH 06/26] diff-merges: rename all functions to have common prefix Date: Sun, 1 Nov 2020 22:33:10 +0300 Message-Id: <20201101193330.24775-7-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 Use the same "diff_merges" prefix for all the diff merges function names. Signed-off-by: Sergey Organov --- builtin/log.c | 4 ++-- diff-merges.c | 10 +++++----- diff-merges.h | 15 ++++++++++----- revision.c | 6 +++--- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ad3092fdd854..77a7bba543ad 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -599,7 +599,7 @@ static int show_tree_object(const struct object_id *oid, static void show_setup_revisions_tweak(struct rev_info *rev, struct setup_revision_opt *opt) { - rev_diff_merges_default_to_dense_combined(rev); + diff_merges_default_to_dense_combined(rev); if (!rev->diffopt.output_format) rev->diffopt.output_format = DIFF_FORMAT_PATCH; } @@ -724,7 +724,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev, if (!rev->diffopt.output_format && rev->combine_merges) rev->diffopt.output_format = DIFF_FORMAT_PATCH; - rev_diff_merges_first_parent_defaults_to_enable(rev); + diff_merges_first_parent_defaults_to_enable(rev); } int cmd_log(int argc, const char **argv, const char *prefix) diff --git a/diff-merges.c b/diff-merges.c index 8b9dd4ad5625..85bf0b6d1d1d 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -2,11 +2,11 @@ #include "revision.h" -void init_diff_merge_revs(struct rev_info *revs) { +void diff_merges_init_revs(struct rev_info *revs) { revs->ignore_merges = -1; } -int parse_diff_merge_opts(struct rev_info *revs, const char **argv) { +int diff_merges_parse_opts(struct rev_info *revs, const char **argv) { int argcount; const char *optarg; const char *arg = argv[0]; @@ -44,7 +44,7 @@ int parse_diff_merge_opts(struct rev_info *revs, const char **argv) { return 1; } -void setup_diff_merges_revs(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; @@ -54,12 +54,12 @@ void setup_diff_merges_revs(struct rev_info *revs) die("--combined-all-paths makes no sense without -c or --cc"); } -void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs) { +void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs) { if (revs->first_parent_only && revs->ignore_merges < 0) revs->ignore_merges = 0; } -void rev_diff_merges_default_to_dense_combined(struct rev_info *revs) { +void diff_merges_default_to_dense_combined(struct rev_info *revs) { if (revs->ignore_merges < 0) { /* There was no "-m" variant on the command line */ revs->ignore_merges = 0; diff --git a/diff-merges.h b/diff-merges.h index e0cca3d935d3..648c410497cb 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -3,10 +3,15 @@ struct rev_info; -void init_diff_merge_revs(struct rev_info *revs); -int parse_diff_merge_opts(struct rev_info *revs, const char **argv); -void setup_diff_merges_revs(struct rev_info *revs); -void rev_diff_merges_default_to_dense_combined(struct rev_info *revs); -void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs); +void diff_merges_init_revs(struct rev_info *revs); + +int diff_merges_parse_opts(struct rev_info *revs, const char **argv); + +void diff_merges_setup_revs(struct rev_info *revs); + +void diff_merges_default_to_dense_combined(struct rev_info *revs); + +void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs); + #endif diff --git a/revision.c b/revision.c index 4bc14a08a624..5a0e3d6ad542 100644 --- a/revision.c +++ b/revision.c @@ -1814,7 +1814,7 @@ void repo_init_revisions(struct repository *r, revs->repo = r; revs->abbrev = DEFAULT_ABBREV; - init_diff_merge_revs(revs); + diff_merges_init_revs(revs); revs->simplify_history = 1; revs->pruning.repo = r; revs->pruning.flags.recursive = 1; @@ -2350,7 +2350,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->diff = 1; revs->diffopt.flags.recursive = 1; revs->diffopt.flags.tree_in_recursive = 1; - } else if ((argcount = parse_diff_merge_opts(revs, argv))) { + } else if ((argcount = diff_merges_parse_opts(revs, argv))) { return argcount; } else if (!strcmp(arg, "-v")) { revs->verbose_header = 1; @@ -2849,7 +2849,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s &revs->prune_data); } - setup_diff_merges_revs(revs); + diff_merges_setup_revs(revs); revs->diffopt.abbrev = revs->abbrev; -- 2.25.1