Commit graph

38229 commits

Author SHA1 Message Date
Joey Hess
aed64428d5
allow magicmime on windows
John Thorvald Wodder II got it working using
https://github.com/datalad/file-windows so don't hard-disable it.

The stack.yaml still disables this build flag, because it needs an extra
C library to be installed, which stack cannot automate.
2020-10-26 13:34:27 -04:00
Joey Hess
a7d11aa3ab
include libmagic in windows installer
This is from https://raw.githubusercontent.com/datalad/datalad-extensions/master/resources/git-annex-magicBundle.patch
which was written by John Thorvald Wodder II.

I have converted line endings from windows, and fixed indentation to use
tabs.
2020-10-26 13:24:37 -04:00
Joey Hess
f3070d2d7d
Windows build changed to one done by the datalad-extensions project using Github actions
This is a cleaner build than on Jenkins because the whole environment setup
is handled by the CI config, at least up to the point of "get a random bag
of Windows bytes".

Also, the Jenkins autobuilder has been intermittently failing for a long
time, not due to any problem with git-annex but just a failure to clean up
directories.

Also, this build runs the test suite, and it is (mostly) passing. Test
suite always failed in the jenkins environment.

Also, this build includes libmagic.

Here is the build workflow used by github actions:
https://github.com/datalad/datalad-extensions/blob/master/.github/workflows/build-git-annex-windows.yaml
The libmagic build has its own workflow:
https://github.com/datalad/file-windows/blob/master/.github/workflows/build.yml

(Also cleaned up some windows build cruft I don't use anymore.)

There is no build-version file to link to. I've opened a todo requesting
one: https://github.com/datalad/datalad-extensions/issues/55
2020-10-26 13:17:23 -04: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
Joey Hess
81d798b52e
Merge branch 'master' of ssh://git-annex.branchable.com 2020-10-26 11:35:19 -04:00
Joey Hess
8fda1ef0fa
document version for --force-large/--force-small
also fix the wrong name in the changelog
2020-10-26 11:34:30 -04:00
Joey Hess
5907415380
improve wording 2020-10-26 11:12:17 -04:00
yarikoptic
a8605422b9 initial report on a failing test 2020-10-26 15:02:49 +00:00
ericm
3558ca5d88 2020-10-25 17:32:44 +00:00
Joey Hess
dbbcfd30bd
Merge branch 'master' of ssh://git-annex.branchable.com 2020-10-25 11:30:09 -04:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
f861ce399e Added a comment: where to trace the Windows build errors? 2020-10-25 15:23:01 +00:00
Joey Hess
71ca12ef8c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-10-24 16:26:16 -04: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
92fad0703b
remove dead links to youtube-dl
Presumably most users will get it from their linux distribution, or
whatever. Don't want to need to keep updating links if they're going to
rot like this.
2020-10-23 18:49:14 -04: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
f167851628
Revert "pass --git-dir, rather than changing cwd"
This reverts commit c142696c58.

It turns out it was not needed; 681313dfd4
fixed up the git dir, so setting cwd to it works ok.

But worst, this commit broke the test suite massively. I don't understand how.
git-annex get was failing. Very weirdly, git-annex find in a fresh
clone of an annex repo, during autoinit, was displaying a side message
-- but side messages are disabled when running find.
2020-10-23 16:09:50 -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
Joey Hess
eece011b00
close 2020-10-23 13:58:40 -04:00
Joey Hess
c142696c58
pass --git-dir, rather than changing cwd
If .git is a gitlink file, setting cwd to it will fail, but --git-dir
will succeed. And this is the only place where it sets cwd when running
git, everywhere else already uses --git-dir.

Note that, git-annex's submodule fixup code usually converts gitlink
files to symlinks, so this wasn't usually problem. Still, worth fixing.

This commit was sponsored by Svenne Krap on Patreon.
2020-10-23 13:36:56 -04:00
Joey Hess
966dbb518e
Merge remote-tracking branch 'origin/master' 2020-10-23 13:09:41 -04:00
Joey Hess
cb6cf20b9a
analysis 2020-10-23 13:00:55 -04:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
b91845ec5d Added a comment 2020-10-23 16:51:04 +00:00
Joey Hess
0736383e98
Fix bug that prevented linux standalone bundle from working on a fresh install
Bug was introduced in version 8.20201007, lost a necessary mkdir.

This commit was sponsored by Noam Kremen on Patreon.
2020-10-23 12:19:40 -04:00
amindfv@97236fbaab6048ce6805b2737b27dd7f1cd51da4
02d3e58610 Added a comment 2020-10-23 05:37:41 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
990ed1055a Added a comment 2020-10-23 02:00:09 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
83a718dff2 2020-10-23 01:53:33 +00:00
yarikoptic
1c242ca5fd initial report on a failing test on windows about storeKey when already present 2020-10-23 01:49:02 +00:00
Joey Hess
83e570c0cb
this protocol is not draft for some time 2020-10-22 19:55:29 -04:00
Joey Hess
4d063f12c6
turns out this was fixed in 2014 2020-10-22 19:54:26 -04:00
Joey Hess
2f96e15eda
Merge branch 'master' of ssh://git-annex.branchable.com 2020-10-22 19:24:38 -04:00
Joey Hess
9ed32ce62b
urk 2020-10-22 19:23:48 -04:00
yarikoptic
c24480c061 Added a comment: windows build with magic 2020-10-22 19:32:55 +00:00
jwodder
731a982f1b Added a comment 2020-10-22 18:13:40 +00:00
Joey Hess
577af1b679
rename to avoid windows stupididy about legal filenames 2020-10-22 13:58:20 -04:00
Joey Hess
8f3d34da30
add 2020-10-22 13:55:47 -04:00
Joey Hess
5941737074
add 2020-10-22 13:55:41 -04:00
Joey Hess
b62e004c2c
update chunk log after speculated chunks are verified to be present
Only done in checkPresentChunks, although retrieveChunks could also do
it. Does not seem necessary though, because git-annex never retrives
content without first checking if it's present AFAICR. And really this will
only be needed when using fsck. Puttting it here, rather than in fsck
avoids breaking an abstraction boundary, and is nice and inexpensive.
2020-10-22 13:37:09 -04:00
Joey Hess
dad4be97c2
speculatively use remote's configured chunk size as a fallback
When a special remote has chunking enabled, but no chunk sizes are
recorded (or the recorded ones are not found), speculatively try chunks
using the configured chunk size.

This makes eg, git-annex fsck --from remote be able to fix up the
location log of a file that the git-annex branch does not indicate is
stored on the remote.

Note that fsck does *not* fix up the chunk log to indicate the chunk
size. So, changing the chunk config of the remote after that will still
prevent accessing the chunks stored on it. Maybe fsck should, but I
wanted to start with this and see if it's needed.
2020-10-22 13:11:06 -04:00
Joey Hess
b3345eb4ab
close 2020-10-22 12:03:13 -04:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
3b740ac4dc Added a comment: cannot find this mentioned Windows build :| 2020-10-21 20:46:37 +00:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
a9cec7a810 2020-10-21 20:44:23 +00:00
edward
c20be8d09b Fix a broken link 2020-10-21 19:22:57 +00:00
Lukey
d7b95e363e Added a comment 2020-10-21 19:10:01 +00:00
ericm
4816cfc104 2020-10-21 18:18:25 +00:00