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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.2 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,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D32FE1F453 for ; Wed, 1 May 2019 13:11:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726473AbfEANLU (ORCPT ); Wed, 1 May 2019 09:11:20 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:39933 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726423AbfEANLS (ORCPT ); Wed, 1 May 2019 09:11:18 -0400 Received: by mail-ed1-f66.google.com with SMTP id e24so3758189edq.6 for ; Wed, 01 May 2019 06:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=o5ihOxM7HtDO1LAqn6SqgiqUqnM47+LCtyPyIIP1Vzk=; b=uBQkCTskpMAaB50oDQjSKczUxmlO2NmClkciNaS44SQVPd/4Y8lip7RpIGBcnwsWPC acg55MLoB3HsQPOmy0PYVz7YTtThSBalnP6FF9U8A5NFPRoIZBopm8sJtN3jgIwSOnl4 wh5d8Rmtmk54WUlJ0kdAvKHiEDktaPK4JO5CjbrkU2M+bmPkr3uEAeNALTrVGawWLL5l wTzTT6uQDHuaYDXcyv9jd3FDfVW8bYEq+V5A9/rPiu2Sdbc5ajlIAJP8o5H/llmnXB0f JnNpIMUZ/wOJTHV16QKYwLUpxUM89Z2NyGMzYkr0+xUyK3B0H/H6xdEKKNMlnq0BXMZp fzAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=o5ihOxM7HtDO1LAqn6SqgiqUqnM47+LCtyPyIIP1Vzk=; b=HK8VzGJmM9Oh44soTQoTrk4ur7/sWFZad3n6lnIrGpoIjL02C8kqvI/JnBn7D/fPzZ Am766qdnKFY/19waaB1mB8cOHmUU969NGETWeS/wLUvMVqATgIeQZsDxFeknmPY6h7Ns SFjh6E6EBikhhC484Kx2hm6hTzL8ZFwdgaDkZySddmLteLJM8kvPSSBR6k/VSv1VXqBg Q/79AVMZBvMYrY6yFCm+s5VgdR1wiC4FAOp5yklf9cZs5DnOc1nSyEG0fCKqQDDriUJM izeOFXiMLLHfiemB46qIpmmR6RIIbmBLl+POJsFxX0zgt3EXQQqb2GSxpoDoFw79r4xA 7wrQ== X-Gm-Message-State: APjAAAW5DBhXzflTdNOqo3u/ok9T/yFq53ISAZCPPA+Rfo7EK0lquMWo NLUUBab2ZHULrjzhRGt24+wzChOY X-Google-Smtp-Source: APXvYqxscP+f0OaYzZCxy2BJ6ECmRfDAWXAqYRkaOHfniOQWgfa2QOEq/jVdw45p8SCf57xAOjkepA== X-Received: by 2002:a17:906:1249:: with SMTP id u9mr32706389eja.58.1556716276152; Wed, 01 May 2019 06:11:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z47sm1164080edd.58.2019.05.01.06.11.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 May 2019 06:11:15 -0700 (PDT) Date: Wed, 01 May 2019 06:11:15 -0700 (PDT) X-Google-Original-Date: Wed, 01 May 2019 13:11:08 GMT Message-Id: <924b22f990afa750b5e1aa61f4495efc65540107.1556716272.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Subject: [PATCH v3 2/6] commit-graph: collapse parameters into flags Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: sandals@crustytoothpaste.net, avarab@gmail.com, Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The write_commit_graph() and write_commit_graph_reachable() methods currently take two boolean parameters: 'append' and 'report_progress'. We will soon expand the possible options to send to these methods, so instead of complicating the parameter list, first simplify it. Collapse these parameters into a 'flags' parameter, and adjust the callers to provide flags as necessary. Signed-off-by: Derrick Stolee --- builtin/commit-graph.c | 8 +++++--- builtin/commit.c | 2 +- builtin/gc.c | 4 ++-- commit-graph.c | 9 +++++---- commit-graph.h | 8 +++++--- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 2e86251f02..828b1a713f 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -142,6 +142,7 @@ static int graph_write(int argc, const char **argv) struct string_list *commit_hex = NULL; struct string_list lines; int result; + int flags = COMMIT_GRAPH_PROGRESS; static struct option builtin_commit_graph_write_options[] = { OPT_STRING(0, "object-dir", &opts.obj_dir, @@ -166,11 +167,13 @@ static int graph_write(int argc, const char **argv) die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs")); if (!opts.obj_dir) opts.obj_dir = get_object_directory(); + if (opts.append) + flags |= COMMIT_GRAPH_APPEND; read_replace_refs = 0; if (opts.reachable) - return write_commit_graph_reachable(opts.obj_dir, opts.append, 1); + return write_commit_graph_reachable(opts.obj_dir, flags); string_list_init(&lines, 0); if (opts.stdin_packs || opts.stdin_commits) { @@ -190,8 +193,7 @@ static int graph_write(int argc, const char **argv) result = write_commit_graph(opts.obj_dir, pack_indexes, commit_hex, - opts.append, - 1); + flags); UNLEAK(lines); return result; diff --git a/builtin/commit.c b/builtin/commit.c index b9ea7222fa..b001ef565d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1670,7 +1670,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) "not exceeded, and then \"git reset HEAD\" to recover.")); if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - write_commit_graph_reachable(get_object_directory(), 0, 0)) + write_commit_graph_reachable(get_object_directory(), 0)) return 1; repo_rerere(the_repository, 0); diff --git a/builtin/gc.c b/builtin/gc.c index 3984addf73..df2573f124 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -665,8 +665,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix) } if (gc_write_commit_graph && - write_commit_graph_reachable(get_object_directory(), 0, - !quiet && !daemonized)) + write_commit_graph_reachable(get_object_directory(), + !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0)) return 1; if (auto_gc && too_many_loose_objects()) diff --git a/commit-graph.c b/commit-graph.c index ee487a364b..8bbd50658c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -851,15 +851,14 @@ static int add_ref_to_list(const char *refname, return 0; } -int write_commit_graph_reachable(const char *obj_dir, int append, - int report_progress) +int write_commit_graph_reachable(const char *obj_dir, unsigned int flags) { struct string_list list = STRING_LIST_INIT_DUP; int result; for_each_ref(add_ref_to_list, &list); result = write_commit_graph(obj_dir, NULL, &list, - append, report_progress); + flags); string_list_clear(&list, 0); return result; @@ -868,7 +867,7 @@ int write_commit_graph_reachable(const char *obj_dir, int append, int write_commit_graph(const char *obj_dir, struct string_list *pack_indexes, struct string_list *commit_hex, - int append, int report_progress) + unsigned int flags) { struct packed_oid_list oids; struct packed_commit_list commits; @@ -887,6 +886,8 @@ int write_commit_graph(const char *obj_dir, struct strbuf progress_title = STRBUF_INIT; unsigned long approx_nr_objects; int res = 0; + int append = flags & COMMIT_GRAPH_APPEND; + int report_progress = flags & COMMIT_GRAPH_PROGRESS; if (!commit_graph_compatible(the_repository)) return 0; diff --git a/commit-graph.h b/commit-graph.h index d15670bf46..70f4caf0c7 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -65,12 +65,14 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, */ int generation_numbers_enabled(struct repository *r); -int write_commit_graph_reachable(const char *obj_dir, int append, - int report_progress); +#define COMMIT_GRAPH_APPEND (1 << 0) +#define COMMIT_GRAPH_PROGRESS (1 << 1) + +int write_commit_graph_reachable(const char *obj_dir, unsigned int flags); int write_commit_graph(const char *obj_dir, struct string_list *pack_indexes, struct string_list *commit_hex, - int append, int report_progress); + unsigned int flags); int verify_commit_graph(struct repository *r, struct commit_graph *g); -- gitgitgadget