Commit graph

4251 commits

Author SHA1 Message Date
Joey Hess
5aad0cea83
Merge branch 'master' of ssh://git-annex.branchable.com 2023-07-05 11:54:43 -04:00
nobodyinperson
d250a51ec3 2023-07-03 13:45:36 +00:00
nobodyinperson
381e7b9bce 2023-07-03 11:08:36 +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
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
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
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
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
0b84c850fa
response 2023-06-28 13:26:06 -04:00
Joey Hess
da429a609c
todo 2023-06-28 13:23:37 -04:00
Joey Hess
55fef4fb81
confirmed 2023-06-26 11:51:48 -04:00
Joey Hess
75f3045b0a
comment and confirm 2023-06-26 11:12:32 -04:00
nobodyinperson
9112f0c184 2023-06-26 14:08:32 +00:00
nobodyinperson
c7309b30e9 2023-06-26 11:43:20 +00:00
jkniiv
4c84f464a4 Added a comment 2023-06-24 22:23:09 +00:00
jkniiv
77443df1b2 add a plea for saving the the old 'import /dir' interface as a renamed, reduced command 2023-06-24 22:04:35 +00:00
jkniiv
63f13d92cf add an inline comment about --fast vs. --no-content wrt. git-annex-import 2023-06-24 21:01:43 +00:00
Joey Hess
d105a6f93a
fix tag 2023-06-23 16:39:22 -04:00
Joey Hess
13b7208f65
already done 2023-06-23 16:35:49 -04:00
Joey Hess
8fc63cf156
expand and confirm 2023-06-23 16:31:54 -04:00
Joey Hess
f1714915b2
confirmed
(but I need them to tell me what errors of what special remotes need a
message-id)
2023-06-23 16:17:56 -04:00
Joey Hess
6774f0bf40
confirmed 2023-06-23 16:07:22 -04:00
Joey Hess
e42470fa60
confirmed 2023-06-23 15:53:28 -04:00
Joey Hess
5b1e8ba779
confirmed 2023-06-23 14:31:54 -04:00
Joey Hess
388804b785
thought 2023-06-23 14:30:37 -04:00
Joey Hess
941cd7cfaa
confirmed 2023-06-23 14:25:25 -04:00
Joey Hess
3b13609b93
thought this out more fully 2023-06-23 14:22:57 -04:00
Joey Hess
867a833624
todo work 2023-06-23 13:47:01 -04:00
Joey Hess
2f3a275b58
confirmed 2023-06-23 12:59:34 -04:00
Joey Hess
790e0083ed
comment 2023-06-23 12:54:55 -04:00
Joey Hess
e15ad92689
close 2023-06-23 12:41:32 -04:00
Joey Hess
5a257dba88
comment 2023-06-23 12:34:48 -04:00
Joey Hess
8d09207a2d
comment and update todo 2023-06-23 12:25:08 -04:00
Joey Hess
0da5e9730d
comment 2023-06-23 12:01:54 -04:00
Joey Hess
553962eb47
link comment to todo 2023-06-19 11:42:45 -04:00
Joey Hess
12fa697ca5
Merge branch 'master' of ssh://git-annex.branchable.com 2023-06-15 10:08:16 -04:00
Joey Hess
839fce9549
comment 2023-06-14 19:53:55 -04:00
Joey Hess
40b6155b7d
idea 2023-06-14 19:40:42 -04:00
nobodyinperson
73d400fe83 Added a comment 2023-06-12 21:12:29 +00:00
Joey Hess
6f0783d7a0
close bug report and improve docs that led to it being filed 2023-06-12 16:30:21 -04:00
Joey Hess
64738ea157
config: Added the --show-origin and --for-file options
* config: Added the --show-origin and --for-file options.
* config: Support annex.numcopies and annex.mincopies.

There is a little bit of redundancy here with other code elsewhere that
combines the various configs and selects which to use. But really only
for the special case of annex.numcopies, which is a git config that does
not override the annex branch setting and for annex.mincopies, which does
not have a git config but does have gitattributes settings as well as the
annex branch setting.

That seems small enough, and unlikely enough to grow into a mess that it was
worth supporting annex.numcopies and annex.mincopies in git-annex config
--show-origin. Because these settings are a prime thing that someone might
get confused about and want to know where they were configured.

And, it followed that git-annex config might as well support those two
for --set and --get as well. While this is redundant with the speclialized
commands, it's only a little code and it makes it more consistent.

Note that --set does not have as nice output as numcopies/mincopies
commands in some special cases like setting to 0 or a negative number.
It does avoid setting to a bad value thanks to the smart
constructors (eg configuredNumCopies).

As for other git-annex branch configurations that are not set by git-annex
config, things like trust and wanted that are specific to a repository
don't map to a git config name, so don't really fit into git-annex config.
And they are only configured in the git-annex branch with no local override
(at least so far), so --show-origin would not be useful for them.

Sponsored-by: Dartmouth College's DANDI project
2023-06-12 16:24:31 -04:00
Joey Hess
6b5af6a7f3
close weirdly time warped bug report 2023-06-12 12:51:50 -04:00