Commit graph

8162 commits

Author SHA1 Message Date
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
fb61e8986a clarify 2018-04-29 19:43:07 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
225351246b simplify 2018-04-29 19:39:48 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
1c7fcfc623 2018-04-29 19:35:07 +00:00
https://launchpad.net/~felixonmars
3befef5f2c 2018-04-29 03:24:24 +00:00
Joey Hess
b0df331b4a
adjust webapp paths when run in termux on Android
And display the special case Android UI
2018-04-25 14:17:52 -04:00
moaxey
76bcf0da6e Added a comment: I also found this log 2018-04-17 22:52:15 +00:00
moaxey
ef297b2ecb 2018-04-17 22:34:24 +00:00
yarikoptic
82ee2919a3 Added a comment 2018-04-17 03:52:55 +00:00
Joey Hess
c72e9ae568
hmm 2018-04-16 20:41:11 -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
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
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
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
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
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
jascha@bd514dc9c58dc9c665f7c949886c9efad9b4fc35
db442c5439 2018-04-09 13:30:48 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
d92ec5c1d6 Added a comment 2018-04-05 21:01:51 +00: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
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
39bd152085 Added a comment 2018-04-05 15:23:42 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
e257e4b6a3 removed 2018-04-05 15:19:51 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
26b603418f removed 2018-04-05 15:18:14 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
8c989eca91 Added a comment: I also can't add remotes through the web assistant 2018-04-05 15:17:53 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
5f5d64b4d2 Added a comment: I also can't add remotes through the web assistant 2018-04-05 15:17:44 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
896f42ea15 Added a comment 2018-04-05 02:11:41 +00:00
vrs+annex@ea5fa24dbb279be61a8e50adb638bf8366300717
d8af254515 Added a comment 2018-04-05 01:32:33 +00:00
Joey Hess
c769d359a7
response 2018-04-04 14:09:30 -04:00
Joey Hess
3ce13f7a2a
thoughts 2018-04-04 14:00:55 -04:00
Joey Hess
ef389722ae
don't copy old date metadata when adding new version of a file
When adding a new version of a file, and annex.genmetadata is enabled,
don't copy the data metadata from the old version of the file, instead use
the mtime of the file. Rationalle being that the user has requested to
generate metadata and so would expect to get the new mtime into metadata.

Also, avoid warning about copying metadata when all the old metadata is
date metadata. Which was rather the harder part.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-04-04 13:58:16 -04:00
Joey Hess
c6252018fa
thoughrs 2018-04-04 12:50:09 -04:00
Joey Hess
c14638886f
response 2018-04-04 12:37:43 -04:00
Joey Hess
f856b15f27
response 2018-04-04 12:08:10 -04:00
Joey Hess
7b967c3800
close 2018-04-04 11:59:15 -04:00
Joey Hess
c4f034e6b3
thoughts 2018-04-03 15:31:08 -04:00
Joey Hess
bf1002194d
followup 2018-04-02 13:20:38 -04:00
Joey Hess
a5fe62bed0
hmm 2018-03-29 14:10:10 -04:00
Joey Hess
34f8d68573
stall detectors 2018-03-29 13:44:34 -04:00
Joey Hess
fd53b80624
Merge branch 'master' of ssh://git-annex.branchable.com 2018-03-29 13:32:21 -04:00