From patchwork Tue May 16 06:33:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13242618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 160D2C77B75 for ; Tue, 16 May 2023 06:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230024AbjEPGfF (ORCPT ); Tue, 16 May 2023 02:35:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbjEPGeq (ORCPT ); Tue, 16 May 2023 02:34:46 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BDF34215 for ; Mon, 15 May 2023 23:34:29 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3062db220a3so8875302f8f.0 for ; Mon, 15 May 2023 23:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684218867; x=1686810867; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=siTYCzcFqM4BrwbGK2xSh1viUfSy9pAhhIrOWJ60wqY=; b=N0w33q0EzbFuq7FybChJd5R7ZPouAt5aduUpH9FtdRf4xd611Z3K9mxVZ9MpF5NszH wnJEsRHI1f/RyPK4XqeWHtG8ktfXU92/I8unUoKjicmH1a7KaWfYkJXIkhYW61blYttv //2fHr0qWM3cQxpEWkDW6CqeSo3ydPxxHuB9rK9ZBKbl8EUUMsbenTzDhynp+Cd3+/WK HzCJkuDjQl1kPPOOq8vFJE3PikwXFwAZfEEP3Zq3qskpvJPA7Mi64SdN9wIccg1MPdID T9zYnxt6MD5wn0SIeoV2dCji4QnPOciveYRr64fc1FF/+zq7SmWbkBr3Q5xJsA7iHeHd 47yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684218867; x=1686810867; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=siTYCzcFqM4BrwbGK2xSh1viUfSy9pAhhIrOWJ60wqY=; b=lTMOBEm9dC5Ql2b8gNoQ0BmWXV84q6PfpOBuzC1jqDLMjwhHWdX8nHscSfDB1jOOLR pUoZ3q8NZtj6l7ANtk8/OnCY4t6mDSxy3AqQjnq2/yL/aBo8EGbfAziULyTYX8YuwMPQ rpd4skhJMMv+YNOGl4wGOwpZyO/1panQsblZ5HJW7N7+lzS5TTDWHz4MSIsCIuRmPqqX 9A9gQxacAjMma824vdpVsYc5mDhPrWJQNuOSoVxSOIG0gvExBsHmR6BvNNG/gOPXoljd qJ+hOpCphz52OGAhZjzLLAodfyT2iK4N+E+Fxrmiuk2vbTqmKGLRMbU2pxOmJRWfcS9K H3Iw== X-Gm-Message-State: AC+VfDwo4tfiP6i+Zb6MLgEhS9iLBoPuiEh4fA/WUXdLUqpnQQnGYhJx 2KmhY43XXNvKjFBOjq5OF3FJWgTHk44= X-Google-Smtp-Source: ACHHUZ6Akm7YeYhRSojKvl4IxJmRFhdQC0ctUEl4Aw1q8wZmAK2HQ1WpgB26agwf6QEgOLKtKV5itQ== X-Received: by 2002:adf:fc46:0:b0:2f4:9f46:6865 with SMTP id e6-20020adffc46000000b002f49f466865mr26518327wrs.30.1684218867383; Mon, 15 May 2023 23:34:27 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h18-20020adffd52000000b003063db8f45bsm1399948wrs.23.2023.05.15.23.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 23:34:27 -0700 (PDT) Message-Id: <19226c30cdffbfbf074d2182875a2308c3fb2d63.1684218851.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 16 May 2023 06:33:52 +0000 Subject: [PATCH v3 12/28] preload-index.h: move declarations for preload-index.c from elsewhere Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Calvin Wan , Jeff King , Glen Choo , Jonathan Tan , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren From: Elijah Newren We already have a preload-index.c file; move the declarations for the functions in that file into a new preload-index.h. These were previously split between cache.h and repository.h. Signed-off-by: Elijah Newren --- add-interactive.c | 1 + builtin/add.c | 1 + builtin/am.c | 1 + builtin/checkout.c | 1 + builtin/commit.c | 1 + builtin/diff-files.c | 1 + builtin/diff-index.c | 1 + builtin/diff.c | 1 + builtin/stash.c | 1 + builtin/submodule--helper.c | 1 + cache.h | 3 --- preload-index.c | 1 + preload-index.h | 15 +++++++++++++++ read-cache.c | 1 + repository.h | 3 --- 15 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 preload-index.h diff --git a/add-interactive.c b/add-interactive.c index de877ca0525..99f7dc3b0d1 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -5,6 +5,7 @@ #include "diffcore.h" #include "gettext.h" #include "hex.h" +#include "preload-index.h" #include "revision.h" #include "refs.h" #include "string-list.h" diff --git a/builtin/add.c b/builtin/add.c index 36ddbb159bf..8397be4f8de 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -17,6 +17,7 @@ #include "cache-tree.h" #include "run-command.h" #include "parse-options.h" +#include "preload-index.h" #include "diff.h" #include "diffcore.h" #include "revision.h" diff --git a/builtin/am.c b/builtin/am.c index 5c83f2e003f..0d8f46f8d5a 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -29,6 +29,7 @@ #include "unpack-trees.h" #include "branch.h" #include "object-name.h" +#include "preload-index.h" #include "sequencer.h" #include "revision.h" #include "merge-recursive.h" diff --git a/builtin/checkout.c b/builtin/checkout.c index d6765c9dbd9..2d72a742d9d 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -20,6 +20,7 @@ #include "object-name.h" #include "object-store.h" #include "parse-options.h" +#include "preload-index.h" #include "refs.h" #include "remote.h" #include "resolve-undo.h" diff --git a/builtin/commit.c b/builtin/commit.c index 02e2ef3e307..fa769045c88 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -30,6 +30,7 @@ #include "utf8.h" #include "object-name.h" #include "parse-options.h" +#include "preload-index.h" #include "string-list.h" #include "rerere.h" #include "unpack-trees.h" diff --git a/builtin/diff-files.c b/builtin/diff-files.c index dc991f753bb..2e6b59a8bb3 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -8,6 +8,7 @@ #include "diff.h" #include "diff-merges.h" #include "commit.h" +#include "preload-index.h" #include "revision.h" #include "builtin.h" #include "submodule.h" diff --git a/builtin/diff-index.c b/builtin/diff-index.c index b9a19bb7d38..9b98db2e77e 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -3,6 +3,7 @@ #include "diff.h" #include "diff-merges.h" #include "commit.h" +#include "preload-index.h" #include "revision.h" #include "builtin.h" #include "setup.h" diff --git a/builtin/diff.c b/builtin/diff.c index 7b64659fe79..967550739a6 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -16,6 +16,7 @@ #include "diff.h" #include "diff-merges.h" #include "diffcore.h" +#include "preload-index.h" #include "revision.h" #include "log-tree.h" #include "builtin.h" diff --git a/builtin/stash.c b/builtin/stash.c index 8856ac6d5c7..06527ee8471 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -17,6 +17,7 @@ #include "run-command.h" #include "dir.h" #include "entry.h" +#include "preload-index.h" #include "rerere.h" #include "revision.h" #include "setup.h" diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c58cfbfd6d3..597e780a93a 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -11,6 +11,7 @@ #include "parse-options.h" #include "quote.h" #include "pathspec.h" +#include "preload-index.h" #include "dir.h" #include "setup.h" #include "sparse-index.h" diff --git a/cache.h b/cache.h index 79daaa166b1..b79802a4639 100644 --- a/cache.h +++ b/cache.h @@ -318,9 +318,6 @@ extern struct index_state the_index; /* Initialize and use the cache information */ struct lock_file; -void preload_index(struct index_state *index, - const struct pathspec *pathspec, - unsigned int refresh_flags); int do_read_index(struct index_state *istate, const char *path, int must_exist); /* for testting only! */ int read_index_from(struct index_state *, const char *path, diff --git a/preload-index.c b/preload-index.c index 7a26b08c213..c26739debf8 100644 --- a/preload-index.c +++ b/preload-index.c @@ -8,6 +8,7 @@ #include "fsmonitor.h" #include "gettext.h" #include "config.h" +#include "preload-index.h" #include "progress.h" #include "thread-utils.h" #include "repository.h" diff --git a/preload-index.h b/preload-index.h new file mode 100644 index 00000000000..251b1ed88e9 --- /dev/null +++ b/preload-index.h @@ -0,0 +1,15 @@ +#ifndef PRELOAD_INDEX_H +#define PRELOAD_INDEX_H + +struct index_state; +struct pathspec; +struct repository; + +void preload_index(struct index_state *index, + const struct pathspec *pathspec, + unsigned int refresh_flags); +int repo_read_index_preload(struct repository *, + const struct pathspec *pathspec, + unsigned refresh_flags); + +#endif /* PRELOAD_INDEX_H */ diff --git a/read-cache.c b/read-cache.c index e1016ae0317..3fad839fb6f 100644 --- a/read-cache.c +++ b/read-cache.c @@ -27,6 +27,7 @@ #include "mem-pool.h" #include "name-hash.h" #include "object-name.h" +#include "preload-index.h" #include "resolve-undo.h" #include "revision.h" #include "run-command.h" diff --git a/repository.h b/repository.h index 1a13ff28677..f81228bcfb5 100644 --- a/repository.h +++ b/repository.h @@ -220,9 +220,6 @@ int repo_hold_locked_index(struct repository *repo, struct lock_file *lf, int flags); -int repo_read_index_preload(struct repository *, - const struct pathspec *pathspec, - unsigned refresh_flags); int repo_read_index_unmerged(struct repository *); /* * Opportunistically update the index but do not complain if we can't.