Commit graph

38484 commits

Author SHA1 Message Date
Joey Hess
84377c9b75
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-24 15:00:39 -04:00
Joey Hess
a80bf89e8d
comment and moreinfo needed 2020-11-24 15:00:06 -04:00
Lukey
ef204849e0 Added a comment 2020-11-24 18:35:16 +00:00
Joey Hess
49584ead91
close 2020-11-24 14:33:52 -04:00
Joey Hess
f844abd223
close 2020-11-24 14:32:34 -04:00
Joey Hess
ff4354c6e4
Made the test suite significantly less noisy
Only displaying git-annex and git command output when something went wrong.

A few could still leak stderr. These include the couple of calls
to readProcess, which reads stdin but lets stderr through. But they don't
leak any usually, so probably only would when failing anyway.

Currently, there is no excess output at all!

This commit was sponsored by Brock Spratlen on Patreon.
2020-11-24 14:15:40 -04:00
Joey Hess
a3b714ddd9
finish fixing removeLink on windows
9cb250f7be got the ones in RawFilePath,
but there were others that used the one from unix-compat, which fails at
runtime on windows. To avoid this,
import System.PosixCompat.Files hiding removeLink

This commit was sponsored by Ethan Aubin.
2020-11-24 13:20:44 -04:00
Joey Hess
dce0781391
squash remaining build warnings on windows 2020-11-24 12:35:09 -04:00
Joey Hess
e59cec1755
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-24 12:31:33 -04:00
Joey Hess
88cef18fac
upgrade: Support an edge case upgrading a v5 direct mode repo where nothing had ever been committed to the head branch
This commit was sponsored by Jack Hill on Patreon.
2020-11-24 12:31:17 -04:00
jkniiv
ad4689e790 Added a comment: I concur, in fact git annex init doesn't work at all 2020-11-24 16:28:25 +00:00
Joey Hess
14155bcebe
details 2020-11-24 11:38:50 -04:00
jwodder
88ca42ae91 2020-11-24 13:42:30 +00:00
lucas.gautheron@09f1983993dfb0907d02ba268b3ca672f1dc3eea
6bd65dbb1b 2020-11-24 11:53:44 +00:00
Lukey
02b9764ffd Added a comment 2020-11-23 19:06:13 +00:00
Lukey
f4d78f3ab9 Added a comment 2020-11-23 19:00:56 +00:00
Joey Hess
804808d569
squash build warnings on windows 2020-11-23 14:00:17 -04:00
Joey Hess
06a80dc790
fix build on windows 2020-11-23 13:53:12 -04:00
Joey Hess
a6f7017eba
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-23 13:00:36 -04:00
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
jwodder
604b834431 Added a comment 2020-11-23 15:02:29 +00:00
Joey Hess
931ad80412
bug 2020-11-22 21:28:57 -04:00
Cebtenzzre
8816f0d8ab Added a comment 2020-11-22 16:07:16 +00:00
ghen1
c724adfb48 2020-11-22 13:24:47 +00: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