mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into git-lfs

Browse source
This commit is contained in:
Joey Hess 2019-08-05 11:48:45 -04:00
commit c527ae5887
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
21 changed files with 845 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Annex/WorkTree.hs
View file

@ -19,7 +19,6 @@ import Utility.InodeCache
import Config
import Git.FilePath
import qualified Git.Ref
import qualified Git.Branch
import qualified Git.LsTree
import qualified Git.Types
import Database.Types

30
CHANGELOG
View file

@ -1,17 +1,21 @@
git-annex (7.20190709) UNRELEASED; urgency=medium
git-annex (7.20190731) UNRELEASED; urgency=medium
* Use the same optimisation for --in=here as has always been
used for --in=. rather than the slow code path that unncessarily
queries the git-annex branch.
-- Joey Hess <id@joeyh.name> Thu, 01 Aug 2019 00:11:56 -0400
git-annex (7.20190730) upstream; urgency=medium
* Drop support for building with ghc older than 8.4.4,
and with older versions of serveral haskell libraries.
* stack.yaml: Build with http-client-0.5.14 to get a bug fix to http header
parsing.
* Add BLAKE2BP512 and BLAKE2BP512E backends, using a blake2 variant
optimised for 4-way CPUs.
* Support running v7 upgrade in a repo where there is no branch checked
out, but HEAD is set directly to some other ref.
* Improved probing when CoW copies can be made between files on the same
drive. Now supports CoW between BTRFS subvolumes. And, falls back to rsync
instead of using cp when CoW won't work, eg copies between repos on the
same EXT4 filesystem.
* Add BLAKE2BP512 and BLAKE2BP512E backends, using a blake2 variant
optimised for 4-way CPUs.
* Support running v7 upgrade in a repo where there is no branch checked
out, but HEAD is set directly to some other ref.
* Windows build no longer ships with a copy of rsync, since that is only
used any more to access rsync special remotes or remotes with a very
old version of git-annex-shell.
@ -20,9 +24,15 @@ git-annex (7.20190709) UNRELEASED; urgency=medium
* Windows problems with long filenames should be fixed now,
since the Windows build is made with a newer ghc version that works
around the problems.
* stack.yaml: Build with http-client-0.5.14 to get a bug fix to http header
parsing.
* Drop support for building with ghc older than 8.4.4,
and with older versions of serveral haskell libraries.
* Support building with socks-0.6 and persistant-template-2.7.
* Corrected some license statements.
Thanks, Sean Whitton.
-- Joey Hess <id@joeyh.name> Mon, 08 Jul 2019 08:59:54 -0400
-- Joey Hess <id@joeyh.name> Tue, 30 Jul 2019 12:22:25 -0400
git-annex (7.20190708) upstream; urgency=medium

1
Database/ContentIdentifier.hs
View file

