mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24020 commits 13 branches 442 tags 103 MiB
Commit graph

24020 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
8c2dd7d8ee Fix an unlikely race that could result in two transfers of the same key running at once. 
As discussed in bug report.
 2015-05-12 19:39:28 -04:00
Joey Hess
e25ecab7dd convert to using Utility.Lockfile for transfer lock files 
Should be no behavior changes, just simplified code.

The only actual difference is it doesn't truncate the lock file.
I think that was a holdover from when transfer info was written to the lock
file.
 2015-05-12 19:36:16 -04:00
Joey Hess
643b233860 an optimization that also fixes a reversion 
This is a little optimisation; avoid loading the info file for the
download of the current key when checking for other downloads.

The reversion it fixes is sorta strange.
a812d598ef broke checking for transfers
that were already in progress. Indeed, the transfer lock was not held
after getTransfers was called.

Why? I think it's magic in ghc's handling of getLock and setLock,
although it's hard to tell since those functions are almost entirely
undocumented as to their semantics.

Something, either the RTS (or maybe it's linux?) notices that the
same process has taken a lock and is now calling getLock on a FD attached
to the same file. So, it drops the lock.

So, this optimisation avoids that problematic behavior.
 2015-05-12 18:34:49 -04:00
Joey Hess
1fd54e986a devblog 2015-05-12 16:36:39 -04:00
Joey Hess
61ccf95004 Avoid accumulating transfer failure log files unless the assistant is being used. 
Only the assistant uses these, and only the assistant cleans them up, so
make only git annex transferkeys write them,

There is one behavior change from this. If glacier is being used, and a
manual git annex get --from glacier fails because the file isn't available
yet, the assistant will no longer later see that failed transfer file and
retry the get. Hope no-one depended on that old behavior.
 2015-05-12 15:53:38 -04:00
Joey Hess
a812d598ef Take space that will be used by running downloads into account when checking annex.diskreserve. 2015-05-12 15:20:22 -04:00
Joey Hess
5935578ed2 update 2015-05-12 14:00:53 -04:00
Joey Hess
505d540360 allow building without ascii-progress, since it is not ready yet 
No progress bars with -J unless built with ascii-progress.
 2015-05-12 13:54:16 -04:00
Joey Hess
e27b97d364 Merge branch 'master' into concurrentprogress 
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
 2015-05-12 13:23:22 -04:00
Joey Hess
96d24a8161 note about git annex drop behavior change in bare repo 2015-05-12 13:02:22 -04:00
Joey Hess
587b2e9014 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-12 13:00:22 -04:00
Joey Hess
4b2e3210ea drop: Now supports --all, --unused, and --key. 2015-05-12 13:00:06 -04:00
https://me.yahoo.com/a/StKYI.ZuofVB3xNCCzjJo.V7Fg--#11600
e4b137378f 2015-05-12 15:31:56 +00:00
https://sunny256.wordpress.com/
b371a12641 Added a comment: Create symlink in the root directory 2015-05-12 13:04:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
581beaae1c Added a comment 2015-05-12 06:52:05 +00:00
https://me.yahoo.com/a/e1w.8yMTnpUh.5fOXneP92pTdy23XJPwx84uLSM-#aca7c
6a1bf68350 Added a comment: re: backup my data to blue ray disks 2015-05-11 21:13:19 +00:00
Joey Hess
cc5d0a3873 comment 2015-05-11 13:03:41 -04:00
Joey Hess
db5d831d07 import: Refuse to import files that are within the work tree, as that does not make sense and could cause data loss. 2015-05-11 12:57:47 -04:00
Joey Hess
6ebf615995 cutting a point release, will be a cabal-only update 2015-05-11 12:09:02 -04:00
Joey Hess
c17f2d25b5 bug submitter appears to have been wrong 2015-05-11 12:05:35 -04:00
CandyAngel
a008f78e26 2015-05-11 15:52:29 +00:00
Yaroslav Halchenko
cb23224ba3 ENH: make debianstandalone{,-dsc} rules 
Moved rules out of debian/rules and avoided need for patching it for
standalone builds
 2015-05-11 11:50:59 -04:00
Joey Hess
4ecbdf10fb Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-11 09:44:52 -04:00
Joey Hess
6168537c34 require RELEAEE_BUILD to be 1, not any value 2015-05-11 09:44:01 -04:00
spwhitton
f6cc3fd0e9 Added a comment 2015-05-11 09:02:11 +00:00
atrent
48037ddb67 2015-05-11 07:37:33 +00:00
Joey Hess
7d3b052fd4 reorder dependency list 2015-05-10 17:03:20 -04:00
Joey Hess
03667a162a couple of AMP warnings I missed before 2015-05-10 16:51:03 -04:00
Joey Hess
663eb15aa3 avoid unncessary dep on old-locale when building with new version of time 2015-05-10 16:50:22 -04:00
Joey Hess
64a4553e0b rename traverse to walk since Data.Traversable is imported by default in ghc 7.10 2015-05-10 16:43:09 -04:00
Joey Hess
aea9d1d45a and anoher one.. 2015-05-10 16:40:24 -04:00
Joey Hess
5c7cdbae46 more {-# OPTIONS_GHC -fno-warn-tabs #-} ... Forcing people who have what is merely a difference of opinion to you to do this is a bit of an asshole move. Just saying. 2015-05-10 16:38:49 -04:00
Joey Hess
ed4fe02896 disable horrible tab warning, needed in every file that Setup.hs pulls in 
This is certianly a cabal bug for not passing the build options in the
cabal file when building Setup.hs.

And, why oh why did ghc enable this warning by default? So unhappy with
this choice.
 2015-05-10 16:31:50 -04:00
Joey Hess
f65e7a4cce devblog 2015-05-10 16:21:38 -04:00
Joey Hess
ec267aa1ea rejigger imports for clean build with ghc 7.10's AMP changes 
The explict import Prelude after import Control.Applicative is a trick
to avoid a warning.
 2015-05-10 16:20:30 -04:00
Joey Hess
9ee2745ca5 typo 2015-05-10 15:56:07 -04:00
Joey Hess
26ac0753c1 more FlexibleContexts 2015-05-10 15:54:58 -04:00
Joey Hess
082b1590ce avoid using now deprecated PortNum constructor 2015-05-10 15:49:47 -04:00
Joey Hess
0375331c61 another FlexibleContexts fix 2015-05-10 15:46:59 -04:00
Joey Hess
9917d2c94c fix build warning with ghc 7.10 2015-05-10 15:44:47 -04:00
Joey Hess
9f14f51d63 generalied elem/notElem in ghc 7.10 require some additional type signatures when using OverloadedStrings 2015-05-10 15:41:41 -04:00
Joey Hess
6466dbc950 FlexibleContexts needed by ghc 7.10 2015-05-10 15:37:55 -04:00
Joey Hess
6c2d5b5e41 more time-1.5 fixes 2015-05-10 15:36:58 -04:00
Joey Hess
33a2264546 fix build warning with time 1.5 2015-05-10 15:28:23 -04:00
Joey Hess
08308dc9b3 fix build warning with ghc 7.10 2015-05-10 15:28:13 -04:00
Joey Hess
a5a53ca011 forgot to add new module 2015-05-10 15:23:38 -04:00
Joey Hess
6cf62a9bde support time-1.5.0 
This no longer uses old-locale's defaultTimeLocale, but provides one
of its own.

Factored out a Logs.TimeStamp.
 2015-05-10 15:21:35 -04:00
Joey Hess
fcb8394e5f switch to Control.Monad.ST to avoid build warning in ghc 7.10 2015-05-10 14:42:16 -04:00
Joey Hess
fd2d90d319 disable ghc 7.10's obnoxious warnings about every line using tab to indent 2015-05-10 14:41:34 -04:00
Yaroslav Halchenko
e861dd1dd5 ENH: leave only git for depends of standalone -- the rest is provided 
Otherwise, versioned depends forbid installation on elderly squeeze
 2015-05-10 14:36:50 -04:00