Commit graph

10251 commits

Author SHA1 Message Date
Joey Hess
6b13574827
Windows: include= and exclude= containing '/' will also match filenames that are written using '\'
And vice-versa, but it's better to use '/' for portability.

Notably, standardPreferredContent contains "archive/*" and that might not
match if the filename ends up coming in with the slashes the other way
around.
2020-12-15 12:39:34 -04:00
yarikoptic
07b8dc4a8b Added a comment 2020-12-15 16:18:39 +00:00
Joey Hess
e914cb0777
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-15 12:12:29 -04:00
Joey Hess
6c890d62f6
initremote: Prevent enabling encryption with exporttree=yes/importtree=yes
I do think this was a reversion, but I have not tracked back to what
version. While involving the remote config, it's not the same class of
problems that I kept having to chase down for a while after the remote
config parser reworking.
2020-12-15 12:08:08 -04:00
jkniiv
8bfc2bbe0a Added a comment: yay, it's working now! :) 2020-12-15 04:46:38 +00:00
Joey Hess
8b248d84fb
comment 2020-12-14 17:43:48 -04:00
Joey Hess
9244874304
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-14 17:42:25 -04:00
Joey Hess
01527b21d8
add key to FileInfo
MatchingKey is not the thing to use when matching on actual worktreee
files.

Fix reversion in 8.20201116 that made include= and exclude= in
preferred/required content expressions match a path relative to the current
directory, rather than the path from the top of the repository.
2020-12-14 17:42:02 -04:00
yarikoptic
65ab8a2163 Added a comment 2020-12-14 20:59:06 +00:00
Joey Hess
fac5ccb2e2
add USE_SYSTEM_LIBS=1 for osxapp build 2020-12-14 15:34:27 -04:00
yarikoptic
ef55021fe1 Added a comment 2020-12-14 14:07:47 +00:00
jkniiv
ec1202871d 2020-12-14 05:07:20 +00:00
adina.wagner@2a4cac6443aada2bd2a329b8a33f4a7b87cc8eff
5a4aa4ae0c Added a comment 2020-12-12 20:32:05 +00:00
kyle
c3e0856b45 Added a comment 2020-12-11 20:56:04 +00:00
Joey Hess
3c76a31b15
response and related todo 2020-12-11 16:21:16 -04:00
yarikoptic
e0965b831c Added a comment 2020-12-10 21:55:20 +00:00
Joey Hess
108c7d96dd
comment 2020-12-10 17:52:26 -04:00
Joey Hess
8c0ff6b8cd
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-10 17:47:22 -04:00
yarikoptic
c2071567ca Initial report on export -J6 to S3 failing due to "transfer already in progress" 2020-12-10 21:16:56 +00:00
Joey Hess
38e0e2e471
bug 2020-12-10 13:09:57 -04:00
Joey Hess
a8cdcf528e
fix build failure by avoiding refutable pattern match 2020-12-09 12:43:38 -04:00
jwodder
30defd434e Correct author 2020-12-09 14:11:07 +00:00
jwodder
6c0bd08b9d 2020-12-09 14:09:47 +00:00
yarikoptic
d5bfa9bdf9 added datalad project tag 2020-12-07 18:23:28 +00:00
jwodder
7db3832e37 2020-12-07 17:36:34 +00:00
kyle
d1ffd246bf bug: alwayscommit=false on windows 2020-12-04 21:05:25 +00:00
falsifian
cf649b5753 Added a comment 2020-12-02 16:52:10 +00:00
Joey Hess
0540e987b3
improve p2p protocol handling of requested object not available
Avoid spurious "verification of content failed" message when downloading
content from a ssh or tor remote fails due to the remote no longer having a
copy of the content.

The P2P protocol already handled this case by sending DATA 0, followed by
VALID. But VALID was not really right, because the data is not the
requested data. So, send DATA 0, followed by INVALID. Old versions of
git-annex handle INVALID the same as VALID in this case. Now new versions
avoid displaying an incorrect message.

