Skip to content

Commit 4059f12

Browse files
benpeartderrickstolee
authored andcommitted
Add virtual file system settings and hook proc
On index load, clear/set the skip worktree bits based on the virtual file system data. Use virtual file system data to update skip-worktree bit in unpack-trees. Use virtual file system data to exclude files and folders not explicitly requested. Signed-off-by: Ben Peart <[email protected]>
1 parent fb7e167 commit 4059f12

File tree

13 files changed

+794
-8
lines changed

13 files changed

+794
-8
lines changed

Documentation/config/core.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ core.fsmonitorHookVersion::
7979
something that can be used to determine what files have changed
8080
without race conditions.
8181

82+
core.virtualFilesystem::
83+
If set, the value of this variable is used as a command which
84+
will identify all files and directories that are present in
85+
the working directory. Git will only track and update files
86+
listed in the virtual file system. Using the virtual file system
87+
will supersede the sparse-checkout settings which will be ignored.
88+
See the "virtual file system" section of linkgit:githooks[5].
89+
8290
core.trustctime::
8391
If false, the ctime differences between the index and the
8492
working tree are ignored; useful when the inode change time

Documentation/githooks.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,26 @@ and "0" meaning they were not.
547547
Only one parameter should be set to "1" when the hook runs. The hook
548548
running passing "1", "1" should not be possible.
549549

550+
virtualFilesystem
551+
~~~~~~~~~~~~~~~~~~
552+
553+
"Virtual File System" allows populating the working directory sparsely.
554+
The projection data is typically automatically generated by an external
555+
process. Git will limit what files it checks for changes as well as which
556+
directories are checked for untracked files based on the path names given.
557+
Git will also only update those files listed in the projection.
558+
559+
The hook is invoked when the configuration option core.virtualFilesystem
560+
is set. It takes one argument, a version (currently 1).
561+
562+
The hook should output to stdout the list of all files in the working
563+
directory that git should track. The paths are relative to the root
564+
of the working directory and are separated by a single NUL. Full paths
565+
('dir1/a.txt') as well as directories are supported (ie 'dir1/').
566+
567+
The exit status determines whether git will use the data from the
568+
hook. On error, git will abort the command with an error message.
569+
550570
GIT
551571
---
552572
Part of the linkgit:git[1] suite

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,7 @@ LIB_OBJS += utf8.o
10291029
LIB_OBJS += varint.o
10301030
LIB_OBJS += version.o
10311031
LIB_OBJS += versioncmp.o
1032+
LIB_OBJS += virtualfilesystem.o
10321033
LIB_OBJS += walker.o
10331034
LIB_OBJS += wildmatch.o
10341035
LIB_OBJS += worktree.o

cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ extern char *git_replace_ref_base;
953953

954954
extern int fsync_object_files;
955955
extern int core_preload_index;
956+
extern const char *core_virtualfilesystem;
956957
extern int core_gvfs;
957958
extern int precomposed_unicode;
958959
extern int protect_hfs;

config.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,11 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
13661366
}
13671367

13681368
if (!strcmp(var, "core.sparsecheckout")) {
1369-
core_apply_sparse_checkout = git_config_bool(var, value);
1369+
/* virtual file system relies on the sparse checkout logic so force it on */
1370+
if (core_virtualfilesystem)
1371+
core_apply_sparse_checkout = 1;
1372+
else
1373+
core_apply_sparse_checkout = git_config_bool(var, value);
13701374
return 0;
13711375
}
13721376

@@ -2343,6 +2347,23 @@ int git_config_get_fsmonitor(void)
23432347
return 0;
23442348
}
23452349

