Commit graph

46718 commits

Author SHA1 Message Date
Joey Hess
474cf3bc8b
more OsPath conversion
Sponsored-by: Brock Spratlen
2025-02-01 11:54:19 -04:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
b9466ddce2 2025-01-31 00:22:45 +00:00
Joey Hess
0c0f4a20f4
move windows test suite workaround to relatedTemplate 2025-01-30 19:06:06 -04:00
Joey Hess
29e6b98f8c
Revert "add windows debug"
This reverts commit 76bfdf6a03.
2025-01-30 19:03:36 -04:00
Joey Hess
76bfdf6a03
add windows debug 2025-01-30 17:45:34 -04:00
Joey Hess
8678588e6a
Revert "try truncateFilePath on windows again"
This reverts commit 0d4abbcb92.

Test suite was failing again with that.
2025-01-30 17:43:38 -04:00
Joey Hess
0d4abbcb92
try truncateFilePath on windows again
after fix in commit 773115fd5f
maybe it will work now and not break test suite?
2025-01-30 17:07:08 -04:00
Joey Hess
773115fd5f
fix truncateFilePath edge case on windows
If the filepath starts with something that is not valid utf-8, it would
have returned "". And if the filepath was all non-valid utf-8, it would
also return "".
2025-01-30 16:53:10 -04:00
Joey Hess
b596e3b177
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-30 16:33:36 -04:00
Joey Hess
4bf2e2c696
try fixing windows test suite
Test suite is failing in windows in conflict resolution tests, where the
automatic conflict resolution adds in a .variant file. On windows, those
files are somehow missing. I don't understand why, and the test failures
only happen on appveyor and not in a local windows VM.

So, since replaceFile was recently changed to remove a windows specific
ifdef, put it back, to see if that is somehow causing these failures.
2025-01-30 16:31:49 -04:00
jnkl
0ef29fde15 Added a comment 2025-01-30 19:59:09 +00:00
Joey Hess
4d9d6a5bb5
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-30 15:52:31 -04:00
Joey Hess
c69e57aede
more OsPath conversion
Sponsored-by: Jack Hill
2025-01-30 15:46:32 -04:00
luciusf
9547f2ebd6 Added a comment 2025-01-30 19:17:58 +00:00
Joey Hess
a03c609268
Merge branch 'master' into ospath 2025-01-30 15:07:17 -04:00
Joey Hess
c3e6cbb432
update 2025-01-30 15:06:37 -04:00
Joey Hess
96c953a4b7
Merge branch 'master' into ospath 2025-01-30 15:06:05 -04:00
Joey Hess
c2a48f1fa0
Merge branch 'ospath-mk1' 2025-01-30 15:05:18 -04:00
Joey Hess
0da0bbae6b
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-30 15:03:47 -04:00
Joey Hess
4ceb00d0dc
update appveyor cache directory
With old:

Cache entry not found: C:\projects\git-annex\Users\appveyor\.stack

I think fixing this will result in caching preventing a full rebuild of
git-annex each time.
2025-01-30 15:02:59 -04:00
Joey Hess
9f5393016f
response 2025-01-30 14:57:51 -04:00
Joey Hess
c926de73b9
avoid build warning
An odd one, it complained about security_attributes being defined but
not used, but it was used..
2025-01-30 14:52:41 -04:00
jnkl
c681d3fef6 Added a comment 2025-01-30 18:52:14 +00:00
Joey Hess
3a08881214
avoid build warnings on windows 2025-01-30 14:50:45 -04:00
Joey Hess
64e96f12ad
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-30 14:39:05 -04:00
jnkl
9a5fbcc942 2025-01-30 18:35:55 +00:00
Joey Hess
84291b6014
bring back OsPath changes
I hope that the windows test suite failure on appveyor was fixed by
updating to a newer windows there. I have not been able to reproduce
that failure in a windows 11 VM run locally.
2025-01-30 14:34:21 -04:00
Joey Hess
c21526e3e2
Merge branch 'ospath-mk1' into ospath 2025-01-30 14:33:08 -04:00
Joey Hess
fb7a0ccb4c
Revert "disable OsPath build flag on windows for now"
This reverts commit 55cf9ce28f.

Problem was fixed by commit c1e90767da
2025-01-30 14:32:44 -04:00
Joey Hess
bd5d2b0782
fix FileIO openTempFile on Windows
When an UNC-style path is passed into openTempFile, the returned file
starts with that same style of path. Which can cause problems, eg piping
that filename to git failed. So, convert the output filename to be
relative to the input temp directory.
2025-01-30 14:32:14 -04:00
Joey Hess
c1e90767da
fix FileIO openTempFile on Windows
When an UNC-style path is passed into openTempFile, the returned file
starts with that same style of path. Which can cause problems, eg piping
that filename to git failed. So, convert the output filename to be
relative to the input temp directory.
2025-01-30 14:31:01 -04:00
Joey Hess
f0ab439c95
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-30 13:25:49 -04:00
Joey Hess
34d969fa08
switch appveyor windows build to newer version 2025-01-30 13:24:51 -04:00
matrss
eab8aec4f0 2025-01-30 14:50:58 +00:00
dmcardle
0d33983141 Added a comment 2025-01-30 13:56:30 +00:00
nobodyinperson
0afb8eab26 2025-01-30 12:59:00 +00:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
cfe960bf5e 2025-01-30 02:35:09 +00:00
Joey Hess
8ed173481a
close 2025-01-29 19:05:37 -04:00
Joey Hess
94e177db9d
document a SNAFU 2025-01-29 19:04:13 -04:00
Joey Hess
5738f5194d
throwing away a week's work
This was an attempt at continuing the RawFilePath transition into an
OsPath transition. Unforunately, it had multiple test suite failures on
windows. Debugging those seems that it would be more work than the
minor optimisation value of this.
2025-01-29 18:59:09 -04:00
Joey Hess
cbb6df35aa
merge in doc changes from master 2025-01-29 18:57:25 -04:00
Joey Hess
97c83152d6
Merge branch 'master' into ospath 2025-01-29 18:48:02 -04:00
Joey Hess
aaf4dd3b9c
fix liuxstandalone build 2025-01-29 18:12:00 -04:00
Joey Hess
55cf9ce28f
disable OsPath build flag on windows for now
Test suite failure looks like this:

        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        git-annex: fd:4: Data.ByteString.hGetLine: end of file
        git-annex: user error (git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","hash-object","-w","--no-filters","--stdin-paths"] exited 128)

This is apparently in Git.HashObject, and probably in hashBlob, which uses a
temp file with a name starting with "hash", but I have not been able to tell
what's wrong.

I don't understand where the "\\?" path prefix (windows UNC-style path)
is coming from in the path that gets fed into git hash-file, or why git
hash-file can't open the file.
2025-01-29 17:22:21 -04:00
Joey Hess
998de2e7ce
remove temp debugging code 2025-01-29 17:19:01 -04:00
Joey Hess
415455883c
debug test suite crash on windows 2025-01-29 16:37:54 -04:00
Joey Hess
a9f3a31a52
more OsPath conversion
Sponsored-by: Kevin Mueller
2025-01-29 16:24:51 -04:00
Joey Hess
c309edb8fb
Merge branch 'master' into ospath 2025-01-29 15:37:19 -04:00
Joey Hess
1b7293fb67
fix windows build 2025-01-29 15:36:41 -04:00
Joey Hess
4d7bdd0047
windows build fix 2025-01-29 14:59:00 -04:00