Commit graph

8256 commits

Author SHA1 Message Date
Joey Hess
caaedb2993
fix http-client gzip decompression bug
Prevent haskell http-client from decompressing gzip files, so downloads of
such files works the same as it used to with wget and curl.

Explicitly setting accept-encoding to "identity" is probably not needed,
but that's what wget sends (curl does not send the header), and since
http-client is trying to be excessively smart, it seems we need to set
hAcceptEncoding to something to prevent it from inserting its own,
and this seems better than some hack like "".

This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-05-21 15:10:25 -04:00
Joey Hess
f9e3bcdeb8
close 2018-05-21 15:06:29 -04:00
Joey Hess
2fabd7cdb5
remove the older move --force, which never behaved as documented and seems useless
* move: --force was accidentially enabling two unrelated behaviors
  since 6.20180427. The older behavior, which has never been well
  documented and seems almost entirely useless, has been removed.
* copy: --force no longer does anything.

This commit was sponsored by Øyvind Andersen Holm.
2018-05-21 13:21:19 -04:00
Joey Hess
ca6f5be284
followup 2018-05-21 12:51:55 -04:00
Joey Hess
e3c224913e
analysis 2018-05-21 12:14:30 -04:00
rrnewton@63c9faa1997c908b1dc04dfdca33c809660cd158
6a0379a056 tweak url 2018-05-21 05:13:10 +00:00
rrnewton@63c9faa1997c908b1dc04dfdca33c809660cd158
647745bb84 2018-05-21 05:12:20 +00:00
andrew
a34f982e7a Added a comment: thoughts? 2018-05-20 17:41:29 +00:00
https://openid-provider.appspot.com/iakornfeld
c97a6f9997 2018-05-18 14:02:29 +00:00
CandyAngel
5cbce5f308 2018-05-18 08:55:31 +00:00
spwhitton
d3117290cd Added a comment: patches welcome 2018-05-17 21:31:01 +00:00
anarcat
2c6c77bc16 Added a comment: .gitconfig was the cause, git-remote-gcrypt probably at fault 2018-05-17 20:42:37 +00:00
CandyAngel
295447a406 Added a comment 2018-05-17 20:21:47 +00:00
spwhitton
d43e44e3e5 Added a comment: analysis 2018-05-17 19:49:04 +00:00
CandyAngel
1d58205284 Added a comment 2018-05-17 19:14:25 +00:00
anarcat
78a0bf4814 reproduced with remote-gcrypt 1.1 2018-05-17 17:39:35 +00:00
anarcat
fc68caa435 problems using gcrypt remote for basic stuff 2018-05-17 17:27:27 +00:00
CandyAngel
bcf732aca5 2018-05-16 21:58:53 +00:00
https://openid-provider.appspot.com/iakornfeld
65f55e448c Added a comment: Looking at code 2018-05-15 19:01:10 +00:00
Joey Hess
8c8e1f8b7a
close 2018-05-15 12:07:35 -04:00
Joey Hess
2463d4b855
response 2018-05-15 11:54:02 -04:00
https://openid-provider.appspot.com/iakornfeld
47ff8fa976 more failures to copy/paste 2018-05-15 15:15:37 +00:00
https://openid-provider.appspot.com/iakornfeld
5ed04a326a Added a comment: Another weird bit 2018-05-15 14:59:42 +00:00
https://openid-provider.appspot.com/iakornfeld
28c1348140 fix failure to copy/paste 2018-05-15 14:56:54 +00:00
https://openid-provider.appspot.com/iakornfeld
24959e9acd 2018-05-15 14:55:14 +00:00
Joey Hess
d7021d420f
reuse hashes of dotfiles/dirs/submodules when entering view
This fixes a crash when a git submodule has a name starting with a dot.
Such a submodule might contain dotfiles that are intended to be used when
inside the view (since a dot-directory that's not a submodule was already
preserved when entering a view). So, rather than eliminating the submodule
from the view, its git ls-files --stage hash is copied over into the view.