@ -9,6 +9,7 @@
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts, EmptyDataDecls #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE UndecidableInstances #-}
module Database.ContentIdentifier (
ContentIdentifierHandle,

1
Database/Export.hs
View file

@ -9,6 +9,7 @@
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE UndecidableInstances #-}
module Database.Export (
ExportHandle,

1
Database/Fsck.hs
View file

@ -9,6 +9,7 @@
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE UndecidableInstances #-}
module Database.Fsck (
FsckHandle,

1
Database/Keys/SQL.hs
View file

@ -9,6 +9,7 @@
{-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-}
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
{-# LANGUAGE UndecidableInstances #-}
module Database.Keys.SQL where

14
Limit.hs
View file

@ -110,15 +110,15 @@ matchMagic limitname _ _ Nothing _ =
{- Adds a limit to skip files not believed to be present
- in a specfied repository. Optionally on a prior date. -}
addIn :: String -> Annex ()
addIn s = addLimit =<< mk
addIn s = do
u <- Remote.nameToUUID name
hereu <- getUUID
addLimit $ if u == hereu && null date
then use inhere
else use (inuuid u)
where
(name, date) = separate (== '@') s
mk
| name == "." = if null date
then use inhere
else use . inuuid =<< getUUID
| otherwise = use . inuuid =<< Remote.nameToUUID name
use a = return $ Right $ \notpresent -> checkKey (a notpresent)
use a = Right $ checkKey . a
inuuid u notpresent key
| null date = do
us <- Remote.keyLocations key

7
Utility/Tor.hs
View file

@ -5,6 +5,8 @@
- Licensed under the GNU AGPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}
module Utility.Tor where
import Common
@ -37,7 +39,12 @@ connectHiddenService (OnionAddress address) port = do
return s
where
torsocksport = 9050
#if MIN_VERSION_socks(0,6,0)
torsockconf = defaultSocksConf $ SockAddrInet torsocksport $
tupleToHostAddress (127,0,0,1)
#else
torsockconf = defaultSocksConf "127.0.0.1" torsocksport
#endif
socksdomain = SocksAddrDomainName (BU8.fromString address)
socksaddr = SocksAddress socksdomain (fromIntegral port)

8
doc/bugs/Uses_rsync_instead_of___96__cp_--reflink__61__auto__96___on_volumes_of_the_same_BTRFS_partition/comment_3_419a36dfd9c0dd7f31cacadd097860f8._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 3"
date="2019-07-30T15:18:57Z"
content="""
Thank you Joey!
"""]]

687
doc/bugs/test_suite_fails_on_windows.mdwn Normal file
View file

@ -0,0 +1,687 @@
### Please describe the problem.
Running the test suite on windows gives test failures.
### What steps will reproduce the problem?
Install Git for Windows (64-bit), install git-annex into the Git installation dir, open Git bash, run git-annex-test .
### What version of git-annex are you using? On what operating system?
7.20190730-ga63bf35dc on Windows 10
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
MINGW64_NT-10.0-17763 WPAE9-305 3.0.7-338.x86_64 2019-04-30 21:52 UTC x86_64 Msys
git-annex version: 7.20190730-ga63bf35dc
build flags: Assistant Webapp Pairing S3 WebDAV TorrentParser Feeds Testsuite
dependency versions: aws-0.21.1 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.6.5 http-client-0.5.14 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.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
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar hook external
operating system: mingw32 x86_64
supported repository versions: 5 7
upgrade supported from repository versions: 2 3 4 5 6
Tests
QuickCheck
prop_encode_decode_roundtrip: OK (0.11s)
+++ OK, passed 1000 tests.
prop_encode_c_decode_c_roundtrip: OK (0.09s)
+++ OK, passed 1000 tests.
prop_isomorphic_key_encode: OK (0.04s)
+++ OK, passed 1000 tests.
prop_isomorphic_shellEscape: OK (0.02s)
+++ OK, passed 1000 tests.
prop_isomorphic_shellEscape_multiword: OK (0.85s)
+++ OK, passed 1000 tests.
prop_isomorphic_configEscape: OK (0.02s)
+++ OK, passed 1000 tests.
prop_parse_show_Config: OK (0.05s)
+++ OK, passed 1000 tests.
prop_upFrom_basics: OK (0.02s)
+++ OK, passed 1000 tests.
prop_relPathDirToFile_basics: OK (0.02s)
+++ OK, passed 1000 tests.
prop_relPathDirToFile_regressionTest: OK
+++ OK, passed 1 test.
prop_cost_sane: OK
+++ OK, passed 1 test.
prop_matcher_sane: OK
+++ OK, passed 1 test.
prop_HmacSha1WithCipher_sane: OK
+++ OK, passed 1 test.
prop_VectorClock_sane: OK
+++ OK, passed 1 test.
prop_addMapLog_sane: OK
+++ OK, passed 1 test.
prop_verifiable_sane: OK (0.08s)
+++ OK, passed 1000 tests.
prop_segment_regressionTest: OK
+++ OK, passed 1 test.
prop_read_write_transferinfo: OK (0.04s)
+++ OK, passed 1000 tests.
prop_read_show_inodecache: OK (0.02s)
+++ OK, passed 1000 tests.
prop_parse_build_presence_log: OK (1.43s)
+++ OK, passed 1000 tests.
prop_parse_build_contentidentifier_log: OK (1.43s)
+++ OK, passed 1000 tests.
prop_read_show_TrustLevel: OK
+++ OK, passed 1 test.
prop_parse_build_TrustLevelLog: OK
+++ OK, passed 1 test.
prop_hashes_stable: OK
+++ OK, passed 1 test.
prop_mac_stable: OK
+++ OK, passed 1 test.
prop_schedule_roundtrips: OK
+++ OK, passed 1000 tests.
prop_past_sane: OK
+++ OK, passed 1 test.
prop_duration_roundtrips: OK
+++ OK, passed 1000 tests.
prop_metadata_sane: OK (0.87s)
+++ OK, passed 1000 tests.
prop_metadata_serialize: OK (1.09s)
+++ OK, passed 1000 tests.
prop_branchView_legal: OK (0.72s)
+++ OK, passed 1000 tests.
prop_viewPath_roundtrips: OK (0.04s)
+++ OK, passed 1000 tests.
prop_view_roundtrips: OK (0.48s)
+++ OK, passed 1000 tests.
prop_viewedFile_rountrips: OK (0.02s)
+++ OK, passed 1000 tests.
prop_b64_roundtrips: OK
+++ OK, passed 1000 tests.
prop_standardGroups_parse: OK
+++ OK, passed 1 test.
Unit Tests v7 unlocked
add dup: Init Tests
init: init test repo
Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Entering an adjusted branch where files are unlocked as this filesystem does not support locked files.
ok
(recording state in git...)
OK (2.25s)
add: git-annex.exe: NUL: openFile: does not exist (No such file or directory)
error: external filter 'git-annex smudge --clean -- %f' failed 1
error: external filter 'git-annex smudge --clean -- %f' failed
FAIL (0.52s)
.\Test\Framework.hs:347:
foo failed to look up key
1 out of 2 tests failed (2.78s)
FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
add extras: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
export_import: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
export_import_subdir: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
shared clone: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
log: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
import: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
reinject: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unannex (no copy): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unannex (with copy): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (no remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (with remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (untrusted remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
get: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
get (ssh remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
move: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
move (ssh remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
copy: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
lock: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
lock (v7 --force): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
edit (no pre-commit): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
Init Tests
edit (pre-commit): init: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
partial commit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fix: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
direct: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
trust: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (basics): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (bare): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (local untrusted): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (remote untrusted): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck --from remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
migrate: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
migrate (via gitattributes): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unused: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
describe: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
find: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
merge: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
info: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
version: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
sync: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
union merge regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
adjusted branch merge regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
adjusted branch subtree regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (adjusted branch): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution movein regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (mixed directory and file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution symlink bit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (uncommitted local file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (removed file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (nonannexed file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (nonannexed symlink): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (mixed locked and unlocked file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
map: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
uninit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
uninit (in git-annex branch): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
upgrade: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
whereis: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
hook remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
directory remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
rsync remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
bup remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
crypto: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
preferred content: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
add subdirs: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
addurl: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
Unit Tests v5 direct
add dup: init test repo
Detected a filesystem without fifo support.
Disabling ssh connection caching.
Detected a crippled filesystem.
Entering an adjusted branch where files are unlocked as this filesystem does not support locked files.
ok
(recording state in git...)
Direct mode is not supported by this repository version. Use git-annex unlock instead.
FAIL (2.28s)
.\Test\Framework.hs:474:
git annex direct failed
add: git-annex.exe: NUL: openFile: does not exist (No such file or directory)
error: external filter 'git-annex smudge --clean -- %f' failed 1
error: external filter 'git-annex smudge --clean -- %f' failed
FAIL (0.78s)
.\Test\Framework.hs:283:
foo is not a (crippled) symlink
2 out of 2 tests failed (3.06s)
FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
add extras: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
export_import: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
export_import_subdir: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
shared clone: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
log: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
import: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
reinject: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unannex (no copy): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unannex (with copy): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (no remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (with remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
drop (untrusted remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
get: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
get (ssh remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
move: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
move (ssh remote): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
copy: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
lock: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
lock (v7 --force): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
edit (no pre-commit): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
edit (pre-commit): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
partial commit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fix: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
direct: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
trust: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (basics): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (bare): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (local untrusted): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck (remote untrusted): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
fsck --from remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
migrate: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
migrate (via gitattributes): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
unused: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
describe: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
find: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
merge: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
info: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
version: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
sync: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
union merge regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
adjusted branch merge regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
adjusted branch subtree regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (adjusted branch): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution movein regression: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (mixed directory and file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution symlink bit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (uncommitted local file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (removed file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (nonannexed file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (nonannexed symlink): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
conflict resolution (mixed locked and unlocked file): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
map: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
uninit: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
uninit (in git-annex branch): FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
upgrade: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
whereis: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
hook remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
directory remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
rsync remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
bup remote: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
crypto: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
preferred content: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
add subdirs: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
addurl: FAIL
Exception: init tests failed! cannot continue
CallStack (from HasCallStack):
error, called at .\Test\Framework.hs:431:33 in main:Test.Framework
132 out of 168 tests failed (13.35s)
(Failures above could be due to a bug in git-annex, or an incompatibility
with utilities, such as git, installed on this system.)
.t\repo\.git\objects\f9\b6e5e36be4911f475c5a96dbc0c2c5d4b256af: removeDirectoryRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:DeleteFile "\\\\?\\C:\\Users\\ilya\\.t\\repo\\.git\\objects\\f9\\b6e5e36be4911f475c5a96dbc0c2c5d4b256af": permission denied (Access is denied.)
sleeping 10 seconds and will retry directory cleanup
git-annex: .t\repo\.git\objects\f9\b6e5e36be4911f475c5a96dbc0c2c5d4b256af: removeDirectoryRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:DeleteFile "\\\\?\\C:\\Users\\ilya\\.t\\repo\\.git\\objects\\f9\\b6e5e36be4911f475c5a96dbc0c2c5d4b256af": permission denied (Access is denied.)
# End of transcript or log.
"""]]
### 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)

8
doc/forum/How_to_remove_annex_on_osx__63__/comment_2_e1e99510ba234db1b8473aca607b60c6._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="andrew7278"
avatar="http://cdn.libravatar.org/avatar/834467aeb2f15d1e260f4b6209d52939"
subject="SnapChat Error"
date="2019-07-31T11:04:58Z"
content="""
I am recently facing some few errors with the SnapChat and I cannot connect with anyone with this. I have tried a lot to get this issue solved but failed. I have even reinstalled it as per the instruction, given in <https://supportphonenumberaustralia.com/snapchat-support-phone-number/>, but all was in vain. Can anyone suggest me any solution in this regards?
"""]]

9
doc/forum/Syncing_with_an_encrypted_remote_from_a_different_computer__63__/comment_5_f14a08e15ba5e096fc39c05a37f3add7._comment
View file

@ -1,9 +0,0 @@
[[!comment format=mdwn
username="ahmadabi787@4794191381bef93a2daa0515a85ff953cba9b3e0"
nickname="ahmadabi787"
avatar="http://cdn.libravatar.org/avatar/f3c997e16d01953ace5940e35a491f5d"
subject="Technical support"
date="2019-07-26T07:12:59Z"
content="""
Remote Desktop can be secured using SSL/TLS in Windows Vista, Windows 7, and Windows Server 2003/2008. While Remote Desktop is more secure than remote administration tools such as VNC that do not encrypt the entire session, any time Administrator access to a system is granted remotely there are risks. If anyone faces TV issues connect [LG TV Repair](https://www.techsupportdubai.com/lg-tv-repair/)
"""]]

13
doc/install/Android/comment_1_44984732ac139f8921f5044d68ef7817._comment
View file

@ -1,13 +0,0 @@
[[!comment format=mdwn
username="geonemax67@f507d88f591246c5ff7de3b1f7fb2823684a789b"
nickname="geonemax67"
avatar="http://cdn.libravatar.org/avatar/74a24c06b9fbb063465f13ece001186c"
subject="SAMSUNG TV Repair Dubai"
date="2019-07-29T11:14:48Z"
content="""
Git-annex repositories consist of symlinks that are checked into git, and in turn point at the content of large files that are stored in .git/annex/objects/.
Direct mode gets rid of the symlinks. The advantage of direct mode is that you can access files directly, including modifying them.
Enjoyed reading the article above, really explains steps to install git-annex in detail, the article is very interesting and effective.
I learn new information from your article. Thank you for this post.
And if you are looking for Tv repair connect with <a href=\"https://helpmeta.blogspot.com/2019/07/how-to-set-up-your-samsung-smart-tv-to.html\">SAMSUNG TV Repair Dubai</a> they provide the best service.
"""]]

30
doc/news/version_7.20190503.mdwn
View file

@ -1,30 +0,0 @@
git-annex 7.20190503 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* adb special remote supports being configured with importtree=yes,
to allow git-annex import of files from an Android device. This can be
combined with exporttree=yes and git-annex export used to send changes
back to the Android device.
* S3 special remote supports being configured with importtree=yes,
to allow git-annex import of files from a S3 bucket. This can be
combined with exporttree=yes and git-annex export used to send changes
back to the S3 bucket.
* S3: When versioning is enabled on a bucket, importing from it will
import old versions of files that were written to the bucket as well
as the current versions. A git history is synthesized to reflect the way
the bucket changed over time.
* Fix bug that caused importing from a special remote to repeatedly
download unchanged files when multiple files in the remote have the same
content.
* Made git-annex sync --content much faster when all the remotes it's
syncing with are export/import remotes.
* sync: When listing contents on an import remote fails, proceed with
other syncing instead of aborting.
* renameremote: New command, changes the name that is used to enable
a special remote. Especially useful when you want to reuse the name
of an old remote for something new.
* Drop support for building with aws older than 0.14.
* info: Show when a remote is configured with importtree.
* Added mimeencoding= term to annex.largefiles expressions.
This is probably mostly useful to match non-text files with eg
"mimeencoding=binary"
* git-annex matchexpression: Added --mimeencoding option."""]]

25
doc/news/version_7.20190730.mdwn Normal file
View file

@ -0,0 +1,25 @@
git-annex 7.20190730 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Improved probing when CoW copies can be made between files on the same
drive. Now supports CoW between BTRFS subvolumes. And, falls back to rsync
instead of using cp when CoW won't work, eg copies between repos on the
same EXT4 filesystem.
* Add BLAKE2BP512 and BLAKE2BP512E backends, using a blake2 variant
optimised for 4-way CPUs.
* Support running v7 upgrade in a repo where there is no branch checked
out, but HEAD is set directly to some other ref.
* Windows build no longer ships with a copy of rsync, since that is only
used any more to access rsync special remotes or remotes with a very
old version of git-annex-shell.
* Windows build is now 64 bit, and using it with the 64 bit git for
Windows is fully supported.
* Windows problems with long filenames should be fixed now,
since the Windows build is made with a newer ghc version that works
around the problems.
* stack.yaml: Build with http-client-0.5.14 to get a bug fix to http header
parsing.
* Drop support for building with ghc older than 8.4.4,
and with older versions of serveral haskell libraries.
* Support building with socks-0.6 and persistant-template-2.7.
* Corrected some license statements.
Thanks, Sean Whitton."""]]

3
doc/security.mdwn
View file

@ -1,4 +1,7 @@
Information about all known security holes in git-annex, and their fixes.
Subscribe to the RSS feed to be kept up to date.
If you have discovered a security hole and wish to report it privately, see
[[contact]].
[[!inline pages="./security/* and !./security/*/* and !*/Discussion" rootpage="security" show="0"]]

2
doc/todo/Compatibility_with_socks-0.6_and_persistant-template-2.7.mdwn
View file

@ -3,3 +3,5 @@ The current Hackage version (7.20190615) only compiles with the constraints sock
The compiler errors can be fixed with the attached patches.
In the case of the socks changes (for Tor), I am not sure if it will actually work correctly.
> Found the necessary changes to get it to compile. [[done]] --[[Joey]]

19
doc/todo/LFS_API_support.mdwn
View file

@ -78,3 +78,22 @@ Thanks for your great work! :) -- [[anarcat]]
> That seems to be all the complications involved in implementing this,
> aside from git-annex needing to know the sha256 and size of an object.
> --[[Joey]]
> Started some initial work in the `git-lfs` branch. --[[Joey]]
---
## related ideas
A couple ideas for possible things that could also be done with git-lfs
integration. Just to keep in mind while implementing the above.
* git-annex could support git-lfs pointer files. This would let a lfs
repo be cloned and git-annex used to manage the files in it with the
finer control it allows compared to git-lfs.
* A lfs API endpoint could serve out of a git-annex repository.
One neat thing this would allow is, when git-annex knows an url
where an object is located (from the web special remote or another
special remote that registers an url), it could direct the lfs
client to that url when it requests to download the object.

38
doc/todo/borg_special_remote/comment_5_5b39e3fbf480e0e558e7fb4466798124._comment Normal file
View file

@ -0,0 +1,38 @@
[[!comment format=mdwn
username="joey"
subject="""comment 5"""
date="2019-08-01T16:02:06Z"
content="""
Half a second to store a single annex object with restic is pretty slow,
and that's before the snapshots directory gets bloated with a hundred
thousand files.
I wonder if my original idea up top was not a better approach: Let these
backup tools back up a whole annex repo (or at least .git/annex/objects),
and then make git-annex interoperate with the backups by peering inside
them and learning what has been backed up.
In the meantime, git-annex has gotten tree import facilities,
which is a similar concept, of listing content in a data store
and so learning what's stored in there, and then being able to
retrieve objects out of that data store on demand.
Importing annex objects from a backup is not quite the same as a tree
import, because it wouldn't result in any kind of file tree that
you'd want to merge back into your git repo. Also tree importing has
to download files in order to hash them, while in this case the
object's annex key can be seen in the backup.
But from a user perspective it could be quite similar, something like:
git annex initremote restic type=restic repolocation=...
git annex import --from restic
git annex get
That would use `restic list snapshots` and then `restic ls` each
snapshot and find filenames that look like annex keys
(perhaps looking for part of the annex directory structure to avoid
false positives). Keys it found would be marked as present in
the remote, and the snapshot(s) that contain them recorded in
the git-annex branch for use by git-annex get.
"""]]

16
doc/todo/borg_special_remote/comment_6_a6945345a752b166dc683484d80dfcc2._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2019-08-01T16:34:22Z"
content="""
I made a restic repo with 2000 single-file snapshots.
Adding the first snapshot took 0.55s. Adding the 2000th
snapshot took 1.10s.
So that's a very big scalability problem with using restic with single-file
snapshots.
2000 files in a directory is not going to cause that kind of slowdown;
my guess is restic needs to load all past snapshots, or something like
that.
"""]]

2
git-annex.cabal
View file

@ -1,5 +1,5 @@
Name: git-annex
Version: 7.20190708
Version: 7.20190730
Cabal-Version: >= 1.8
License: AGPL-3
Maintainer: Joey Hess <id@joeyh.name>