Commit graph

28446 commits

Author SHA1 Message Date
Joey Hess
ddf4e0a4ed
revert 3fac05bf5e
This broke the windows build, the android build, the debian stable build, ...
2016-09-06 14:14:06 -04:00
Joey Hess
fd02af6136
constrain cryptonite version to avoid windows build fail
https://github.com/haskell-crypto/cryptonite/issues/99
2016-09-06 13:50:55 -04:00
Joey Hess
022382160a
try using cabal constraint 2016-09-06 13:25:02 -04:00
Joey Hess
d242e21968
perisstent-sqlite-2.2.1 fails to build on windows 2016-09-06 13:13:07 -04:00
Joey Hess
b786400671
remove old cabal install libraries to try to fix windows autobuilder 2016-09-06 12:58:51 -04:00
Joey Hess
612043c55a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-06 12:47:02 -04:00
Joey Hess
31289da691
get -J: Download different files from different remotes when the remotes have the same costs.
Only done in -J mode because only if there's concurrency can downloading
from two remotes be faster. Without concurrency, it's likely the case that
sequential downloads from the same remote are faster than switching back
and forth between two remotes.

There is some hairy MVar code here, but basically it just keeps
the activeremotes MVar full except when deciding which remote to assign
to a thread.

Also affects gets by sync --content -J

This commit was sponsored by Jochen Bartl.
2016-09-06 12:45:21 -04:00
Joey Hess
eb469bd139
use keyLocations not loggedLocations
Skip dead remotes.
2016-09-06 11:57:45 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c50dce1cc9 Added a comment: current status? 2016-09-06 14:11:25 +00:00
leni536
9065e994b4 2016-09-06 09:34:14 +00:00
Joey Hess
e9f7310a7d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-05 19:44:35 -04:00
Joey Hess
1b8d8faa3a
applied 2016-09-05 19:43:59 -04:00
Joey Hess
c75475697b
one dep per line and add comments about workaround deps 2016-09-05 19:42:41 -04:00
ilovezfs
3fac05bf5e
git-annex.cabal: persistent ==2.2.4.1
Simplify Solver's task by requesting version 2.2.4.1 of the persistent
package instead of just providing the persistent < 2.5 constraint.

With only the persistent < 2.5 constraint, and with --flags=s3\ webapp
and --max-backjumps=10000, CI timed out after two hours with Solver
still trying to find a solution.

This is a follow-up to 18e458db, since there's been a regression in the
situation between 6.20160619 and 6.20160808, probably simply because
Hackage is a moving target.
2016-09-05 19:39:19 -04:00
anarcat
afe24c6618 copy --from --to 2016-09-05 22:05:02 +00:00
Joey Hess
73bf74ce98
devblog 2016-09-05 16:39:30 -04:00
Joey Hess
e1706d0a47
comment 2016-09-05 16:28:25 -04:00
Joey Hess
2574bb0b32
todo 2016-09-05 16:28:00 -04:00
Joey Hess
2a5173d566
comment 2016-09-05 16:18:07 -04:00
Joey Hess
2a6494723a
dup forum post 2016-09-05 16:12:54 -04:00
Joey Hess
dd0dff9dc4
Assistant, repair: Filter out git fsck lines about duplicate file entries in tree objects. 2016-09-05 16:08:49 -04:00
Joey Hess
2610103a48
comment 2016-09-05 16:00:51 -04:00
Joey Hess
a64b33fe3b
close 2016-09-05 15:50:05 -04:00
Joey Hess
7170f16d5e
comment 2016-09-05 15:49:19 -04:00
Joey Hess
bca7305a6f
comment 2016-09-05 15:46:42 -04:00
Joey Hess
f07df4ae2a
comment 2016-09-05 15:42:13 -04:00
Joey Hess
07d4fdba78
comment 2016-09-05 15:39:41 -04:00
Joey Hess
219e2fa157
Make --json and --quiet suppress automatic init messages
And any other messages that might be output before a command starts.

Fixes a reversion introduced in version 5.20150727.

During the optparse-applicative conversion, I needed a place to run
per-command global option setters, and I made it get run during the seek stage. But
that is too late to have --json and --quiet disable output produced in the
check stage. Fix is just to run those per-command global option setters at
the same time as the all-command global option setters.

This commit was sponsored by Thom May.
2016-09-05 15:34:38 -04:00
Joey Hess
c9082cf0e4
move Arbitrary instance to new Types.Transfer module
Avoid orphan instance warning
2016-09-05 14:52:06 -04:00
Joey Hess
d17f08afdc
avoid warning about orphan Arbirary instance 2016-09-05 14:51:07 -04:00
Joey Hess
29b6ab467a
switch away from deprecated interface
Again the new stuff works back to network-2.4, so no need to adjust cabal
bounds.
2016-09-05 14:39:44 -04:00
Joey Hess
12db586469
comment 2016-09-05 14:27:15 -04:00
Joey Hess
bbfe82526a
comment 2016-09-05 14:25:41 -04:00
Joey Hess
0ef3bfa6b0
moreinfo; probably not a bug 2016-09-05 14:22:59 -04:00
Joey Hess
49b3ef88f7
Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.
This was originally done in a7ef05a9, but got lost in some change to the
Makefile. Use CROSS_COMPILE=Android to tell configure that it's configuring
for android instead of passing it a parameter.
2016-09-05 14:11:35 -04:00
Joey Hess
40c0a91641
comment 2016-09-05 13:57:26 -04:00
Joey Hess
d75aac5003
comment 2016-09-05 13:12:56 -04:00
Joey Hess
cfa31c6bf8
close as dup 2016-09-05 13:11:05 -04:00
Joey Hess
30aa817f80
comment 2016-09-05 13:08:35 -04:00
Joey Hess
47b0cb943b
response 2016-09-05 12:51:13 -04:00
Joey Hess
0d04062446
comment 2016-09-05 12:49:13 -04:00
Joey Hess
48dd1bfb5c
comment 2016-09-05 12:40:22 -04:00
Joey Hess
5ddd35eea5
remove spam 2016-09-05 12:34:05 -04:00
Joey Hess
778948eb24
comment 2016-09-05 12:33:22 -04:00
Joey Hess
e8c28bbce1
response 2016-09-05 12:29:11 -04:00
Joey Hess
b58e6b3f56
response 2016-09-05 12:27:27 -04:00
Joey Hess
5d70eaacaf
examimekey: Allow being run in a git repo that is not initialized by git-annex yet.
No reason not to; indeed there's no real reason to need a git repository
at all except the implementation uses the Annex monad.
2016-09-05 12:26:59 -04:00
Joey Hess
f1a9c5f248
Fix formatting of git-annex-smudge man page, and improve mdwn2man. Thanks, Jim Paris. 2016-09-05 12:16:03 -04:00
Joey Hess
64f2f24841
Merge remote-tracking branch 'jim/jim' 2016-09-05 12:14:43 -04:00
Joey Hess
d5c16df944
switch away from deprecated recvFrom
Network.Socket.ByteString is in network since before 2.4, so no need to
adjust bounds.
2016-09-05 12:10:24 -04:00