Commit graph

31721 commits

Author SHA1 Message Date
Joey Hess
f821b0e046
fix path 2018-04-16 17:34:27 -04:00
Joey Hess
1bed62bda9
android: try harder to force PIE for android 5+
This may work around ghc's -no-pie flag. Untested.
2018-04-16 17:30:21 -04:00
Joey Hess
f4e1cd2a8a
followup 2018-04-16 16:42:38 -04:00
Joey Hess
87b834535a
copy info from comment on install/Android 2018-04-16 16:41:31 -04:00
Joey Hess
32bf25be3d
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-16 16:34:44 -04:00
Joey Hess
89e1a05a8f
Fix mangling of --json output of utf-8 characters when not running in a utf-8 locale
As long as all code imports Utility.Aeson rather than Data.Aeson,
and no Strings that may contain utf-8 characters are used for eg, object
keys via T.pack, this is guaranteed to fix the problem everywhere that
git-annex generates json.

It's kind of annoying to need to wrap ToJSON with a ToJSON', especially
since every data type that has a ToJSON instance has to be ported over.
However, that only took 50 lines of code, which is worth it to ensure full
coverage. I initially tried an alternative approach of a newtype FileEncoded,
which had to be used everywhere a String was fed into aeson, and chasing
down all the sites would have been far too hard. Did consider creating an
intentionally overlapping instance ToJSON String, and letting ghc fail
to build anything that passed in a String, but am not sure that wouldn't
pollute some library that git-annex depends on that happens to use ToJSON
String internally.

This commit was supported by the NSF-funded DataLad project.
2018-04-16 16:21:21 -04:00
hobbes@b2cacef69071743c3a831e60511062f7e014e52f
dd36f22098 Added a comment: Modern Android? 2018-04-16 19:28:09 +00:00
Joey Hess
6ddd374935
note 2018-04-16 12:21:33 -04:00
Joey Hess
8d08ccb710
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-16 12:20:36 -04:00
Joey Hess
93beff784a
add 2018-04-16 12:20:16 -04:00
yarikoptic
37f1deb722 Added a comment: old issue bites back 2018-04-16 05:53:01 +00:00
Michael
78f47b423b 2018-04-15 17:38:30 +00:00
Michael
0b5b829d42 2018-04-15 17:36:43 +00:00
Joey Hess
78ded0b744
devblog 2018-04-13 15:23:58 -04:00
Joey Hess
f56594af9e
finish fixing inverted Ord for TrustLevel
Flipped all comparisons. When a TrustLevel list was wanted from Trusted
downwards, used Down to compare it in that order.

This commit was sponsored by mo on Patreon.
2018-04-13 15:17:54 -04:00
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