dotfiles/dirs have their git ls-files --stage hashes similarly copied over
to the view. This is more efficient and simpler than the old method,
and also won't break if git ever adds a new type of tree item, like was
done with submodules.

Since the content of dotfiles in the working tree is no longer hashed
when entering a view, when there are unstaged modifications, they are
not included in the view branch. Entering the view branch still works,
but git checkout shows "M .dotfile", and git diff will show the unstaged
changes. This seems like an improvement over the old behavior.

Also made Command.View not delete empty directories that are submodules
when entering a view, while still deleting other empty directories.

This commit was supported by the NSF-funded DataLad project.
2018-05-14 15:35:20 -04:00
Joey Hess
a732004616
update 2018-05-14 13:18:20 -04:00
Joey Hess
6fffcccb53
followup 2018-05-14 13:15:27 -04:00
gdkags@28c74e22834edcf63c178e595b8649e5af5151d4
e646b22fd2 Added a comment: fine with me! 2018-05-10 13:02:23 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
61d083765e Added a comment: Arm processor on Synology device 2018-05-10 11:07:44 +00:00
yarikoptic
d801a33184 Added a comment: details 2018-05-09 01:12:31 +00:00
Joey Hess
db720f6a9c
Display error message when http download fails.
* Display error message when http download fails.

  There's nothing in the http-client library to nicely format a http
  exception, so in some cases it has to fall back to using show on it.
  Seems better than just saying "it failed" or only showing the http
  status code.

* Avoid forward retry when 0 bytes were received.

  forwardRetry was comparing Nothing to Just 0, and so thought there had
  been progress made when 0 bytes were received.

This commit was supported by the NSF-funded DataLad project.
2018-05-08 16:11:45 -04:00
Joey Hess
c0ffd02ac5
close almost all old Android app bug reports
The old git-annex Android app is now deprecated in favor of running
git-annex in termux. I suspect all or nearly all of these no longer apply.

This commit was sponsored by Jochen Bartl on Patreon.
2018-05-08 15:00:46 -04:00
Joey Hess
2948f6d916
avoid uname -o on !linux and catch any exception from it
Fix bug in last release that prevented the webapp opening on non-Linux systems.

This commit was sponsored by Jake Vosloo on Patreon.
2018-05-08 14:06:19 -04:00
Joey Hess
b2e03bb428
followup 2018-05-08 14:00:13 -04:00
Joey Hess
d1961e4498
back out incorrect IO interleaving change
Fix regression in last release that crashes when using --all or running
git-annex in a bare repository. May have also affected git-annex unused and
git-annex info.

Reversed the order of the (++) in Annex.Branch.files so --all will stream
lazily still when there are not a bunch of uncommitted journal files.
Added a todo to maybe improve this later.

This commit was sponsored by Trenton Cronholm on Patreon.
2018-05-08 13:54:42 -04:00
yarikoptic
348c6d56f9 added my meta 2018-05-08 02:43:38 +00:00
yarikoptic
c8451f14f6 2018-05-08 01:56:04 +00:00
yarikoptic
c85cb8e9f0 initial report on problem fetching from web within docker container 2018-05-06 15:44:55 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
59ae9f3f85 Added a comment: Same error 2018-05-05 05:28:35 +00:00
andrew
a2e9f8a06d Added a comment 2018-05-04 15:58:59 +00:00
andrew
abf7436e43 Added a comment 2018-05-04 15:00:18 +00:00
andrew
fd135b1e40 2018-05-04 13:48:51 +00:00
yarikoptic
cdb9a11a64 initial report 2018-05-04 03:08:51 +00:00
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
Joey Hess
a934d466a8
close 2018-03-29 13:32:02 -04:00
yarikoptic
e0f55a7644 2018-03-28 17:35:47 +00:00
yarikoptic
b3ba0a2368 initial report 2018-03-27 15:34:03 +00:00
Joey Hess
a6f8d9ab28
bug 2018-03-25 08:02:03 -04:00
Joey Hess
380dba1a2c
response 2018-03-24 10:18:45 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
2b5b5eb8d9 Added a comment 2018-03-23 19:01:02 +00:00