Commit graph

38462 commits

Author SHA1 Message Date
Joey Hess
8b8ee68a9c
update 2020-11-23 13:00:20 -04:00
Joey Hess
24fdd36e50
forward bug report 2020-11-23 12:52:10 -04:00
Joey Hess
931ad80412
bug 2020-11-22 21:28:57 -04:00
Joey Hess
0f9883580c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-21 12:25:34 -04:00
Joey Hess
61e01bf7e0
fix format 2020-11-21 12:24:41 -04:00
git-annex@6e52e5c5d048aa6b470b95d81fbaf44769d11fbd
21e70142a7 2020-11-21 04:21:26 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
9cd9bcdb30 Added a comment 2020-11-20 22:16:34 +00:00
Joey Hess
fcb1d67b41
fix build on windows 2020-11-20 12:53:25 -04:00
Joey Hess
b9f03371d5
done 2020-11-20 12:53:13 -04:00
gueux
65131af1f8 2020-11-19 22:15:58 +00:00
gueux
321663d27f rename bugs/adjust_--unlock_implies_all_files_set_as_modified.mdwn to bugs/after_adjust_--unlock_implies__44___a_lot_of_files_are_reported_as_modified.mdwn 2020-11-19 22:14:24 +00:00
gueux
4193b8093d 2020-11-19 22:09:23 +00:00
jwodder
9a8a68a27d 2020-11-19 21:15:42 +00:00
Joey Hess
9089229c23
done 2020-11-19 16:38:51 -04:00
Joey Hess
b13c44cccc
convert processTranscript to use hGetLineUntilExitOrEOF
It does use it on both stdout and stderr. It seems unlikely the problem
could really affect stdout, but the unix implementation of it combines
both into a single handle in any case.
2020-11-19 16:36:37 -04:00
Joey Hess
ff0927bde9
converted reads from stderr to use hGetLineUntilExitOrEOF
These are all unlikely to suffer from the inherited stderr fd problem,
but who knows, it could happen.
2020-11-19 16:21:17 -04:00
Joey Hess
613455e059
convert to use hGetLineUntilExitOrEOF
It looks to me like the old code would have already dealt with the case
of ssh starting a ssh daemon that inherits stderr and keeps it open.
The ender thread closed the handle, which would unblock the other thread
and let it exit. Using hGetLineUntilExitOrEOF makes this more explicit
that it's dealt with and simplifies the code.
2020-11-19 16:13:31 -04:00
Joey Hess
66497d39b3
convert git config reading to use hGetLineUntilExitOrEOF
Much nicer than the old hack of waiting for a few seconds for stderr to be read.
2020-11-19 15:38:43 -04:00
Joey Hess
04dca96710
changelog 2020-11-19 14:46:54 -04:00
Kyle Meyer
9e09dcb2cf
BitTorrent: Fix build for "no torrent" code path
The RawFilePath conversions missed a spot in the else arm of "#ifdef
WITH_TORRENTPARSER".
2020-11-19 14:46:21 -04:00
Joey Hess
728afbc4b1
preserve other headers when adding resume header
It had lost the hAcceptEncoding header that is set as part of the
overriding of http-client's default decompression of compressed files.
Seems likely that would have caused resuming of compressed files to fail
in some cases.

This commit was sponsored by Brett Eisenberg on Patreon.
2020-11-19 14:45:22 -04:00
Joey Hess
b90b9b936d
don't rely on exception for http 416
Fix a bug that could make resuming a download from the web fail when the
entire content of the file is actually already present locally.

What a mess that Request can throw exceptions or not, depending on how
it's configured. Makes it very hard if you need to handle some specific
http status codes in a function like this! Implementing everything two
ways did not seem appealing, if possible at all, so I decided to
override the Request if it did come configured to throw exception on
non-2xx http status. Other exceptions, like from http-client-restricted,
or due to a redirect to a non-http url, still get thrown.

