Commit graph

44095 commits

Author SHA1 Message Date
Joey Hess
1f811c340d
kinda a bug 2023-12-05 16:43:14 -04:00
Joey Hess
b4cd985a3e
remove xmpp from special remotes list
It's documentation for something that was removed, so avoid it getting
copied into eg, nice talks about git-annex. ;-)
2023-12-05 16:30:47 -04:00
Joey Hess
1a586f80e6
remove debug print 2023-12-05 15:56:58 -04:00
Joey Hess
10964f91bc
further thoughts 2023-12-05 15:00:22 -04:00
Joey Hess
ede36eeb86
Merge branch 'master' of ssh://git-annex.branchable.com 2023-12-05 13:38:01 -04:00
Joey Hess
68ea9d5a25
comment 2023-12-05 13:37:34 -04:00
nobodyinperson
2efef85bd0 Add link to English re-recording of Yann's git-annex workshop kickoff talk @Tübix2023 2023-12-05 17:18:50 +00:00
Joey Hess
63f940f591
Revert "update"
This reverts commit 6f4e3cc881.
2023-12-05 12:39:33 -04:00
Joey Hess
6f4e3cc881
update 2023-12-05 12:39:17 -04:00
Joey Hess
a6eb7d7339
prevent relatedTemplate from truncating a filename to end in "."
Avoid a problem with temp file names ending in "." on certian filesystems
that have problems with such filenames.

relatedTemplate is quite an ugly hack really; since it doesn't know the max
filename length of the filesystem it can only assume that the filename is
max allowed length. When given the input "lh.aparc.DKTatlas.annot", it
wants to reserve 20 characters for tempfile so it truncates to "lh.". That
ending period is apparently a problem on some filesystem (FAT eats it, but
does not throw EINVAL; ntfs does not seem bothered by it, I don't know what
FUSE filesystem the bug reporter was really using).

Sponsored-by: Brett Eisenberg on Patreon
2023-12-05 12:38:14 -04:00
Joey Hess
9aa53212a9
Merge branch 'master' of ssh://git-annex.branchable.com 2023-12-05 12:10:46 -04:00
cjmarkie
545f3873ca No change. Just subscribing to comments. 2023-12-05 16:04:46 +00:00
cjmarkie
f6f4ba3c6c 2023-12-05 14:54:11 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/mvhulten
9a9d99efeb 2023-12-05 14:10:07 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/mvhulten
5d22ccc584 rename forum/name_resolution_of___33__dne__33___fails.mdwn to forum/name_resolution_of_dne.mdwn 2023-12-05 14:08:52 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/mvhulten
8c55d65987 rename forum/dne.mdwn to forum/name_resolution_of___33__dne__33___fails.mdwn 2023-12-05 14:07:57 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/mvhulten
8ee111cd8e 2023-12-05 14:05:08 +00:00
brendan.ward@a2e11ad27f6b2fa2c556aea6811496e0d95dd0da
b34d9b1405 Added a comment 2023-12-05 03:24:29 +00:00
kolam
3e6dba097e 2023-12-04 19:32:28 +00:00
Joey Hess
ecebb00a23
Merge branch 'master' of ssh://git-annex.branchable.com 2023-12-04 13:52:59 -04:00
Joey Hess
383c9833a3
comment 2023-12-04 13:52:51 -04:00
nobodyinperson
9906e8fd4c Added a comment: How about a --offline flag? 2023-12-04 17:52:44 +00:00
Joey Hess
0485dd3161
sync: Fix locking problems during merge when annex.pidlock is set
Presumably git merge sometimes needs to verifiy if a worktree file is
modified, and so will then run git-annex filter-process which would try to
take the pid lock. And for whatever reason, git-annex sync already had the
pidlock held. I have not replicated that, but it does make enough sense to
deploy the workaround.

Like I said back in commit 7bdb0cdc0d,

   Arguably, it would be better to have a way to make any process git-annex
   runs have the env var set. But then it would need to take the pid lock
   when running any and all processes, and that would be a problem when
   git-annex runs two processes concurrently. So, I'm left doing it ad-hoc
   in places where git-annex really does run a child process, directly
   or indirectly via a particular git command.

Sponsored-by: KDM on Patreon
2023-12-04 13:40:28 -04:00
Joey Hess
37ff9b6401
comment 2023-12-04 13:03:16 -04:00
Joey Hess
3549984cac
comment 2023-12-04 12:49:25 -04:00
Joey Hess
458b3d8e52
Merge branch 'master' of ssh://git-annex.branchable.com 2023-12-04 11:15:25 -04:00
Joey Hess
fd0b510573
improve message about 1 copy
"Could only verify the existence of 0 out of 1 necessary copy"
does not sound right, but neither does it with "copies".

