Commit graph

31706 commits

Author SHA1 Message Date
Joey Hess
a0e4b9678b
fix inverted Ord for TrustLevel (intermediate commit)
This commit removes the Ord and Enum instances, commenting out all code
that depends on them, to make sure that all code effected by the
inversion fix has been identified.

(Assuming no ifdefs involve TrustLevel.)

The next commit will fix up all the identified code.
2018-04-13 14:50:14 -04:00
Joey Hess
1831cc4a7d
remove unused import 2018-04-13 14:43:29 -04:00
Joey Hess
64980db7d9
move: Avoid drops that make bad situations worse, but otherwise allow
See the big comment at the bottom of Command.Drop for the full details.

(The --safe/--unsafe options were never released.)

This commit was sponsored by Jake Vosloo on Patreon.
2018-04-13 14:36:43 -04:00
Joey Hess
4b8c289154
display addurl url not file
The file gets displayed after download is complete, so this is the
simplest way to avoid redundant display.
2018-04-13 01:37:46 -04:00
Joey Hess
4cda021acc
remove redundant meter
This was stacked with another one, resulting in an extra newline
2018-04-13 01:23:09 -04:00
Joey Hess
b4a2bcaf4c
add missing newline between importfeed and subsequent addurl
got lost when wget was eliminated
2018-04-13 01:12:22 -04:00
edward@6e8aa3b16ceac4d960301e049af99698fea47eea
491c3aa4ab Revert my change, not a typo. 2018-04-11 13:47:42 +00:00
edward@6e8aa3b16ceac4d960301e049af99698fea47eea
729436c3ce fix typo 2018-04-11 13:46:08 +00:00
richih@50508f31e0ee95720acd0120e16d6bdcad9d104b
747b6784ae Added a comment 2018-04-11 07:34:43 +00:00
Joey Hess
0c65439ce0
thoughts 2018-04-10 18:49:11 -04:00
Joey Hess
8f3b45b846
followup 2018-04-10 13:15:43 -04:00
richih@50508f31e0ee95720acd0120e16d6bdcad9d104b
1409a44f9c Added a comment 2018-04-10 15:49:35 +00:00
anarcat
fddf14600b Added a comment: force? 2018-04-10 14:20:08 +00:00
CandyAngel
a3fa146be4 Added a comment 2018-04-10 10:39:23 +00:00
Joey Hess
9b8075e79f
fix build 2018-04-09 20:22:46 -04:00
Joey Hess
b47c23bb5c
fix build 2018-04-09 20:15:52 -04:00
Joey Hess
453ffe7317
devblog 2018-04-09 16:28:10 -04:00
Joey Hess
af8546990d
move: --safe/--unsafe and potential drop race fix
move: Added --safe option, which makes move honor numcopies settings.
Also --unsafe enables the default behavior, anticipating that the
default may one day change.

This commit was sponsored by Ethan Aubin.
2018-04-09 16:20:10 -04:00
Joey Hess
ae530f043e
disentagle copy and move option parsing 2018-04-09 14:38:46 -04:00
Joey Hess
0106752db2
refactor FromToHereOptions 2018-04-09 14:29:28 -04:00
Joey Hess
448c40180b
document copy --to=here
This happened for free due to move supporting it but it's certianly
useful and worth documenting.
2018-04-09 14:17:31 -04:00
Joey Hess
fb07802666
add news item for git-annex 6.20180409 2018-04-09 13:24:52 -04:00
Joey Hess
ba8a3156ea
releasing package git-annex version 6.20180409 2018-04-09 13:24:45 -04:00
Joey Hess
de552bd469
fix thinko for the second time
It's almost like this part of haskell syntax is not very good..
2018-04-09 13:10:44 -04:00
Joey Hess
197b1510fa
remove unused import 2018-04-09 13:09:40 -04:00
Joey Hess
e5a404ebe2
fix build with old version of http-client 2018-04-09 13:04:23 -04:00
CandyAngel
5f84a102ee Added a comment 2018-04-09 14:56:52 +00:00
jascha@bd514dc9c58dc9c665f7c949886c9efad9b4fc35
db442c5439 2018-04-09 13:30:48 +00:00
Michael
d835110a90 Added a comment: prebuilt i386 still at old version? 2018-04-08 01:44:24 +00:00
itn@23fdfea9e5c13d8bb24e4cbde30d2a98293154c1
1afd507600 Added a comment: Cloning and syncing leads to confusing "gcrypt: Failed to decrypt manifest!" errors. 2018-04-08 00:50:15 +00:00
dev@49d24b8461d78227a0ef1e366862734efda0b362
45a013eda6 2018-04-07 15:33:17 +00:00
Joey Hess
61aa56465b
fix pattern match 2018-04-06 23:11:20 -04:00
Joey Hess
bd45129c27
always poll file
This is now only used when downloading an url, and polling is always
needed when using curl, no matter how the output is configured.
2018-04-06 23:09:19 -04:00
Joey Hess
c8f2d302dc
run curl when configured to do it at runtime, even if not available at build time 2018-04-06 21:17:36 -04:00
Joey Hess
db9524bfcc
update for wget removal 2018-04-06 21:15:31 -04:00
Joey Hess
76f352a9a9
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-06 17:38:52 -04:00
Joey Hess
388eb4135f
devblog 2018-04-06 17:38:30 -04:00
Joey Hess
c34152777b
Use http-conduit for url downloads by default, annex.web-options enables curl
* For url downloads, git-annex now defaults to using a http library,
  rather than wget or curl. But, if annex.web-options is set, it will
  use curl. To use the .netrc file, run:
    git config annex.web-options --netrc