2350+
int git_config_get_virtualfilesystem(void)
2351+
{
2352+
if (git_config_get_pathname("core.virtualfilesystem", &core_virtualfilesystem))
2353+
core_virtualfilesystem = getenv("GIT_VIRTUALFILESYSTEM_TEST");
2354+
2355+
if (core_virtualfilesystem && !*core_virtualfilesystem)
2356+
core_virtualfilesystem = NULL;
2357+
2358+
/* virtual file system relies on the sparse checkout logic so force it on */
2359+
if (core_virtualfilesystem) {
2360+
core_apply_sparse_checkout = 1;
2361+
return 1;
2362+
}
2363+
2364+
return 0;
2365+
}
2366+
23462367
int git_config_get_index_threads(int *dest)
23472368
{
23482369
int is_bool, val;

config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ int git_config_get_untracked_cache(void);
584584
int git_config_get_split_index(void);
585585
int git_config_get_max_percent_split_change(void);
586586
int git_config_get_fsmonitor(void);
587+
int git_config_get_virtualfilesystem(void);
587588

588589
/* This dies if the configured or default date is in the future */
589590
int git_config_get_expiry(const char *key, const char **output);

dir.c

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "ewah/ewok.h"
1919
#include "fsmonitor.h"
2020
#include "submodule-config.h"
21+
#include "virtualfilesystem.h"
2122

2223
/*
2324
* Tells read_directory_recursive how a file or directory should be treated.
@@ -1377,6 +1378,17 @@ enum pattern_match_result path_matches_pattern_list(
13771378
int result = NOT_MATCHED;
13781379
const char *slash_pos;
13791380

1381+
/*
1382+
* The virtual file system data is used to prevent git from traversing
1383+
* any part of the tree that is not in the virtual file system. Return
1384+
* 1 to exclude the entry if it is not found in the virtual file system,
1385+
* else fall through to the regular excludes logic as it may further exclude.
1386+
*/
1387+
if (*dtype == DT_UNKNOWN)
1388+
*dtype = resolve_dtype(DT_UNKNOWN, istate, pathname, pathlen);
1389+
if (is_excluded_from_virtualfilesystem(pathname, pathlen, *dtype) > 0)
1390+
return 1;
1391+
13801392
if (!pl->use_cone_patterns) {
13811393
pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
13821394
dtype, pl, istate);
@@ -1635,8 +1647,20 @@ struct path_pattern *last_matching_pattern(struct dir_struct *dir,
16351647
int is_excluded(struct dir_struct *dir, struct index_state *istate,
16361648
const char *pathname, int *dtype_p)
16371649
{
1638-
struct path_pattern *pattern =
1639-
last_matching_pattern(dir, istate, pathname, dtype_p);
1650+
struct path_pattern *pattern;
1651+
1652+
/*
1653+
* The virtual file system data is used to prevent git from traversing
1654+
* any part of the tree that is not in the virtual file system. Return
1655+
* 1 to exclude the entry if it is not found in the virtual file system,
1656+
* else fall through to the regular excludes logic as it may further exclude.
1657+
*/
1658+
if (*dtype_p == DT_UNKNOWN)
1659+
*dtype_p = resolve_dtype(DT_UNKNOWN, istate, pathname, strlen(pathname));
1660+
if (is_excluded_from_virtualfilesystem(pathname, strlen(pathname), *dtype_p) > 0)
1661+
return 1;
1662+
1663+
pattern = last_matching_pattern(dir, istate, pathname, dtype_p);
16401664
if (pattern)
16411665
return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1;
16421666
return 0;
@@ -1995,6 +2019,9 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
19952019
if (dtype != DT_DIR && has_path_in_index)
19962020
return path_none;
19972021

2022+
if (is_excluded_from_virtualfilesystem(path->buf, path->len, dtype) > 0)
2023+
return path_excluded;
2024+
19982025
/*
19992026
* When we are looking at a directory P in the working tree,
20002027
* there are three cases:
@@ -2254,6 +2281,8 @@ static void add_path_to_appropriate_result_list(struct dir_struct *dir,
22542281
/* add the path to the appropriate result list */
22552282
switch (state) {
22562283
case path_excluded:
2284+
if (is_excluded_from_virtualfilesystem(path->buf, path->len, DT_DIR) > 0)
2285+
break;
22572286
if (dir->flags & DIR_SHOW_IGNORED)
22582287
dir_add_name(dir, istate, path->buf, path->len);
22592288
else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||

environment.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ int grafts_replace_parents = 1;
6969
int core_apply_sparse_checkout;
7070
int core_sparse_checkout_cone;
7171
int core_gvfs;
72+
const char *core_virtualfilesystem;
7273
int merge_log_config = -1;
7374
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
7475
unsigned long pack_size_limit_cfg;

read-cache.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "fsmonitor.h"
2626
#include "thread-utils.h"
2727
#include "progress.h"
28+
#include "virtualfilesystem.h"
2829
#include "gvfs.h"
2930

3031
/* Mask for the name length in ce_flags in the on-disk index */
@@ -1920,6 +1921,7 @@ static void post_read_index_from(struct index_state *istate)
19201921
tweak_untracked_cache(istate);
19211922
tweak_split_index(istate);
19221923
tweak_fsmonitor(istate);
1924+
apply_virtualfilesystem(istate);
19231925
}
19241926

19251927
static size_t estimate_cache_size_from_compressed(unsigned int entries)

0 commit comments

Comments
 (0)