Commit Graph

126566 Commits

Author SHA1 Message Date
Karsten Blees
87d9080bd7 fscache: load directories only once
If multiple threads access a directory that is not yet in the cache, the
directory will be loaded by each thread. Only one of the results is added
to the cache, all others are leaked. This wastes performance and memory.

On cache miss, add a future object to the cache to indicate that the
directory is currently being loaded. Subsequent threads register themselves
with the future object and wait. When the first thread has loaded the
directory, it replaces the future object with the result and notifies
waiting threads.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
c11fc11b69 mingw: add a cache below mingw's lstat and dirent implementations
Checking the work tree status is quite slow on Windows, due to slow
`lstat()` emulation (git calls `lstat()` once for each file in the
index). Windows operating system APIs seem to be much better at scanning
the status of entire directories than checking single files.

Add an `lstat()` implementation that uses a cache for lstat data. Cache
misses read the entire parent directory and add it to the cache.
Subsequent `lstat()` calls for the same directory are served directly
from the cache.

Also implement `opendir()`/`readdir()`/`closedir()` so that they create
and use directory listings in the cache.

The cache doesn't track file system changes and doesn't plug into any
modifying file APIs, so it has to be explicitly enabled for git functions
that don't modify the working copy.

Note: in an earlier version of this patch, the cache was always active and
tracked file system changes via ReadDirectoryChangesW. However, this was
much more complex and had negative impact on the performance of modifying
git commands such as 'git checkout'.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
701fe1626d add infrastructure for read-only file system level caches
Add a macro to mark code sections that only read from the file system,
along with a config option and documentation.

This facilitates implementation of relatively simple file system level
caches without the need to synchronize with the file system.

Enable read-only sections for 'git status' and preload_index.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
63ef4dde95 Win32: make the lstat implementation pluggable
Emulating the POSIX lstat API on Windows via GetFileAttributes[Ex] is quite
slow. Windows operating system APIs seem to be much better at scanning the
status of entire directories than checking single files. A caching
implementation may improve performance by bulk-reading entire directories
or reusing data obtained via opendir / readdir.

Make the lstat implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
aa086f1252 mingw: make the dirent implementation pluggable
Emulating the POSIX `dirent` API on Windows via
`FindFirstFile()`/`FindNextFile()` is pretty staightforward, however,
most of the information provided in the `WIN32_FIND_DATA` structure is
thrown away in the process. A more sophisticated implementation may
cache this data, e.g. for later reuse in calls to `lstat()`.

Make the `dirent` implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Define a base DIR structure with pointers to `readdir()`/`closedir()`
that match the `opendir()` implementation (similar to vtable pointers in
Object-Oriented Programming). Define `readdir()`/`closedir()` so that
they call the function pointers in the `DIR` structure. This allows to
choose the `opendir()` implementation on a call-by-call basis.