This commit was sponsored by Luke Shumaker on Patreon.
2020-11-19 14:44:42 -04:00
Joey Hess
3991c8e43d
comment 2020-11-19 13:02:23 -04:00
Joey Hess
7755c5705d
comment 2020-11-19 13:02:17 -04:00
Joey Hess
b3c88da181
fix windows assistant upgrade glitch
Prevent windows assistant from trying (and failing) to upgrade itself,
which has never been supported on windows.

The new windows build is made with UPGRADE_LOCATION set, which enabled this
code path that had never run on windows before, and doesn't work. I don't
want to try to support self-upgrade on windows, or generally on other OS's
than the ones where its working, so added a check for that. This way the
build can keep setting UPGRADE_LOCATION and if some later git-annex does
learn how to upgrade itself on some OS, it won't need changing the build
setup.
2020-11-19 12:50:25 -04:00
Joey Hess
4b739fc460
Fix build on Windows
Thanks to bug reporter for the patch.
2020-11-19 12:33:00 -04:00
Joey Hess
9cb250f7be
fix removeLink on windows
This removeLink was introduced in commit
e505c03bcc, which replaced code
that used removeFile on Windows. So, I know git-annex did not used to do
anything other than removeFile on Windows. If there were symlinks it
wanted to remove, this would not work on windows, but of course it does
not use symlinks on windows.
2020-11-19 12:20:18 -04:00
Joey Hess
c3be0c8dd2
close 2020-11-19 12:08:06 -04:00
kyle
4c46e92ca3 Added a comment 2020-11-19 15:35:00 +00:00
git-annex@77d290f42943061acb99794c304fc6a6d5f601db
d321002182 2020-11-19 14:11:57 +00:00
jkniiv@b330fc3a602d36a37a67b2a2d99d4bed3bb653cb
994a3b04d1 added version info as reported by git-annex version 2020-11-19 05:12:06 +00:00
jkniiv@b330fc3a602d36a37a67b2a2d99d4bed3bb653cb
977ab328aa 2020-11-19 05:00:25 +00:00
wting
87c135c259 Added a comment 2020-11-19 03:12:37 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
db624d8a1e Added a comment 2020-11-18 19:28:51 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
c2dc234e0d removed 2020-11-18 19:26:33 +00:00
Joey Hess
64ed58c17e
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-18 15:17:58 -04:00
Joey Hess
d8b7f6721f
Merge branch 'ssh-hates-me' 2020-11-18 15:17:05 -04:00
Joey Hess
043eee0cb5
update 2020-11-18 15:16:49 -04:00
Joey Hess
682829c200
avoid throwing exception when the handle is closed
The handle could get closed eg, by cleanupProcess being called,
which forces the process to exit and closes all its handles.

At this point, the test case in https://git-annex.branchable.com/bugs/Buggy_external_special_remote_stalls_after_7245a9e/
is fixed.
2020-11-18 15:10:35 -04:00
Joey Hess
b021e2322f
avoid crash on EOF at end 2020-11-18 15:03:30 -04:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
612dfa9580 removed 2020-11-18 18:59:49 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
13026257be Added a comment: how to convert existing repo to new backend? 2020-11-18 18:54:31 +00:00
Joey Hess
e6d741af79
finish conversion to hGetLineUntilExitOrEOF
started in aafae46bcb
2020-11-18 14:54:02 -04:00
Joey Hess
7ec22489da
remove bench test 2020-11-18 14:49:56 -04:00
Joey Hess
b483be8548
newline mode (mis)handling for windows
Unfortunately, there is no hGetNewLineMode. This seems like an oversight
that should be fixed in ghc, but for now, I paper over it with a windows
hack.
2020-11-18 14:48:50 -04:00
Joey Hess
787b39c7c1
working hGetLineUntilExitOrEOF
The problem with the old version seemed to be that hWaitForInput blocks
rather than timing out when being run concurrently with hGetLine on the
same handle.

This passes the bench test, and also works when run concurrently on
different handles.
2020-11-18 14:21:47 -04:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
3aaae3097b removed 2020-11-18 17:59:54 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
55aa45794a 2020-11-18 17:54:49 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
a6e7890f1d 2020-11-18 17:52:22 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
f0c19c4c95 2020-11-18 17:51:31 +00:00