Commit graph

46227 commits

Author SHA1 Message Date
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
Joey Hess
4e999af7ac
fix windows build and clarify comment 2025-01-29 14:52:20 -04:00
Joey Hess
76bff3e8d1
Merge branch 'master' into ospath 2025-01-29 14:29:34 -04:00
Joey Hess
2940cfcd18
fix fromOsPath on windows
Same reasons as 9c9baf7c65
2025-01-29 14:19:25 -04:00
Joey Hess
9c9baf7c65
fix toOsPath on windows
After recent changes to use OsPath, test suite fails on windows with:

Exception: Uneven number of bytes: 5. This is not a Word16 bytestream.

Hopefully this fixes it. The innefficiency of the conversion is
unfortunate.
2025-01-29 14:06:54 -04:00
Joey Hess
381019ee3f
response 2025-01-29 12:06:22 -04:00
Joey Hess
27305042f3
more OsPath conversion
Sponsored-by: Nicholas Golder-Manning
2025-01-29 11:53:20 -04:00
dmcardle
ec5f30f746 Added a comment 2025-01-29 14:44:38 +00:00
matrss
1e0a48fad0 Added a comment 2025-01-29 10:13:59 +00:00
matrss
acdefd77a6 Added a comment 2025-01-29 09:56:13 +00:00
Atemu
2f278fd4b3 Added a comment 2025-01-28 21:57:42 +00:00
jnkl
58e897b966 2025-01-28 21:32:18 +00:00
jnkl
75a6a00307 Added a comment 2025-01-28 21:20:17 +00:00
Joey Hess
0376bc5ee0
more OsPath conversion
Sponsored-by: Luke T. Shumaker
2025-01-28 16:31:19 -04:00
Joey Hess
e915b6c169
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-28 16:00:09 -04:00
Joey Hess
7da6f83582
Merge branch 'master' into ospath 2025-01-28 16:00:03 -04:00
Joey Hess
2b12f9f4b7
windows build fix
and a little more bonus RawFilePath conversion
2025-01-28 15:59:45 -04:00
Joey Hess
22c2451e26
more OsPath conversion
Sponsored-by: mycroft
2025-01-28 15:46:00 -04:00
Joey Hess
917c43f31f
Merge /home/joey/tmp/git-annex into ospath 2025-01-28 15:29:58 -04:00
Joey Hess
87cda29dd7 remove Read instance for AssociatedFile
This instance is not used.
2025-01-28 15:29:25 -04:00
cwg
0512905316 correct typo 2025-01-28 19:29:21 +00:00
cwg
9965b98fc8 2025-01-28 19:18:02 +00:00
andrew
4a980d11ce 2025-01-28 18:07:59 +00:00
65.254.22.34
1e5c354720 poll vote (My phone (or MP3 player)) 2025-01-28 17:09:37 +00:00
65.254.22.34
56c88653a7 poll vote (My phone (or MP3 player)) 2025-01-28 17:09:30 +00:00
Joey Hess
da9ca7475e
comment 2025-01-28 11:57:03 -04:00
Joey Hess
67034a02ea
update 2025-01-28 11:38:04 -04:00
Joey Hess
4f0e64b6de
update 2025-01-28 11:36:02 -04:00
Joey Hess
24d5dbe30b
comment 2025-01-28 11:12:02 -04:00
Joey Hess
6fb1dd6afa
comment 2025-01-28 10:28:35 -04:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
dd28f97aac Added a comment: Simple config amendment for Apache served repositories 2025-01-28 08:34:40 +00:00
Joey Hess
7ebef6cd1b
more OsPath conversion
keyFile has a nice improvement; since a Key is a ShortByteString, it can
be converted to an OsPath without needing the copy that was done before.

Unfortunately, fileKey has to convert from a ShortByteString to a
ByteString in order to use attoparsec, and then the results get
converted back to an OsPath, so there are now 2 copies.
Maybe attoparsec will eventually get a ShortByteString API,
see https://github.com/haskell/attoparsec/issues/225

Sponsored-by: Joshua Antonishen
2025-01-27 16:55:07 -04:00
Joey Hess
98a0a9ddff
optimise literalOsPath
Taking a ShortByteString and using OverloadedStrings should avoid it
being converted from a String.

The reason there is no IsString instance for OsPath is presumably the
bad behavior of IsString for ByteString on unicode btw. But
literalOsPath won't be used with unicode in git-annex.

Sponsored-by: unqueued
2025-01-27 16:36:29 -04:00
Joey Hess
0529f9a84a
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-27 12:23:13 -04:00
Joey Hess
754c0a001b
comment 2025-01-27 12:19:16 -04:00
matrss
7adf1f45fa Added a comment 2025-01-27 15:26:15 +00:00
matrss
cb258ca480 Added a comment 2025-01-27 15:14:44 +00:00
matrss
6b5206db85 Added a comment 2025-01-27 15:08:57 +00:00
Joey Hess
02c792b724
thoughts 2025-01-27 10:37:35 -04:00
Joey Hess
71206a8603
update comment 2025-01-27 10:25:55 -04:00
Joey Hess
8bafe05500
more OsPath conversion 2025-01-27 10:13:43 -04:00
Joey Hess
de33ad5ce1
Merge branch 'master' of ssh://git-annex.branchable.com 2025-01-27 09:35:44 -04:00