Make the fixed-size `dirent.d_name` buffer a flex array, as `d_name` may
be implementation specific (e.g. a caching implementation may allocate a
`struct dirent` with _just_ the size needed to hold the `d_name` in
question).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
630c90e14f Win32: dirent.c: Move opendir down
Move opendir down in preparation for the next patch.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-15 12:12:01 -05:00
Karsten Blees
9d0aa9f379 Win32: make FILETIME conversion functions public
We will use them in the upcoming "FSCache" patches (to accelerate
sequential lstat() calls).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:12:01 -05:00
Johannes Schindelin
6e8f99a0fe Merge branch 'ready-for-upstream'
This is the branch thicket of patches in Git for Windows that are
considered ready for upstream. To keep them in a ready-to-submit shape,
they are kept as close to the beginning of the branch thicket as
possible.
2021-11-15 12:12:01 -05:00
Jeff Hostetler
0ba1184c64 Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor 2021-11-15 12:12:00 -05:00
Johannes Schindelin
8298413160 Merge pull request #3456 from jeffhostetler/try-v4-fsmonitor-part5
FSMonitor: deepening a directory causes confusing events
2021-11-15 12:12:00 -05:00
Jeff Hostetler
6cb01b15d0 Merge branch 'try-v4-fsmonitor-part4' into try-v4-fsmonitor 2021-11-15 12:12:00 -05:00
Jeff Hostetler
037111150c Merge branch 'try-v4-fsmonitor-part3' into try-v4-fsmonitor 2021-11-15 12:12:00 -05:00
Jeff Hostetler
7608e9ecd0 Merge branch 'try-v4-fsmonitor-part2' into try-v4-fsmonitor 2021-11-15 12:12:00 -05:00
Johannes Schindelin
6c50a39669 Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
2021-11-15 12:12:00 -05:00
Johannes Schindelin
4df89beff9 Merge pull request #3398 from carenas/pthread-unistd
mingw: avoid fallback for {local,gm}time_r()
2021-11-15 12:12:00 -05:00
Johannes Schindelin
d93fc889d7 Merge pull request #3306 from PhilipOakley/vs-sln
Make Git for Windows start builds in modern Visual Studio
2021-11-15 12:12:00 -05:00
Johannes Schindelin
79fda9eac0 Merge pull request #3349 from vdye/feature/ci-subtree-tests
Add `contrib/subtree` test execution to CI builds
2021-11-15 12:12:00 -05:00
Johannes Schindelin
026e84a3aa Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
http: Add support for enabling automatic sending of SSL client certificate
2021-11-15 12:11:59 -05:00
Johannes Schindelin
aa129899d6 Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
Let the documentation reflect that there is no vs/master anymore
2021-11-15 12:11:59 -05:00
Johannes Schindelin
5410bb4cce Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
mingw: allow for longer paths in `parse_interpreter()`
2021-11-15 12:11:59 -05:00
Johannes Schindelin
9d7b70d360 Merge pull request #3150 from dscho/ci-cache-vcpkg-artifacts-g4w
ci: cache vcpkg artifacts
2021-11-15 12:11:59 -05:00
Johannes Schindelin
42c521990c Merge pull request #3327 from dennisameling/fix-host-cpu
cmake(): allow setting HOST_CPU for cross-compilation
2021-11-15 12:11:59 -05:00
Johannes Schindelin
185ac94c33 Merge pull request #2915 from dennisameling/windows-arm64-support
Windows arm64 support
2021-11-15 12:11:59 -05:00
Johannes Schindelin
a9ada8a718 Merge pull request #2351 from PhilipOakley/vcpkg-tip
Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs
2021-11-15 12:11:59 -05:00
Johannes Schindelin
618498be4b Merge pull request #2974 from derrickstolee/maintenance-and-headless
Include Windows-specific maintenance and headless-git
2021-11-15 12:11:59 -05:00
Johannes Schindelin
f21f43624c Merge 'git-gui/js/intent-to-add'
This merges the current version of the patch that tries to address Git
GUI's problems with intent-to-add files.

