kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

repo-settings: split out declarations into a standalone header 

While we have "repo-settings.c", we do not have a corresponding
"repo-settings.h" file. Instead, this functionality is part of the
"repository.h" header, making it hard to discover.

Split the declarations out of "repository.h" and create a standalone
header file with them.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-09-12 13:30:04 +02:00 committed by Junio C Hamano
parent 673af418d0
commit a0d09c56ba
3 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repo-settings.c
View File

@ -1,5 +1,6 @@
#include "git-compat-util.h" #include "git-compat-util.h"
#include "config.h" #include "config.h"
#include "repo-settings.h"
#include "repository.h" #include "repository.h"
#include "midx.h" #include "midx.h"



56
repo-settings.h Normal file
View File

@ -0,0 +1,56 @@
#ifndef REPO_SETTINGS_H
#define REPO_SETTINGS_H

struct fsmonitor_settings;
struct repository;

enum untracked_cache_setting {
UNTRACKED_CACHE_KEEP,
UNTRACKED_CACHE_REMOVE,
UNTRACKED_CACHE_WRITE,
};

enum fetch_negotiation_setting {
FETCH_NEGOTIATION_CONSECUTIVE,
FETCH_NEGOTIATION_SKIPPING,
FETCH_NEGOTIATION_NOOP,
};

struct repo_settings {
int initialized;

int core_commit_graph;
int commit_graph_generation_version;
int commit_graph_changed_paths_version;
int gc_write_commit_graph;
int fetch_write_commit_graph;
int command_requires_full_index;
int sparse_index;
int pack_read_reverse_index;
int pack_use_bitmap_boundary_traversal;
int pack_use_multi_pack_reuse;

/*
* Does this repository have core.useReplaceRefs=true (on by
* default)? This provides a repository-scoped version of this
* config, though it could be disabled process-wide via some Git
* builtins or the --no-replace-objects option. See
* replace_refs_enabled() for more details.
*/
int read_replace_refs;

struct fsmonitor_settings *fsmonitor; /* lazily loaded */

int index_version;
int index_skip_hash;
enum untracked_cache_setting core_untracked_cache;

int pack_use_sparse;
enum fetch_negotiation_setting fetch_negotiation_algorithm;

int core_multi_pack_index;
};

void prepare_repo_settings(struct repository *r);

#endif /* REPO_SETTINGS_H */

51
repository.h
View File

@ -2,9 +2,9 @@
#define REPOSITORY_H #define REPOSITORY_H


#include "strmap.h" #include "strmap.h"
#include "repo-settings.h"


struct config_set; struct config_set;
struct fsmonitor_settings;
struct git_hash_algo; struct git_hash_algo;
struct index_state; struct index_state;
struct lock_file; struct lock_file;
@ -14,59 +14,12 @@ struct submodule_cache;
struct promisor_remote_config; struct promisor_remote_config;
struct remote_state; struct remote_state;


enum untracked_cache_setting {
UNTRACKED_CACHE_KEEP,
UNTRACKED_CACHE_REMOVE,
UNTRACKED_CACHE_WRITE,
};

enum fetch_negotiation_setting {
FETCH_NEGOTIATION_CONSECUTIVE,
FETCH_NEGOTIATION_SKIPPING,
FETCH_NEGOTIATION_NOOP,
};

enum ref_storage_format { enum ref_storage_format {
REF_STORAGE_FORMAT_UNKNOWN, REF_STORAGE_FORMAT_UNKNOWN,
REF_STORAGE_FORMAT_FILES, REF_STORAGE_FORMAT_FILES,
REF_STORAGE_FORMAT_REFTABLE, REF_STORAGE_FORMAT_REFTABLE,
}; };


struct repo_settings {
int initialized;

int core_commit_graph;
int commit_graph_generation_version;
int commit_graph_changed_paths_version;
int gc_write_commit_graph;
int fetch_write_commit_graph;
int command_requires_full_index;
int sparse_index;
int pack_read_reverse_index;
int pack_use_bitmap_boundary_traversal;
int pack_use_multi_pack_reuse;

/*
* Does this repository have core.useReplaceRefs=true (on by
* default)? This provides a repository-scoped version of this
* config, though it could be disabled process-wide via some Git
* builtins or the --no-replace-objects option. See
* replace_refs_enabled() for more details.
*/
int read_replace_refs;

struct fsmonitor_settings *fsmonitor; /* lazily loaded */

int index_version;
int index_skip_hash;
enum untracked_cache_setting core_untracked_cache;

int pack_use_sparse;
enum fetch_negotiation_setting fetch_negotiation_algorithm;

int core_multi_pack_index;
};

struct repo_path_cache { struct repo_path_cache {
char *squash_msg; char *squash_msg;
char *merge_msg; char *merge_msg;
@ -273,8 +226,6 @@ int repo_read_index_unmerged(struct repository *);
*/ */
void repo_update_index_if_able(struct repository *, struct lock_file *); 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, * Return 1 if upgrade repository format to target_version succeeded,
* 0 if no upgrade is necessary, and -1 when upgrade is not possible. * 0 if no upgrade is necessary, and -1 when upgrade is not possible.