It would be better for the P2P protocol to have a different way to indicate
this, like perhaps sending INVALID without DATA. But that would be a
breaking change and need a new protocol verison. Since INVALID already is
part of the protocol and already needs to be handled, using it for this
special case too seems ok, and avoids the complication of another protocol
version.

This commit was sponsored by Jochen Bartl on Patreon.
2020-12-01 16:05:55 -04:00
Joey Hess
92136284b1
avoid hGetMetered 0 closing the handle
This is an edge case, which happened to be triggered by the P2P protocol
seeing DATA 0. When reading 0 bytes, getting an empty string does
not mean the handle has reached EOF.

I verified there was in fact a bug, where get of an empty file followed
by another file would get the empty file and then fail
with "handle is closed". This fixes it.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2020-12-01 15:39:22 -04:00
Joey Hess
41bb873319
comment 2020-12-01 12:59:10 -04:00
falsifian
a9ade9e6f8 2020-11-30 20:35:21 +00:00
dzhu
17ce86e2d3 Added a comment 2020-11-30 19:10:54 +00:00
Joey Hess
3416997174
remove digression 2020-11-30 13:31:02 -04:00
Joey Hess
7776677a5f
Fix hang on shutdown of external special remote using ASYNC protocol extension.
Reversion introduced in version 8.20201007, one release after the 1st
release with the extension.

Surprisingly, hClose can hang if another thread is reading from the
handle. This is because it uses takeMVar.

The use of cancel here does mean that, if receiveMessageAddonProcess
or Remote.External.AsyncExtension.receiveloop allocated some resource in
a non-async-exception safe way, they might not get a chance to clean it up.
They do not appear to, and anyway, this only happens when git-annex is
shutting down, so any recource that did leak would not be a problem.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2020-11-30 13:04:02 -04:00
Joey Hess
1dc802a445
comment 2020-11-30 12:44:40 -04:00
Joey Hess
267bdaaac1
close 2020-11-30 12:28:20 -04:00
kyle
8d7b14e2f3 Added a comment 2020-11-30 15:18:58 +00:00
dzhu
4383ab5a80 2020-11-29 02:36:23 +00:00
Joey Hess
79135e4a92
close 2020-11-25 06:25:58 -04:00
jkniiv
145c343b4a 2020-11-25 09:19:03 +00:00
jkniiv
c623288288 2020-11-25 07:38:17 +00:00
gueux
87e6f09ce3 Added a comment 2020-11-24 21:07:37 +00:00
Joey Hess
a80bf89e8d
comment and moreinfo needed 2020-11-24 15:00:06 -04: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
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
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
a6f7017eba
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-23 13:00:36 -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
ghen1
c724adfb48 2020-11-22 13:24:47 +00: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
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
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
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
9c448c877b
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-18 12:53:41 -04:00
Joey Hess
24f7d0af3d
followup 2020-11-18 12:52:14 -04:00
kyle
774a02909d Added a comment 2020-11-18 15:30:07 +00:00
https://ro-che.info/
b3ac1653b2 2020-11-18 13:46:25 +00:00
alex@3cb1cc0c80ffb2137f36155c5caa581605c3767b
a7254774b3 2020-11-18 12:09:08 +00:00
alex@3cb1cc0c80ffb2137f36155c5caa581605c3767b
5ecf4152c2 2020-11-18 12:08:08 +00:00
gueux
7dc9cf9d69 Added a comment 2020-11-18 10:54:56 +00:00
Joey Hess
3dda21d292
comment 2020-11-17 17:30:43 -04:00
Joey Hess
6b63278f31
init: When writing hook scripts, set all execute bits, not only the user execute bit 2020-11-17 13:31:12 -04:00
Joey Hess
fbbc42a9d4
comment 2020-11-17 13:20:54 -04:00
Joey Hess
77b3f002cd
fix typo closing 2020-11-17 12:00:03 -04:00
gueux
f41026f5a9 2020-11-17 11:21:56 +00:00
kyle
4bc564cada Added a comment 2020-11-16 18:22:05 +00:00
yarikoptic
474dfa26f2 Added a comment 2020-11-16 17:44:33 +00:00
wting
ea1662d6f3 Added a comment 2020-11-13 23:08:26 +00:00
Joey Hess
a30030c4a6
move: Fix a regression in the last release that made move --to not honor numcopies settings
This commit was sponsored by Svenne Krap on Patreon.
2020-11-13 14:19:32 -04:00
kyle
eaeedfe0ca Added a comment 2020-11-13 16:36:46 +00:00
wting
d5aab420b5 2020-11-13 06:20:27 +00:00
kyle
bb6b3b1bcb 2020-11-12 17:13:55 +00:00
Joey Hess
bc1ac21885
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-10 12:15:04 -04:00
Joey Hess
92b7b1964d
add warning on add of annex link
Warn when adding a annex symlink or pointer file that uses a key that is
not known to the repository, to prevent confusion if the user has copied it
from some other repository.