This patch will likely be improved substantially before it is merged
into Git GUI's main branch, but we want to have _something_ resembling a
fix already in Git for Windows v2.29.0.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:59 -05:00
Johannes Schindelin
cbde5379b8 Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
t/t0014: fix: eliminate additional lines from trace
2021-11-15 12:11:58 -05:00
Johannes Schindelin
ca34efde17 Merge pull request #2714 from lbonanomi/main
Rationalize line endings for scissors-cleanup
2021-11-15 12:11:58 -05:00
Johannes Schindelin
be20a822b4 Merge pull request #2730 from dscho/crlf-aware-git-add-i
git add -i: handle CR/LF line endings in the interactive input
2021-11-15 12:11:58 -05:00
Johannes Schindelin
b301a14743 Merge 'add-p-many-files'
This topic branch allows `add -p` and `add -i` with a large number of
files. It is kind of a hack that was never really meant to be
upstreamed. Let's see if we can do better in the built-in `add -p`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:58 -05:00
Johannes Schindelin
e0692a9c02 Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
ci: avoid d/f conflict in vs/master
2021-11-15 12:11:58 -05:00
Johannes Schindelin
b62a0adf31 Merge pull request #2535 from dscho/schannel-revoke-best-effort
Introduce and use the new "best effort" strategy for Secure Channel revoke checking
2021-11-15 12:11:58 -05:00
Johannes Schindelin
29eae05baa Merge pull request #2506 from dscho/issue-2283
Allow running Git directly from `C:\Program Files\Git\mingw64\bin\git.exe`
2021-11-15 12:11:58 -05:00
Johannes Schindelin
144e74581c Merge pull request #2504 from dscho/access-repo-via-junction
Handle `git add <file>` where <file> traverses an NTFS junction
2021-11-15 12:11:58 -05:00
Johannes Schindelin
a33c5a34f9 Merge pull request #2501 from jeffhostetler/clink-debug-curl
clink.pl: fix MSVC compile script to handle libcurl-d.lib
2021-11-15 12:11:58 -05:00
Johannes Schindelin
8ac6b3c626 Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2021-11-15 12:11:58 -05:00
Johannes Schindelin
c5667dda79 Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
Do resolve symlinks in `getcwd()`
2021-11-15 12:11:57 -05:00
Johannes Schindelin
2b315471b1 Merge pull request #2405 from dscho/mingw-setsockopt
Make sure `errno` is set when socket operations fail
2021-11-15 12:11:57 -05:00
Johannes Schindelin
04d4823fb2 Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
2021-11-15 12:11:57 -05:00
Johannes Schindelin
6e8859afad Merge branch 'msys2-python'
In MSYS2, we have two Python interpreters at our disposal, so we can
include the Python stuff in the build.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:57 -05:00
Johannes Schindelin
2b6eb0d80f Merge branch 'dont-clean-junctions'
This topic branch teaches `git clean` to respect NTFS junctions and Unix
bind mounts: it will now stop at those boundaries.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:57 -05:00
Johannes Schindelin
a4c97dbf31 Merge pull request #2170 from dscho/gitk-long-cmdline
Fix gitk (long cmdline)
2021-11-15 12:11:57 -05:00
Johannes Schindelin
05d3c4362c Merge branch 'fsync-object-files-always'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:57 -05:00
Johannes Schindelin
8e2300f716 Merge branch 'dont-spawn-gzip-in-archive'
This topic branch avoids spawning `gzip` when asking `git archive` to
create `.tar.gz` files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:57 -05:00
Johannes Schindelin
3264947ef9 Merge branch 'drive-prefix'
This topic branch allows us to specify absolute paths without the drive
prefix e.g. when cloning.

Example:

	C:\Users\me> git clone https://github.com/git/git \upstream-git

This will clone into a new directory C:\upstream-git, in line with how
Windows interprets absolute paths.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:57 -05:00
Johannes Schindelin
ed3a8314a3 Enable the built-in FSMonitor as an experimental feature
If `feature.experimental` and `feature.manyFiles` are set and the user
has not explicitly turned off the builtin FSMonitor, we now start
the built-in FSMonitor by default.

Only forcing it when UNSET matches the behavior of UPDATE_DEFAULT_BOOL()
used for other repo settings.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2021-11-15 12:11:56 -05:00
Jeff Hostetler
1501e94e0c t7527: FSMonitor tests for directory moves
Create unit tests to move a directory.  Verify that `git status`
gives the same result with and without FSMonitor enabled.

NEEDSWORK: This test exposes a bug in the untracked-cache on
Windows when FSMonitor is disabled.  These are commented out
for the moment.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2021-11-15 12:11:56 -05:00
Jeff Hostetler
264989943c fsmonitor: optimize processing of directory events
Teach Git to perform binary search over the cache-entries for a directory
notification and then linearly scan forward to find the immediate children.

Previously, when the FSMonitor reported a modified directory Git would
perform a linear search on the entire cache-entry array for all
entries matching that directory prefix and invalidate them.  Since the
cache-entry array is already sorted, we can use a binary search to
find the first matching entry and then only linearly walk forward and
invalidate entries until the prefix changes.

Also, the original code would invalidate anything having the same
directory prefix.  Since a directory event should only be received for
items that are immediately within the directory (and not within
sub-directories of it), only invalidate those entries and not the
whole subtree.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2021-11-15 12:11:56 -05:00
Jeff Hostetler
ca185fc05a t7527: test status with untracked-cache and fsmonitor--daemon
Create 2x2 test matrix with the untracked-cache and fsmonitor--daemon
features and a series of edits and verify that status output is
identical.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2021-11-15 12:11:56 -05:00
Johannes Schindelin
1e1935b7b8 Merge 'remote-hg-prerequisites' into HEAD
These fixes were necessary for Sverre Rabbelier's remote-hg to work,
but for some magic reason they are not necessary for the current
remote-hg. Makes you wonder how that one gets away with it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-15 12:11:56 -05:00