Commit graph

45920 commits

Author SHA1 Message Date
93fd5f49ad Inject custom workflow
All checks were successful
/ Generate cabal config for edge (push) Successful in 1m23s
/ Upload to generic repo (push) Successful in 24s
2024-12-22 11:02:55 +00:00
Joey Hess
430f6bc9c7
releasing package git-annex version 10.20241202 2024-12-02 12:36:24 -04:00
Joey Hess
5882fc28d7
forgot to add this comment earlier 2024-12-02 12:34:08 -04:00
zoran.bosnjak@683708e9d46ca9d9fa8957bd513e6648cbcbf421
72e512329f 2024-12-01 10:37:17 +00:00
psxvoid
7502105629 Added a comment: thanks and the followup 2024-11-27 09:08:32 +00:00
ljc
da2d74a18a 2024-11-27 07:31:13 +00:00
Joey Hess
aa2d543930
comment 2024-11-25 12:32:09 -04:00
Joey Hess
2917caaba3
Merge branch 'master' of ssh://git-annex.branchable.com 2024-11-25 12:16:32 -04:00
Joey Hess
8663c72f1e
git-remote-annex: Fix buggy behavior when annex.stalldetection is configured
Make programPath never return "git-remote-annex" or other known multi-call
program names, which are not git-annex and won't behave like it.
If the git-annex binary gets installed under some entirely other name,
it will still return it.

This change exposed that readProgramFile actually could crash,
which happened before only if getExecutablePath was not absolute
and there was no ~/.config/git-annex/program. So fixed that to catch
exception.
2024-11-25 12:14:52 -04:00
Joey Hess
2fc76ef062
comment 2024-11-25 11:33:38 -04:00
Joey Hess
12cb5f4d4f
analysis 2024-11-25 11:31:20 -04:00
aaron
372852875f Added a comment: Overriding git folder 2024-11-25 02:55:25 +00:00
kyle
6514040b0a Added a comment: re: How to get a list of all NOT unused files 2024-11-25 02:23:25 +00:00
aaron
edacdcc30d 2024-11-25 01:07:20 +00:00
aaron
0e04031208 2024-11-25 01:06:54 +00:00
aaron
9a96925e29 2024-11-25 01:05:32 +00:00
aaron
f429361831 2024-11-25 01:02:53 +00:00
aaron
9934d210ea 2024-11-25 00:56:41 +00:00
aaron
59c555584d 2024-11-25 00:56:17 +00:00
aaron
5f1aa51272 2024-11-25 00:55:07 +00:00
Joey Hess
a2e6d99deb
show remote name when failing
to help debug strange git behavior on some daily builds
2024-11-21 15:55:32 -04:00
Joey Hess
46ea041eba
more fixing for building without servant 2024-11-21 15:35:06 -04:00
Joey Hess
204c19583c
more fixing for building without servant 2024-11-21 15:34:07 -04:00
Joey Hess
f5e1a7f4e4
comment 2024-11-21 15:21:08 -04:00
Joey Hess
757f93203a
Merge branch 'p2phttp-multi' 2024-11-21 15:16:06 -04:00
Joey Hess
4c785c338a
p2phttp: notice when new repositories are added to --directory
When a uuid is not known, rescan for new repositories. Easy.

When a repository is removed, it will also get removed from the server
state on the next scan. But until a new uuid is seen, there will not be
a scan. This leaves the server trying to serve a uuid whose repository
is gone. That seems buggy. While getting just fails, dropping fails the
first time, but seems to leave the server in an unusable state, so the
next drop attempt hangs. The server is still able to serve other uuids,
only the one whose repository was removed has that problem.
2024-11-21 15:09:12 -04:00
Joey Hess
758ea89c74
skip over repositories in --directory that do not have annex.uuid set 2024-11-21 14:18:18 -04:00
Joey Hess
3c18398d5a
p2phttp support --jobs with --directory
--jobs is usually an Annex option setter, but --directory runs in IO, so
would not have that available. So instead moved the option parser into
the command's Options.
2024-11-21 14:15:14 -04:00
Joey Hess
9f84dd82da
p2phttp --directory implementation
Untested, but it compiles, so.

Known problems:

