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

Made git-annex sync --content much faster when all the remotes it's syncing with are export/import remotes

Browse source 
It was unnecessarily going over all files and checking preferred content
against no remotes.
This commit is contained in:
Joey Hess 2019-04-10 12:42:10 -04:00
parent 48c2a95efb
commit 3d6f1b7dba
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -7,6 +7,8 @@ git-annex (7.20190323) UNRELEASED; urgency=medium
* Fix bug that caused importing from a special remote to repeatedly * Fix bug that caused importing from a special remote to repeatedly
download unchanged files when multiple files in the remote have the same download unchanged files when multiple files in the remote have the same
content. content.
* Made git-annex sync --content much faster when all the remotes it's
syncing with are export/import remotes.
-- Joey Hess <id@joeyh.name> Tue, 09 Apr 2019 14:07:53 -0400 -- Joey Hess <id@joeyh.name> Tue, 09 Apr 2019 14:07:53 -0400

1
Command/Sync.hs
View file

@ -592,6 +592,7 @@ newer remote b = do
- When concurrency is enabled, files are processed concurrently. - When concurrency is enabled, files are processed concurrently.
-} -}
seekSyncContent :: SyncOptions -> [Remote] -> CurrBranch -> Annex Bool seekSyncContent :: SyncOptions -> [Remote] -> CurrBranch -> Annex Bool
seekSyncContent _ [] _ = return False
seekSyncContent o rs currbranch = do seekSyncContent o rs currbranch = do
mvar <- liftIO newEmptyMVar mvar <- liftIO newEmptyMVar
bloom <- case keyOptions o of bloom <- case keyOptions o of