This commit was sponsored by Jake Vosloo on Patreon.
2020-11-10 12:10:51 -04:00
jcjgraf
736a51112b Added a comment 2020-11-10 16:05:57 +00:00
Joey Hess
9e8eae20e2
comment 2020-11-10 11:53:45 -04:00
jcjgraf
b05ba8aa5a Added a comment 2020-11-10 10:17:12 +00:00
Joey Hess
885974be99
add newtypes for QuickCheck to avoid LANG=C issues
All properties changed to use them, except for
prop_encode_c_decode_c_roundtrip, which already filtered to ascii
for other reasons.

A few modules had to be split out, because Setup does not build-depend
on QuickCheck.
2020-11-09 20:21:18 -04:00
Joey Hess
aad4129669
diagnosis 2020-11-09 19:10:41 -04:00
yarikoptic
098984574d fresh test failures + report that still there are FTBFS: I only wish git-annex development used some CI 2020-11-09 22:11:32 +00:00
Joey Hess
af9354f447
comment 2020-11-09 17:30:08 -04:00
jcjgraf
7e2b74d278 Added a comment 2020-11-09 20:41:00 +00:00
Joey Hess
0f28133778
followup 2020-11-09 15:45:39 -04:00
Joey Hess
cab33481c0
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-09 15:26:31 -04:00
Joey Hess
d032b0885d
use MatchingKey when a Key is known
This fixes a bug where a file that was not preferred content could be
transferred to a remote. This happened when the file got deleted after
the sync started running.

The only time checkMatcher is run without a Key is in calls to
checkFileMatcher, which are only done by add, addurl, import, and
smudge --clean. Those won't be affected by this kind of race. Anything
else that might be precaching and have a similar race as sync will also
be fixed, but I don't know if it actually affected anything other than
sync.

As well as fixing a bug, this also probably makes sync and --auto faster
by avoiding the redundant key lookup.

This commit was sponsored by Graham Spencer on Patreon.
2020-11-09 15:17:22 -04:00
Joey Hess
d84371ff73
reproduced 2020-11-09 14:35:51 -04:00
jcjgraf
3e12f5872a Added a comment 2020-11-09 18:13:47 +00:00
Joey Hess
cefae2e257
close 2020-11-09 13:50:16 -04:00
Joey Hess
661499732a
comment 2020-11-09 12:38:44 -04:00
Joey Hess
dd52d8ebdc
update after RawFilePath transition 2020-11-09 12:12:25 -04:00
Lukey
73bf45a163 Added a comment 2020-11-08 08:25:36 +00:00
yarikoptic
62820a4c30 Added a comment 2020-11-07 23:59:52 +00:00
Joey Hess
c64e95045d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-07 14:10:19 -04:00
Joey Hess
3f08c34073
bug 2020-11-07 10:58:43 -04:00
yarikoptic
ea9d3f7d2f FTBFS 2020-11-07 00:45:06 +00:00
jcjgraf
d8e8d145e1 Added a comment 2020-11-06 14:57:52 +00:00
Lukey
1b02a81346 Added a comment 2020-11-06 14:14:18 +00:00
jcjgraf
b7e8a75b8c 2020-11-05 13:31:04 +00:00
yarikoptic
7e24b2587e Added a comment 2020-11-03 02:12:17 +00:00
yarikoptic
2c88c5e258 initial formal report on drop 2020-11-03 02:02:41 +00:00
Joey Hess
49475eb3d9
rename 2 bug report titles that are too long due to pasting enormous error messages into title entry
So the repo can be cloned on windows.
2020-11-02 15:25:10 -04:00
Joey Hess
e926305221
add maxlength=50 to ikiwiki template used for page title entry 2020-11-02 15:21:24 -04:00
Joey Hess
9252f86b2e
view: Fix a reversion in 8.20200522 that broke entering or changing views.
Commit 2dc7b5186a messed up indentation.