Kept the "1" rather than "only" or such since numcopies is mentioned.

Sponsored-by: Brock Spratlen on Patreon
2023-12-04 11:12:54 -04:00
kdm9
39fed07289 Added a comment 2023-12-04 10:09:16 +00:00
brendan.ward@a2e11ad27f6b2fa2c556aea6811496e0d95dd0da
49374fd9c6 2023-12-04 06:43:03 +00:00
brendan.ward@a2e11ad27f6b2fa2c556aea6811496e0d95dd0da
4e7f4441bc 2023-12-04 06:41:28 +00:00
Atemu
a0540498b4 Added a comment 2023-12-03 21:11:19 +00:00
branch
9eee11d7a8 Added a comment 2023-12-03 11:57:56 +00:00
kdm9
92f37d0d49 new pidlock bug 2023-12-03 10:16:43 +00:00
kolam@976e5fa601b60de70b53dad291714218fd749169
98a0623ab6 rename forum/Can__39__t_access_file_from_secondary_client.mdwn to forum/client_repositories_setup_problem.mdwn 2023-12-02 19:06:00 +00:00
kolam@976e5fa601b60de70b53dad291714218fd749169
a055cb76ca 2023-12-02 18:16:00 +00:00
Joey Hess
edf31a2ebc
update 2023-12-01 15:01:45 -04:00
Joey Hess
5c4ce1353e
comment 2023-12-01 14:42:55 -04:00
Joey Hess
ce9f909ee9
Merge branch 'master' of ssh://git-annex.branchable.com 2023-12-01 13:50:01 -04:00
Joey Hess
1d020df896
git-annex branch size when storing migration information
Sponsored-by: Jack Hill on Patreon
2023-12-01 13:09:52 -04:00
nobodyinperson
381e316e29 Added a comment: Another possibility to make --fast faster? 2023-12-01 11:50:25 +00:00
Atemu
398da4f6ab Added a comment 2023-12-01 10:21:10 +00:00
unqueued
1f7b2ce2c0 Added a comment 2023-12-01 02:09:07 +00:00
Joey Hess
d37219e3e5
comment 2023-11-30 17:07:17 -04:00
Joey Hess
3e8618fed3
comment 2023-11-30 16:49:48 -04:00
Joey Hess
093110d997
Merge branch 'master' of ssh://git-annex.branchable.com 2023-11-30 16:36:50 -04:00
Joey Hess
1e31bf8122
copy/move --from-anywhere --to remote
Implementation was simple because it's equivilant to
--from=foo --to remote for each other remote, followed by
--to remote when there's a local copy.

(Or, in the edge case of --from-anywhere --to=here,
it's the same as --to=here.)

Note that, when the local repo does not have a copy,
fromToPerform gets it from a remote, sends it to the destination,
and drops the local copy. Another call to that for a second remote
will notice that the dest now has a copy, and simply drop from the
second remote, avoiding a second transfer.

Also note that, when numcopies doesn't allow dropping it from
everywhere, it will drop it from the cheapest remotes first
(maybe not ideal) up to more expensive remotes, and finally from the local
repo. So the local repo will generally end up holding a copy. Maybe not
ideal in all cases either, but it seems no worse to do that than to end up
with a copy undropped from a remote.

And I'm not entirely happy with the output, eg:

	copy bigfile (from r3...) ok
	copy bigfile ok

That makes sense if you think of the second line as being
the same as what is output by `git-annex copy bigfile --to bar`,
but it's less clear in this context. Maybe add "(from here...)"?
Also the --json output doesn't have a machine-readable field for
the "from" uuid, and maybe it should?

Sponsored-by: Dartmouth College's DANDI project
2023-11-30 16:34:30 -04:00
Joey Hess
1654572bc1
fix --from overriding annex-ignore
Make git-annex get/copy/move --from foo override configuration of
remote.foo.annex-ignore, as documented.

This already worked for remotes supporting hasKeyCheap. For others though,
git-annex copy --from foo would silently not do anything, while
git-annex copy --to foo would use the annex-ignored remote.

Also improved the annex-ignore docs, to reflect that `git-annex get`
without --from will skip using annex-ignored remotes, for example.

Sponsored-by: Dartmouth College's DANDI project
2023-11-30 15:12:07 -04:00
nobodyinperson
1bb1a66255 Added a comment 2023-11-30 06:51:54 +00:00
unqueued
f89def74e4 2023-11-30 05:06:06 +00:00
unqueued
c108fe91bb 2023-11-30 04:52:51 +00:00