* git-annex no longer uses wget (and wget is no longer shipped with
  git-annex builds).

Note that curl is always run in silent mode, since the new API for
download has a MeterUpdate and doesn't make way for curl progress
output. It might be worth writing a parser for curl's progress output
to update the meter when using it, but I didn't bother with this edge
case for now.

This commit was supported by the NSF-funded DataLad project.
2018-04-06 17:36:20 -04:00
Joey Hess
0791c24221
fix bad refactoring
Reponse BodyReader is not a conduit thing, so can't use the refactored
function here after all. Oops. Put it back how it was.
2018-04-06 16:59:14 -04:00
Joey Hess
36e6b8abbf
Fix resuming a download when using curl.
Noticed a bug; when using curl a workaround for its empty file behavior
overwrote the file content, so it never resumed and always started over.
2018-04-06 16:09:53 -04:00
Joey Hess
0f6775f1ff
refactor sinkResponseFile and add downloadC
Remote.S3 and Remote.Helper.Http both had similar code to sink a
http-conduit Response to a file; refactor out sinkResponseFile.

downloadC downloads an url to a file using http-conduit, and supports
resuming. Falls back to curl to handle urls that http-conduit does not
support. This is not used yet, but the goal is to replace download with
it.

git-annex.cabal: conduit-extra was not actually used for a long time,
remove the dep. conduit moves into the main dependency list, but since
http-conduit was already in there, and it depends on conduit, that's not
really adding a new build dep.

This commit was supported by the NSF-funded DataLad project.
2018-04-06 16:07:08 -04:00
Joey Hess
0e8564201e
link to recastex 2018-04-06 11:27:18 -04:00
Joey Hess
d2ad5ebe4a
gitlab shell's git-annex support was removed 2018-04-06 11:21:44 -04:00
svw
f96de42138 2018-04-06 06:51:36 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
d92ec5c1d6 Added a comment 2018-04-05 21:01:51 +00:00
Joey Hess
6cb5b7294f
info: Changed sorting of numcopies stats table, so it's ordered by the variance from the desired number of copies.
Compare these...

numcopies stats:
	numcopies -1: 1986
	numcopies +0: 1170
	numcopies -2: 769
	numcopies +1: 716
	numcopies -4: 696
	numcopies -3: 485
	numcopies -6: 230
	numcopies -5: 111
	numcopies -7: 91
	numcopies -9: 9

numcopies stats:
	numcopies +1: 716
	numcopies +0: 1170
	numcopies -1: 1986
	numcopies -2: 769
	numcopies -3: 485
	numcopies -4: 696
	numcopies -5: 111
	numcopies -6: 230
	numcopies -7: 91
	numcopies -9: 9

I feel that the former is a jumbled mess that doesn't tell much overall,
while the second shows pretty clearly that most files are within 1 degree
of the desired number of copies, with some outliers without enough.
2018-04-05 14:54:39 -04:00
Joey Hess
817ebb5765
info: Added "combined size of repositories containing these files" stat
when run on a directory

This commit was sponsored by andrea rota.
2018-04-05 14:44:58 -04:00
CandyAngel
dc6d1ad00f Added a comment 2018-04-05 15:45:52 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
1377e75970 Added a comment: I also have this problem 2018-04-05 15:25:22 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
6c43b6084f removed 2018-04-05 15:24:31 +00:00