Commit graph

43986 commits

Author SHA1 Message Date
Joey Hess
af27da1eba
comment 2023-07-05 16:54:52 -04:00
nobodyinperson
9d305081c4 Added a comment 2023-07-05 20:46:13 +00:00
Joey Hess
3d810726af
diffdriver --text support options for diff
Sponsored-by: KDM on Patreon
2023-07-05 15:43:29 -04:00
Joey Hess
4195acc012
remove redundant example
The paragraph just above already shows how to configure .gitattributes
and the necessary git config. So this is redundant. Also, it makes
.gitattributes match *, which is likely not a good idea because those
files are not likely to be all text files.
2023-07-05 15:05:23 -04:00
Joey Hess
b90d9aa990
move new video into feed 2023-07-05 14:54:21 -04:00
Joey Hess
a05bc6a314
Fix breakage when git is configured with safe.bareRepository = explicit
Running git config --list inside .git then fails, so better to only
do that when --git-dir was specified explicitly. Otherwise, when the
repository is not bare, run the command inside the working tree.

Also make init detect when the uuid it just set cannot be read and fail
with an error, in case git changes something that breaks this later.

I still don't actually understand why git-annex add/assist -J2 was
affected but -J1 was not. But I did show that it was skipping writing to
the location log, because the uuid was NoUUID.

Sponsored-by: Graham Spencer on Patreon
2023-07-05 14:43:14 -04:00
Joey Hess
321681cd1b
renamed bug 2023-07-05 14:09:21 -04:00
Joey Hess
9d2a7c4bb6
erk 2023-07-05 13:57:28 -04:00
Joey Hess
fe0e0c0523
also affects add 2023-07-05 13:42:52 -04:00
Joey Hess
3c1d18cb3b
assist: With --jobs, parallelize transferring content to/from remotes
Command.Add.seek starts concurrency with CommandStages. And for
Command.Sync, it needs TransferStages. So, to get both types of concurrency
for the two different parts, it either needs to change the type of
concurrency in between, or just call startConcurrency once for each.

It seems safe enough to call startConcurrency twice, because it does shut
down concurrency (mostly) at the end, and eg the old Annex.workers get
emptied.

Sponsored-by: unqueued on Patreon
2023-07-05 12:47:30 -04:00
Joey Hess
c2c2abe6ca
bug 2023-07-05 12:11:48 -04:00
Joey Hess
5aad0cea83
Merge branch 'master' of ssh://git-annex.branchable.com 2023-07-05 11:54:43 -04:00
Joey Hess
72e06cce1d
update 2023-07-05 11:49:25 -04:00
dud225@35a1ee469f82f3a7eb1f2dce4ad453f5e47bdfd3
3535be3f7a Added a comment: Disabling a special remote 2023-07-04 20:54:19 +00:00
nobodyinperson
583f87fdca 2023-07-04 18:49:01 +00:00
nobodyinperson
d250a51ec3 2023-07-03 13:45:36 +00:00
Yann Büchau
8baced5a7b
Add --text example to diffdriver man page 2023-07-03 13:20:18 +02:00
nobodyinperson
381e7b9bce 2023-07-03 11:08:36 +00:00
Joey Hess
ec45cae16f
fix suggestion to use enableremote 2023-07-02 15:01:02 -04:00
nobodyinperson
245c447883 Add link to Yann's talk to videos list 2023-07-01 22:21:42 +00:00
yarikoptic
d735bad076 initial report on annex sync odd behavior loosing my precious commit 2023-06-30 19:39:46 +00:00
nobodyinperson
5c1ee1907f Added a comment: WiFi without broadcasting 2023-06-30 07:56:03 +00:00
nobodyinperson
aa46805061 Added a comment: Thanks for git annex satisfy, numcopies question 2023-06-30 05:37:06 +00:00
Joey Hess
18923cd0f1
idea 2023-06-29 17:00:32 -04:00
Joey Hess
06f7345558
update 2023-06-29 15:40:37 -04:00
Joey Hess
86ea4356af
add a warning about --json not being self describing
It was a mistake for mirror to support --json, but that happened long
ago and it doesn't seem worth removing. I doubt anyone will use it.
2023-06-29 15:38:37 -04:00
Joey Hess
e1fc9e204e
added git-annex satisfy
This ended up having an interface like sync, rather than like get/copy/drop.
That let it be implemented in terms of sync, which took a lot less code.
Also, it lets it handle many of the edge cases that sync does, such as
getting files that are not visible in a --hide-missing branch, and sending
files to exporttree remotes.