* --jobs is not available to startIO
* Does not notice when new repositories are added to a directory.
* Does not notice when repositories are removed from a directory.
2024-11-21 14:02:58 -04:00
Joey Hess
6bdf4a85fb
move the p2phttp server state map into a data type 2024-11-21 12:24:14 -04:00
Joey Hess
475823c2d3
fix to build w/o servant 2024-11-20 16:29:43 -04:00
Joey Hess
0083ccc677
fix windows build 2024-11-20 15:19:23 -04:00
Joey Hess
6f49f17f22
in test suite display error from git push that fails to exit nonzero 2024-11-20 15:12:23 -04:00
Joey Hess
31a38f8468
git-remote-annex: Require git version 2.31 or newer
Since old ones had a buggy git bundle command.

In particular, git 2.30.2 has a git bundle that supports --stdin, but does
not read from it, and so fails to create a bundle.

While not using --stdin would perhaps work, it limits the number of revs
that get included in the bundle to the command line length limit.

But the real kicker is that at the same time --stdin got fixed, a bug also
got fixed that made git bundle skip including refs when they had the same
sha as other refs it included. Which would lead to data loss. So best to
avoid that buggy thing.
2024-11-20 15:00:17 -04:00
Joey Hess
e6a4ab5224
Merge branch 'master' of ssh://git-annex.branchable.com 2024-11-20 13:41:40 -04:00
Joey Hess
41672b01bb
comment 2024-11-20 13:41:34 -04:00
Joey Hess
d7ed99a55f
document p2phttp --directory
The option is not implemented yet.
2024-11-20 13:40:38 -04:00
Joey Hess
07026cf58b
add proxied uuids to http server state map
This fixes support for proxying after last commit broke it.

Note that withP2PConnections is called at server startup, and so only
proxies seen at that point will appear in the map and be used. It was
already the case that a proxy added after p2phttp was running would not
be served.

I think that is possibly a bug, but at least this commit doesn't
introduce the problem, though it might make it harder to fix it.

As bugs go, it's probably not a big deal, because after all,
git configs needs to be set in the local repository, followed by
git-annex updateproxy being run, to set up proxying. If someone is doing
that, they can restart their http server I suppose.
2024-11-20 13:22:25 -04:00
Joey Hess
254073569f
p2pHttpApp with a map of UUIDs to server states
This is early groundwork for making p2phttp support serving multiple
repositories from a single daemon.

So far only 1 repository is served still. And this commit breaks support
for proxying!
2024-11-20 12:51:25 -04:00
yarikoptic
4a47e6ec8e Added a comment 2024-11-20 00:22:44 +00:00
Joey Hess
b8a717a617
reuse http url password for p2phttp url when on same host
When remote.name.annexUrl is an annex+http(s) url, that uses the same
hostname as remote.name.url, which is itself a http(s) url, they are
assumed to share a username and password.

This avoids unnecessary duplicate password prompts.
2024-11-19 15:27:26 -04:00
Joey Hess
3510072883
update 2024-11-19 14:42:50 -04:00
Joey Hess
aaba82f3c8
comments 2024-11-19 14:26:47 -04:00
Joey Hess
6489342b71
tag INM7 2024-11-19 14:12:11 -04:00
Joey Hess
440b908732
comment 2024-11-19 13:12:43 -04:00
Joey Hess
8c11c06a31
skip git-remote-annex tests on windows
The NullSoftInstaller does not install git-remote-annex. For that
matter, it does not install git-annex-shell either. I don't know quite
how it would make sense to do so, without hard links.
It could contain 3 copies of the same binary.
2024-11-19 13:01:12 -04:00
Joey Hess
73950a6a0c
split git-remote-annex test 2024-11-19 12:54:23 -04:00
Joey Hess
6b92e143cc
retitle OSX bug 2024-11-19 12:46:01 -04:00
Joey Hess
df29f29e0d
git-remote-annex: Fix cloning from a special remote on a crippled filesystem
Not initializing and so deleting the bundles only causes a little more work
on the first git fetch.
2024-11-19 12:43:51 -04:00
Joey Hess
1ff54a3b44
add git-remote-annex as a dep of the test target 2024-11-19 12:13:13 -04:00