Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
037bf68269
2 changed files with 180 additions and 0 deletions
|
|
@ -0,0 +1,82 @@
|
|||
### Please describe the problem.
|
||||
|
||||
Git-annex commit 7550ef9a2 doesn't compile on Windows without a small patch.
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
|
||||
`stack setup && stack build`
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
[[!format sh """
|
||||
git-annex version: 8.20210804-g7550ef9a2
|
||||
build flags: Assistant Webapp Pairing TorrentParser Feeds Testsuite S3 WebDAV
|
||||
dependency versions: aws-0.22 bloomfilter-2.0.1.0 cryptonite-0.26 DAV-1.3.4 feed-1.3.0.1 ghc-8.8.4 http-client-0.6.4.1 persistent-sqlite-2.10.6.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.1.0
|
||||
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
|
||||
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
|
||||
operating system: mingw32 x86_64
|
||||
supported repository versions: 8
|
||||
upgrade supported from repository versions: 2 3 4 5 6 7
|
||||
"""]]
|
||||
|
||||
Windows version 21H1 (build 19043.1165), 64 bit.
|
||||
|
||||
### Please provide any additional information below.
|
||||
|
||||
Relevant parts of the build log:
|
||||
|
||||
[[!format sh """
|
||||
jkniiv@AINESIS MINGW64 /c/annx
|
||||
$ tail -n 25 /c/Projektit/git-annex.branchable.com/git-annex--BUILD-210813-7550ef9a2/stack.build.LOG~102
|
||||
[333 of 665] Compiling Annex.Content.LowLevel
|
||||
[334 of 665] Compiling Annex.Content.PointerFile
|
||||
[335 of 665] Compiling Annex.ChangedRefs
|
||||
[336 of 665] Compiling RemoteDaemon.Types
|
||||
[337 of 665] Compiling Assistant.Types.RemoteControl
|
||||
[338 of 665] Compiling RemoteDaemon.Transport.Ssh.Types
|
||||
[339 of 665] Compiling P2P.Protocol
|
||||
[340 of 665] Compiling P2P.IO
|
||||
[341 of 665] Compiling CmdLine.GitRemoteTorAnnex
|
||||
[342 of 665] Compiling Annex.CheckIgnore
|
||||
[343 of 665] Compiling Annex.CheckAttr
|
||||
[344 of 665] Compiling Backend
|
||||
[345 of 665] Compiling Annex.Verify
|
||||
|
||||
Annex\Verify.hs:151:50: error:
|
||||
Not in scope: type constructor or class `TMVar'
|
||||
|
|
||||
151 | tailVerify :: IncrementalVerifier -> FilePath -> TMVar () -> IO Bool
|
||||
|
||||
| ^^^^^
|
||||
|
||||
|
||||
-- While building package git-annex-8.20210803 (scroll up to its section to see the error) using:
|
||||
C:\Users\jkniiv\Projektit\git-annex.branchable.com\git-annex--BUILD-210813-7550ef9a2\.stack-work\dist\29cc6475\setup\setup --builddir=.stack-work\dist\29cc6475 build exe:git-annex --ghc-options " -fdiagnostics-color=always"
|
||||
Process exited with code: ExitFailure 1
|
||||
|
||||
# End of transcript.
|
||||
"""]]
|
||||
|
||||
The change I made was the following:
|
||||
|
||||
[[!format diff """
|
||||
diff --git a/Annex/Verify.hs b/Annex/Verify.hs
|
||||
index 39ef45981..f43e20db1 100644
|
||||
--- a/Annex/Verify.hs
|
||||
+++ b/Annex/Verify.hs
|
||||
@@ -36,6 +36,8 @@ import Types.Key
|
||||
import qualified System.INotify as INotify
|
||||
import Control.Concurrent.STM
|
||||
import qualified Data.ByteString as S
|
||||
+#else
|
||||
+import Control.Concurrent.STM
|
||||
#endif
|
||||
|
||||
data VerifyConfig = AlwaysVerify | NoVerify | RemoteVerify Remote | DefaultVerify
|
||||
"""]]
|
||||
|
||||
This then compiled cleanly and completed the test suite ok.
|
||||
|
||||
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||
|
||||
Git Annex is great. It works with multi-gigabyte backup files (largest around 180GB) via the BLAKE2B160E backend just dandy :)
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
### Please describe the problem.
|
||||
|
||||
Running the test QuickCheck.prop_view_roundtrips fails in a particular case (but only occasionally).
|
||||
|
||||
Running the following fails:
|
||||
|
||||
[[!format sh """
|
||||
jkniiv@AINESIS MINGW64 /c/annx
|
||||
$ ./git-annex.exe test -p 'QuickCheck.prop_view_roundtrips' --quickcheck-replay=258328 --quickcheck-verbose 2>&1 | tee git-annex.test--p-QuickCheck_prop_view_roundtrips.LOG~201
|
||||
[...]
|
||||
$ tail -n 50 git-annex.test--p-QuickCheck_prop_view_roundtrips.LOG~201
|
||||
|
||||
Passed:
|
||||
AssociatedFile Nothing
|
||||
MetaData (fromList [(MetaField "J",fromList []),(MetaField "kk",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\ACK",MetaValue (CurrentlySet False) "2ml",MetaValue (CurrentlySet False) "h",MetaValue (CurrentlySet False) "s\RS",MetaValue (CurrentlySet True) "u",MetaValue (CurrentlySet True) "yp"]),(MetaField "R",fromList [MetaValue (CurrentlySet True) "\NUL",MetaValue (CurrentlySet True) "\EOT",MetaValue (CurrentlySet False) "\r\DC1Fm",MetaValue (CurrentlySet False) "7\DC1~0#",MetaValue (CurrentlySet True) "b"]),(MetaField "Wq",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\USnZ\NAK\NAK"]),(MetaField "z",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "&C0GZ\DLE`",MetaValue (CurrentlySet False) "y",MetaValue (CurrentlySet False) "{\t\CAN\tHJ"])])
|
||||
False
|
||||
|
||||
Passed:
|
||||
AssociatedFile (Just "\DC3Q\ENQ\SUB#6}9F5\NAK4\ACKQ\ETB;W\vN\ENQ\STXn\EM\ENQFy5\SO(?}qA\v\NAK")
|
||||
MetaData (fromList [(MetaField "cK",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\b;D-&\DC3\SOLvs",MetaValue (CurrentlySet True) "-L`vI\EOT",MetaValue (CurrentlySet True) "Lf\NUL%^\ACKY",MetaValue (CurrentlySet True) "Q\ETB\SYN\US"])])
|
||||
True
|
||||
|
||||
Passed:
|
||||
AssociatedFile (Just "$GC7\nW]\DC16=z\STX]a1)L\NAK[\EOT71`Oi[DT`\SYNU\STXU>/%tEi:\SUBq\EM'Q\CANV\\\RS")
|
||||
MetaData (fromList [(MetaField "1",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\njX",MetaValue (CurrentlySet True) "\fpL",MetaValue (CurrentlySet False) "!\ESC@E#r9",MetaValue (CurrentlySet True) "6",MetaValue (CurrentlySet False) "C\tJK)",MetaValue (CurrentlySet True) "{"]),(MetaField "6NS",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) ";\SOs%",MetaValue (CurrentlySet False) "=",MetaValue (CurrentlySet True) "P",MetaValue (CurrentlySet False) "T !\STX\SOH",MetaValue (CurrentlySet False) "f&\NUL,\SUB",MetaValue (CurrentlySet False) "r\SUBi*&)"]),(MetaField "d",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "\RS",MetaValue (CurrentlySet True) "],x\CAN",MetaValue (CurrentlySet False) "c",MetaValue (CurrentlySet False) "n4I\SYN\n,"]),(MetaField "g",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\DC3F\r",MetaValue (CurrentlySet True) "= ",MetaValue (CurrentlySet False) "[",MetaValue (CurrentlySet True) "[Y.",MetaValue (CurrentlySet False) "]",MetaValue (CurrentlySet False) "nPHQ"]),(MetaField "Gb",fromList []),(MetaField "p9",fromList [MetaValue (CurrentlySet False) ""]),(MetaField "Q",fromList []),(MetaField "s9",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\US",MetaValue (CurrentlySet False) ","]),(MetaField "v",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "_q"]),(MetaField "x",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "4",MetaValue (CurrentlySet False) "4\r.\NAKrk",MetaValue (CurrentlySet False) "UNN",MetaValue (CurrentlySet True) "h"])])
|
||||
True
|
||||
|
||||
Passed:
|
||||
AssociatedFile Nothing
|
||||
MetaData (fromList [(MetaField "56",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet False) ")/",MetaValue (CurrentlySet False) ". 8@\SYNQU\DLEl",MetaValue (CurrentlySet True) "2",MetaValue (CurrentlySet False) "nF"]),(MetaField "G",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\r6\NAK{@\NAKn\GS",MetaValue (CurrentlySet False) "\US!> [Y.",MetaValue (CurrentlySet True) "*c\DC37lq\"C",MetaValue (CurrentlySet True) "0",MetaValue (CurrentlySet True) "[@w`kZu",MetaValue (CurrentlySet True) "bw+\ESC"]),(MetaField "HhUjK",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "\NUL=",MetaValue (CurrentlySet True) "\NAKie",MetaValue (CurrentlySet False) ".\DC3+^;\a!s\NAK",MetaValue (CurrentlySet True) "8",MetaValue (CurrentlySet False) "B",MetaValue (CurrentlySet False) "J",MetaValue (CurrentlySet True) "~"]),(MetaField "p7i",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "TO",MetaValue (CurrentlySet False) "gx",MetaValue (CurrentlySet False) "lQqb\SUB:)\ACKX"]),(MetaField "qXr",fromList []),(MetaField "T",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "TF;",MetaValue (CurrentlySet True) "\\DZ",MetaValue (CurrentlySet False) "aOY_6",MetaValue (CurrentlySet True) "{xm;r"]),(MetaField "vOF",fromList [MetaValue (CurrentlySet True) "\DLE",MetaValue (CurrentlySet True) "\DC2L\DC1",MetaValue (CurrentlySet True) "\"|",MetaValue (CurrentlySet False) "H\EOT!3"]),(MetaField "vQ",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "\DLEp",MetaValue (CurrentlySet False) "\CANw#\DEL_G*W0pZ8",MetaValue (CurrentlySet True) "D",MetaValue (CurrentlySet True) "Lx6O\SO=C\\("]),(MetaField "Y",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "\ETB2",MetaValue (CurrentlySet False) "P\v",MetaValue (CurrentlySet False) "d$\SYN"])])
|
||||
True
|
||||
|
||||
Passed:
|
||||
AssociatedFile (Just "\ESC")
|
||||
MetaData (fromList [(MetaField "9CY",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "7y\EOT",MetaValue (CurrentlySet True) "D$\f^\"\r{`",MetaValue (CurrentlySet False) "xpo\SOHq"]),(MetaField "aMO",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\ENQE\at",MetaValue (CurrentlySet True) "\DC4\"1",MetaValue (CurrentlySet True) "7J\n,Z&0j",MetaValue (CurrentlySet False) "T8|3",MetaValue (CurrentlySet False) "UZ",MetaValue (CurrentlySet False) "n\n",MetaValue (CurrentlySet False) "uZ:]K.z~\fa"]),(MetaField "H",fromList [MetaValue (CurrentlySet True) "hEu"]),(MetaField "LbT",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\ENQM7",MetaValue (CurrentlySet False) "\b0F`;",MetaValue (CurrentlySet False) "\CAN\USs",MetaValue (CurrentlySet True) "C",MetaValue (CurrentlySet False) "K",MetaValue (CurrentlySet True) "\\}(g_"]),(MetaField "v",fromList [MetaValue (CurrentlySet True) "ES"])])
|
||||
False
|
||||
|
||||
Passed:
|
||||
AssociatedFile Nothing
|
||||
MetaData (fromList [(MetaField "J",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet False) "b(4G",MetaValue (CurrentlySet False) "bf\"\STXCF\DEL",MetaValue (CurrentlySet True) "i\DC3VB^"]),(MetaField "O",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet False) "\STXAX\US5",MetaValue (CurrentlySet True) "\ESC",MetaValue (CurrentlySet False) "&\GS\DEL\SOH)i\ACK,",MetaValue (CurrentlySet False) "3I4\DLE",MetaValue (CurrentlySet True) "J",MetaValue (CurrentlySet True) "t",MetaValue (CurrentlySet False) "yD6t"]),(MetaField "p",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\EOTM1ZcA",MetaValue (CurrentlySet True) "\nK",MetaValue (CurrentlySet False) ")\GS",MetaValue (CurrentlySet True) ".P'\RSJZ&\DC1\ETB\rz",MetaValue (CurrentlySet False) "1;",MetaValue (CurrentlySet True) "f4Z\SOHr",MetaValue (CurrentlySet False) "gkl"]),(MetaField "XaF",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "@",MetaValue (CurrentlySet False) "H4o?2\\K\EM",MetaValue (CurrentlySet False) "IQ\DC3p"])])
|
||||
False
|
||||
|
||||
Failed:
|
||||
AssociatedFile (Just "A<#;\SUB\ETB]u v\FS?\bY\SUB9b%\DC4%Ws\\\aJ\FS4\rM\DC1\CAN6g;(TL\US5\\X:l!nFb\ENQ")
|
||||
MetaData (fromList [(MetaField "H",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "1=x",MetaValue (CurrentlySet True) ">\STX",MetaValue (CurrentlySet False) "H}9"]),(MetaField "HJ",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\f",MetaValue (CurrentlySet True) "\DC1\DC4Xw{aX",MetaValue (CurrentlySet False) "'\"{",MetaValue (CurrentlySet False) "'9\USKB*\r",MetaValue (CurrentlySet True) "I)\ar",MetaValue (CurrentlySet False) "l"]),(MetaField "m",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\GS#"]),(MetaField "ub",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\DC3{5q9",MetaValue (CurrentlySet False) ")",MetaValue (CurrentlySet False) "C\\!H",MetaValue (CurrentlySet False) "|"])])
|
||||
True
|
||||
|
||||
Passed:
|
||||
AssociatedFile (Just "A<#;\SUB\ETB]u v\FS?\bY\SUB9b%\DC4%Ws\\\aJ\FS4\rM\DC1\CAN6g;(TL\US5\\X:l!nFb\ENQ")
|
||||
MetaData (fromList [(MetaField "H",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "1=x",MetaValue (CurrentlySet True) ">\STX",MetaValue (CurrentlySet False) "H}9"]),(MetaField "HJ",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\f",MetaValue (CurrentlySet True) "\DC1\DC4Xw{aX",MetaValue (CurrentlySet False) "'\"{",MetaValue (CurrentlySet False) "'9\USKB*\r",MetaValue (CurrentlySet True) "I)\ar",MetaValue (CurrentlySet False) "l"]),(MetaField "m",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\GS#"]),(MetaField "ub",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\DC3{5q9",MetaValue (CurrentlySet False) ")",MetaValue (CurrentlySet False) "C\\!H",MetaValue (CurrentlySet False) "|"])])
|
||||
False
|
||||
|
||||
*** Failed! Falsified (after 385 tests):
|
||||
AssociatedFile (Just "A<#;\SUB\ETB]u v\FS?\bY\SUB9b%\DC4%Ws\\\aJ\FS4\rM\DC1\CAN6g;(TL\US5\\X:l!nFb\ENQ")
|
||||
MetaData (fromList [(MetaField "H",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet False) "1=x",MetaValue (CurrentlySet True) ">\STX",MetaValue (CurrentlySet False) "H}9"]),(MetaField "HJ",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\f",MetaValue (CurrentlySet True) "\DC1\DC4Xw{aX",MetaValue (CurrentlySet False) "'\"{",MetaValue (CurrentlySet False) "'9\USKB*\r",MetaValue (CurrentlySet True) "I)\ar",MetaValue (CurrentlySet False) "l"]),(MetaField "m",fromList [MetaValue (CurrentlySet False) "",MetaValue (CurrentlySet True) "\GS#"]),(MetaField "ub",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySet True) "\DC3{5q9",MetaValue (CurrentlySet False) ")",MetaValue (CurrentlySet False) "C\\!H",MetaValue (CurrentlySet False) "|"])])
|
||||
True
|
||||
Use --quickcheck-replay=258328 to reproduce.
|
||||
|
||||
1 out of 1 tests failed (0.76s)
|
||||
(Failures above could be due to a bug in git-annex, or an incompatibility
|
||||
with utilities, such as git, installed on this system.)
|
||||
|
||||
# End of transcript.
|
||||
"""]]
|
||||
|
||||
If you remove the option `--quickcheck-replay=258328`, the test usually passes.
|
||||
|
||||
By the way, if this bug report looks similar to the one I filed in commit 145c343b4 some 9 months back, indeed it is.
|
||||
I usually disregard these occasional test failures by simply running the tests again because that seems the
|
||||
path of least resistance. However, I just filed a simple compilation issue + patch today[^1], so I thought this would
|
||||
be a reasonable thing to do with the same effort involved.
|
||||
|
||||
[^1]: [[bugs/commit_7550ef9a2_doesn__39__t_compile_on_Windows--patch]]
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
[[!format sh """
|
||||
git-annex version: 8.20210804-g7550ef9a2
|
||||
build flags: Assistant Webapp Pairing TorrentParser Feeds Testsuite S3 WebDAV
|
||||
dependency versions: aws-0.22 bloomfilter-2.0.1.0 cryptonite-0.26 DAV-1.3.4 feed-1.3.0.1 ghc-8.8.4 http-client-0.6.4.1 persistent-sqlite-2.10.6.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.1.0
|
||||
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
|
||||
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
|
||||
operating system: mingw32 x86_64
|
||||
supported repository versions: 8
|
||||
upgrade supported from repository versions: 2 3 4 5 6 7
|
||||
"""]]
|
||||
|
||||
This is built with the additional patch mentioned in [[bugs/commit_7550ef9a2_doesn__39__t_compile_on_Windows--patch]].
|
||||
|
||||
Windows version 21H1 (build 19043.1165), 64 bit.
|
||||
|
||||
### Please provide any additional information below.
|
||||
|
||||
(The transcript is above. If you need more than the last 50 lines of the test log file, I'm happy to provide it.)
|
||||
|
||||
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||
|
||||
Git Annex is great. It works with multi-gigabyte backup files (largest around 180GB) via the BLAKE2B160E backend just dandy :)
|
||||
Loading…
Add table
Reference in a new issue