As well as being easier to implement, `git-annex satisfy myremote` makes
sense as it satisfies the preferred content settings of the remote.
`git-annex satisfy somefile` does not form a sentence that makes sense. So
while -C can be a little bit annoying, it still makes sense to have this
syntax.

Note that, while I initially thought this would also satisfy numcopies, it
does not. Arguably it ought to. But, sync does not send files in order to
satisfy numcopies, it only sends files to satisfy preferred content. And
it's important that this transfer the same files as sync does, because
it will probably be used in a workflow where the user sometimes syncs and
sometimes satisfies, and does not expect satisfy to do things that sync
would not do.

(Also opened a new bug that also affects sync et all, not only this command.)

Sponsored-by: Nicholas Golder-Manning on Patreon
2023-06-29 15:34:53 -04:00
Joey Hess
1b9958f4fd
document git-annex satisfy 2023-06-29 14:15:01 -04:00
Joey Hess
946e52cbfd
idea 2023-06-29 13:59:00 -04:00
Joey Hess
4bf1690355
comments 2023-06-29 13:57:27 -04:00
Joey Hess
53ab91da2a
confirm 2023-06-29 13:44:52 -04:00
Joey Hess
cf51d1e247
fix syntax 2023-06-29 13:32:16 -04:00
Joey Hess
931d485f90
fix syntax 2023-06-29 13:31:27 -04:00
Joey Hess
42b381e4b2
tag todos potentially useful for datalad 2023-06-29 13:30:26 -04:00
nobodyinperson
0ccf436795 Added a comment: How about git annex transfer? 2023-06-29 05:25:50 +00:00
nobodyinperson
265afbd599 Added a comment 2023-06-29 05:20:56 +00:00
pat
63e116768c 2023-06-29 04:45:15 +00:00
jkniiv
ac11b3ac0e for some reason I couldn't add a page comment so had to resort to an inline comment 2023-06-28 22:26:04 +00:00
nobodyinperson
720602b351 Added a comment: Awesome, thanks! 2023-06-28 21:09:51 +00:00
Joey Hess
d5c6197791
diffdriver: Added --text option for easy diffing of the contents of annexed text files
This was already possible, but it was rather hard to come up with the
complex shell command needed.

Note that the diff output starts with "diff a/... b/...".
I left off the "--git" because it's not a git format diff.
2023-06-28 15:27:16 -04:00
Joey Hess
2c18fc1d60
fix quoting in example 2023-06-28 14:44:42 -04:00
Joey Hess
a621b441d9
comment 2023-06-28 13:36:49 -04:00
Joey Hess
0b84c850fa
response 2023-06-28 13:26:06 -04:00
Joey Hess
da429a609c
todo 2023-06-28 13:23:37 -04:00
Joey Hess
fbd4dbaafe
fix some typos
Anarcat fixed these in the news file, so transferred it over
2023-06-28 13:15:06 -04:00
Joey Hess
6c4fbb2b1e
comment 2023-06-28 13:14:11 -04:00
Joey Hess
c61ecb946b
response 2023-06-28 13:08:12 -04:00
Joey Hess
e361efb958
remove dead link 2023-06-27 20:02:11 -04:00
Joey Hess
d9e7a7db07
Merge branch 'master' of ssh://git-annex.branchable.com 2023-06-27 20:01:25 -04:00
Joey Hess
549d390d03
display drop from remote more consistently
With eg copy --to remote

This is particularly an improvement in sync --content output, which
mixes the two, so it's nice to have consistent display.
2023-06-27 19:01:33 -04:00