mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
3050b6dfc7
Simplify the setup code in repo-settings.c in various ways, making the code shorter, easier to read, and requiring fewer hacks to do the same thing as it did before: Since7211b9e753
(repo-settings: consolidate some config settings, 2019-08-13) we have memset() the whole "settings" structure to -1 in prepare_repo_settings(), and subsequently relied on the -1 value. Most of the fields did not need to be initialized to -1, and because we were doing that we had the enum labels "UNTRACKED_CACHE_UNSET" and "FETCH_NEGOTIATION_UNSET" purely to reflect the resulting state created this memset() in prepare_repo_settings(). No other code used or relied on them, more on that below. For the rest most of the subsequent "are we -1, then read xyz" can simply be removed by re-arranging what we read first. E.g. when setting the "index.version" setting we should have first read "feature.experimental", so that it (and "feature.manyfiles") can provide a default for our "index.version". Instead the code setting it, added when "feature.manyFiles"[1] was created, was using the UPDATE_DEFAULT_BOOL() macro added in an earlier commit[2]. That macro is now gone, since it was only needed for this pattern of reading things in the wrong order. This also fixes an (admittedly obscure) logic error where we'd conflate an explicit "-1" value in the config with our own earlier memset() -1. We can also remove the UPDATE_DEFAULT_BOOL() wrapper added in [3]. Using it is redundant to simply using the return value from repo_config_get_bool(), which is non-zero if the provided key exists in the config. Details on edge cases relating to the memset() to -1, continued from "more on that below" above: * UNTRACKED_CACHE_KEEP: In [4] the "unset" and "keep" handling for core.untrackedCache was consolidated. But it while we understand the "keep" value, we don't handle it differently than the case of any other unknown value. So let's retain UNTRACKED_CACHE_KEEP and remove the UNTRACKED_CACHE_UNSET setting (which was always implicitly UNTRACKED_CACHE_KEEP before). We don't need to inform any code after prepare_repo_settings() that the setting was "unset", as far as anyone else is concerned it's core.untrackedCache=keep. if "core.untrackedcache" isn't present in the config. * FETCH_NEGOTIATION_UNSET & FETCH_NEGOTIATION_NONE: Since these two two enum fields added in [5] don't rely on the memzero() setting them to "-1" anymore we don't have to provide them with explicit values. 1.c6cc4c5afd
(repo-settings: create feature.manyFiles setting, 2019-08-13) 2.31b1de6a09
(commit-graph: turn on commit-graph by default, 2019-08-13) 3.31b1de6a09
(commit-graph: turn on commit-graph by default, 2019-08-13) 4.ad0fb65999
(repo-settings: parse core.untrackedCache, 2019-08-13) 5.aaf633c2ad
(repo-settings: create feature.experimental setting, 2019-08-13) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
215 lines
5.7 KiB
C
215 lines
5.7 KiB
C
#ifndef REPOSITORY_H
|
|
#define REPOSITORY_H
|
|
|
|
#include "path.h"
|
|
|
|
struct config_set;
|
|
struct git_hash_algo;
|
|
struct index_state;
|
|
struct lock_file;
|
|
struct pathspec;
|
|
struct raw_object_store;
|
|
struct submodule_cache;
|
|
struct promisor_remote_config;
|
|
|
|
enum untracked_cache_setting {
|
|
UNTRACKED_CACHE_KEEP,
|
|
UNTRACKED_CACHE_REMOVE,
|
|
UNTRACKED_CACHE_WRITE,
|
|
};
|
|
|
|
enum fetch_negotiation_setting {
|
|
FETCH_NEGOTIATION_DEFAULT,
|
|
FETCH_NEGOTIATION_SKIPPING,
|
|
FETCH_NEGOTIATION_NOOP,
|
|
};
|
|
|
|
struct repo_settings {
|
|
int initialized;
|
|
|
|
int core_commit_graph;
|
|
int commit_graph_read_changed_paths;
|
|
int gc_write_commit_graph;
|
|
int fetch_write_commit_graph;
|
|
|
|
int index_version;
|
|
enum untracked_cache_setting core_untracked_cache;
|
|
|
|
int pack_use_sparse;
|
|
enum fetch_negotiation_setting fetch_negotiation_algorithm;
|
|
|
|
int core_multi_pack_index;
|
|
|
|
unsigned command_requires_full_index:1,
|
|
sparse_index:1;
|
|
};
|
|
|
|
struct repository {
|
|
/* Environment */
|
|
/*
|
|
* Path to the git directory.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *gitdir;
|
|
|
|
/*
|
|
* Path to the common git directory.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *commondir;
|
|
|
|
/*
|
|
* Holds any information related to accessing the raw object content.
|
|
*/
|
|
struct raw_object_store *objects;
|
|
|
|
/*
|
|
* All objects in this repository that have been parsed. This structure
|
|
* owns all objects it references, so users of "struct object *"
|
|
* generally do not need to free them; instead, when a repository is no
|
|
* longer used, call parsed_object_pool_clear() on this structure, which
|
|
* is called by the repositories repo_clear on its desconstruction.
|
|
*/
|
|
struct parsed_object_pool *parsed_objects;
|
|
|
|
/*
|
|
* The store in which the refs are held. This should generally only be
|
|
* accessed via get_main_ref_store(), as that will lazily initialize
|
|
* the ref object.
|
|
*/
|
|
struct ref_store *refs_private;
|
|
|
|
/*
|
|
* Contains path to often used file names.
|
|
*/
|
|
struct path_cache cached_paths;
|
|
|
|
/*
|
|
* Path to the repository's graft file.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *graft_file;
|
|
|
|
/*
|
|
* Path to the current worktree's index file.
|
|
* Cannot be NULL after initialization.
|
|
*/
|
|
char *index_file;
|
|
|
|
/*
|
|
* Path to the working directory.
|
|
* A NULL value indicates that there is no working directory.
|
|
*/
|
|
char *worktree;
|
|
|
|
/*
|
|
* Path from the root of the top-level superproject down to this
|
|
* repository. This is only non-NULL if the repository is initialized
|
|
* as a submodule of another repository.
|
|
*/
|
|
char *submodule_prefix;
|
|
|
|
struct repo_settings settings;
|
|
|
|
/* Subsystems */
|
|
/*
|
|
* Repository's config which contains key-value pairs from the usual
|
|
* set of config files (i.e. repo specific .git/config, user wide
|
|
* ~/.gitconfig, XDG config file and the global /etc/gitconfig)
|
|
*/
|
|
struct config_set *config;
|
|
|
|
/* Repository's submodule config as defined by '.gitmodules' */
|
|
struct submodule_cache *submodule_cache;
|
|
|
|
/*
|
|
* Repository's in-memory index.
|
|
* 'repo_read_index()' can be used to populate 'index'.
|
|
*/
|
|
struct index_state *index;
|
|
|
|
/* Repository's current hash algorithm, as serialized on disk. */
|
|
const struct git_hash_algo *hash_algo;
|
|
|
|
/* A unique-id for tracing purposes. */
|
|
int trace2_repo_id;
|
|
|
|
/* True if commit-graph has been disabled within this process. */
|
|
int commit_graph_disabled;
|
|
|
|
/* Configurations related to promisor remotes. */
|
|
char *repository_format_partial_clone;
|
|
struct promisor_remote_config *promisor_remote_config;
|
|
|
|
/* Configurations */
|
|
|
|
/* Indicate if a repository has a different 'commondir' from 'gitdir' */
|
|
unsigned different_commondir:1;
|
|
};
|
|
|
|
extern struct repository *the_repository;
|
|
|
|
/*
|
|
* Define a custom repository layout. Any field can be NULL, which
|
|
* will default back to the path according to the default layout.
|
|
*/
|
|
struct set_gitdir_args {
|
|
const char *commondir;
|
|
const char *object_dir;
|
|
const char *graft_file;
|
|
const char *index_file;
|
|
const char *alternate_db;
|
|
};
|
|
|
|
void repo_set_gitdir(struct repository *repo, const char *root,
|
|
const struct set_gitdir_args *extra_args);
|
|
void repo_set_worktree(struct repository *repo, const char *path);
|
|
void repo_set_hash_algo(struct repository *repo, int algo);
|
|
void initialize_the_repository(void);
|
|
int repo_init(struct repository *r, const char *gitdir, const char *worktree);
|
|
|
|
/*
|
|
* Initialize the repository 'subrepo' as the submodule given by the
|
|
* struct submodule 'sub' in parent repository 'superproject'.
|
|
* Return 0 upon success and a non-zero value upon failure, which may happen
|
|
* if the submodule is not found, or 'sub' is NULL.
|
|
*/
|
|
struct submodule;
|
|
int repo_submodule_init(struct repository *subrepo,
|
|
struct repository *superproject,
|
|
const struct submodule *sub);
|
|
void repo_clear(struct repository *repo);
|
|
|
|
/*
|
|
* Populates the repository's index from its index_file, an index struct will
|
|
* be allocated if needed.
|
|
*
|
|
* Return the number of index entries in the populated index or a value less
|
|
* than zero if an error occurred. If the repository's index has already been
|
|
* populated then the number of entries will simply be returned.
|
|
*/
|
|
int repo_read_index(struct repository *repo);
|
|
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.
|
|
* The lockfile is always committed or rolled back.
|
|
*/
|
|
void repo_update_index_if_able(struct repository *, struct lock_file *);
|
|
|
|
void prepare_repo_settings(struct repository *r);
|
|
|
|
/*
|
|
* Return 1 if upgrade repository format to target_version succeeded,
|
|
* 0 if no upgrade is necessary, and -1 when upgrade is not possible.
|
|
*/
|
|
int upgrade_repository_format(int target_version);
|
|
|
|
#endif /* REPOSITORY_H */
|