This commit was sponsored by Noam Kremen on Patreon.
2020-11-02 14:47:08 -04:00
Joey Hess
efdb13fca3
comment 2020-11-02 13:55:30 -04:00
Joey Hess
fcdbc892ed
already fixed 2020-11-02 13:25:07 -04:00
Joey Hess
6eca4fc95e
not a bug 2020-11-02 13:24:23 -04:00
gschnabel
7c66380163 git-annex-view fails because of "another git process running" 2020-10-30 08:13:25 +00:00
gschnabel
9d2d52ae55 git-annex-view fails 2020-10-30 08:08:18 +00:00
lyderic
0ab03f3a61 2020-10-29 10:14:28 +00:00
lyderic
468682b6c9 Added a comment: This bug has alreay been raised 2020-10-29 10:13:50 +00:00
lyderic
69acb869ff 2020-10-29 10:08:13 +00:00
yarikoptic
a3bb6f235c Added a comment 2020-10-27 19:44:36 +00:00
yarikoptic
1add9c957e Added a comment 2020-10-27 19:30:24 +00:00
yarikoptic
2bea2c1937 report on possibly PATH related issue on windows 2020-10-27 19:15:38 +00:00
Joey Hess
64e7bac810
view: Avoid using ':' from metadata when generating a view
Because it's a special character on Windows ("c:").

Use same technique already used for '/' and '\'.

I didn't record how I generated their encoded forms before, so am sure
there was a better way, but the way I did it now is to look at

	ghci> encodeFilePath "∕"
	"\226\136\149"

And then the difference from that to "\56546\56456\56469"
is adding 56320 to each, to get up to the escaped code plane.

See comment for why I think handling ':' is ok, but that other illegal
windows filenames won't. Note that, this should be enough to make the
test suite always work. Other windows illegal filenames will fail at
checkout time when it tries to put the illegal filename on the
filesystem.
2020-10-26 15:38:08 -04:00
yarikoptic
2d291bf200 Added a comment 2020-10-26 17:57:12 +00:00
Joey Hess
401f734a34
comment 2020-10-26 12:43:19 -04:00
Joey Hess
53b91e0ea7
close 2020-10-26 12:02:35 -04:00
yarikoptic
a8605422b9 initial report on a failing test 2020-10-26 15:02:49 +00:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
f861ce399e Added a comment: where to trace the Windows build errors? 2020-10-25 15:23:01 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
65c1687430 Added a comment 2020-10-24 14:39:39 +00:00
yarikoptic
def62b49f0 Added a comment 2020-10-24 12:26:02 +00:00
yarikoptic
3be4731315 Added a comment 2020-10-24 01:21:09 +00:00
Joey Hess
b2bf099aa3
use removeDirGeneric here too for consistency
And because it might be more robust on windows.
2020-10-23 16:12:47 -04:00
Joey Hess
a108b00b33
testremote: Display exceptions when tests fail, to aid debugging 2020-10-23 15:41:57 -04:00
Joey Hess
681313dfd4
deal with .git pointer file in Git.CurrentRepo
This fixes the bug.

Note, it's only done when GIT_DIR is set. When it's not set,
Git.Construct already handled it. This is why it was only noticed with this
git submodule command.

This commit was sponsored by Brett Eisenberg on Patreon.
2020-10-23 14:56:12 -04:00
Joey Hess
893d7b21e8
comment 2020-10-23 14:21:29 -04:00
Joey Hess
f92b0ef109
analysis 2020-10-23 14:08:06 -04:00