Commit graph

38051 commits

Author SHA1 Message Date
Joey Hess
2a7005a52f
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-15 16:30:22 -04:00
Joey Hess
929de3bb37
groundwork complete 2020-09-15 16:29:38 -04:00
Joey Hess
fcf5d11c63
add "input" field to json output
The use case of this field is mostly to support -J combined with --json.
When that is implemented, a user will be able to look at the field to
determine which of the requests they have sent it corresponds to.

The field typically has a single value in its list, but in some cases
mutliple values (eg 2 command-line params) are combined together and the
list will have more.

Note that json parsing was already non-strict, so old git-annex metadata
--json --batch can be fed json produced by the new git-annex and will
not stumble over the new field.
2020-09-15 16:22:44 -04:00
Joey Hess
2a3c2b1843
use Branch.name instead of hard coding the branch name
Makes much more clear why ActionItemOther is being passed "git-annex".
2020-09-15 15:47:22 -04:00
Joey Hess
3a05d53761
add SeekInput (not yet used)
No behavior changes (hopefully), just adding SeekInput and plumbing it
through to the JSON display code for later use.

Over the course of 2 grueling days.

withFilesNotInGit reimplemented in terms of seekHelper
should be the only possible behavior change. It seems to test as
behaving the same.

Note that seekHelper dummies up the SeekInput in the case where
segmentPaths' gives up on sorting the expanded paths because there are
too many input paths. When SeekInput later gets exposed as a json field,
that will result in it being a little bit wrong in the case where
100 or more paths are passed to a git-annex command. I think this is a
subtle enough problem to not matter. If it does turn out to be a
problem, fixing it would require splitting up the input
parameters into groups of < 100, which would make git ls-files run
perhaps more than is necessary. May want to revisit this, because that
fix seems fairly low-impact.
2020-09-15 15:41:13 -04:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
56c19a8da4 Added a comment 2020-09-15 13:34:48 +00:00
Joey Hess
a5d5935c0e
few more details 2020-09-14 20:00:54 -04:00
Joey Hess
ad9bb120f0
info gathered from irc 2020-09-14 19:52:49 -04:00
Joey Hess
5844a54869
aws-0.22 improved its support for setting etags, which improves support for versioned S3 buckets.
Remove placeholder version number I used when implementing the feature in
aws.

This commit was sponsored by Ethan Aubin.
2020-09-14 18:37:49 -04:00
Joey Hess
c87f73f638
point to commit that may fix this 2020-09-14 18:30:41 -04:00
Joey Hess
ddf963d019
deepseq all things returned from ResourceT http
Potentially fixes https://git-annex.branchable.com/bugs/concurrent_git-annex-copy_to_s3_special_remote_fails/
although I don't know if it does.

My thinking is, ResourceT may allocate a resource and then free it,
and a unforced thunk to that resource could result in reading memory
that has since been overwritten by something else, or in a SEGV,
depending. While that seems kind of like a bug in ResourceT to me, if it
is what's happening, this will avoid it. If it's not, this doesn't
really hurt much since the values are all smallish.

This commit was sponsored by Graham Spencer on Patreon.
2020-09-14 18:30:06 -04:00
Joey Hess
e26960752c
close as dup 2020-09-14 17:19:10 -04:00
Joey Hess
519aba2beb
close as dup 2020-09-14 17:15:54 -04:00
Joey Hess
c6e159550d
update 2020-09-14 16:57:47 -04:00
Joey Hess
a1accac084
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-14 13:12:40 -04:00
Sean Whitton
264e57c762
fix dist in latest NEWS entry
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
2020-09-14 12:05:12 -04:00
kyotov
b6d3c8a0af 2020-09-13 16:40:53 +00:00
Ilya_Shlyakhter
9f91f83b75 Added a comment: standalone build version oddity 2020-09-12 19:07:58 +00:00
falsifian
d2427daa5c clarify first fsck call gave no output 2020-09-12 15:50:18 +00:00
falsifian
1eac1c26bf 2020-09-12 15:43:49 +00:00
falsifian
2cedadf82a removed 2020-09-12 15:30:38 +00:00
falsifian
37abb540e9 Added a comment 2020-09-12 15:30:06 +00:00
falsifian
9fb8397936 Added a comment 2020-09-12 15:29:42 +00:00
Ilya_Shlyakhter
be59e433b4 Added a comment: updating the standalone distribution to 8.20200908 2020-09-12 15:20:21 +00:00
falsifian
6308af9cf5 2020-09-12 15:14:00 +00:00
falsifian
c3cd22877a removed 2020-09-12 03:52:07 +00:00
falsifian
320f918e9c removed 2020-09-12 03:51:52 +00:00
falsifian
7691d758bc Added a comment 2020-09-12 03:44:52 +00:00
falsifian
62fad04cce Added a comment: Can I actually add a requirement like "at least two copies stored offsite" without specifying a particular repo? 2020-09-12 03:36:03 +00:00
yarikoptic
175fe50a65 initial report on the stuck test on osx 2020-09-11 02:18:21 +00:00
Joey Hess
8955ac39f8
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-10 13:14:06 -04:00
Joey Hess
63d6cb27a9
thoughts 2020-09-10 13:13:39 -04:00
git@3af0a87771c4b55bee8a599b934914cd98d4bc0b
ee1722f7f8 Added a comment 2020-09-10 17:13:00 +00:00
Joey Hess
457036edf9
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-10 09:10:00 -04:00
Joey Hess
6813373490
todo 2020-09-10 09:08:40 -04:00
kyle
91f028fab7 Added a comment 2020-09-09 14:28:51 +00:00
git@3af0a87771c4b55bee8a599b934914cd98d4bc0b
cfc74c2f44 Added a comment: Re: Unknown remote type webdav 2020-09-09 10:19:25 +00:00
git@3af0a87771c4b55bee8a599b934914cd98d4bc0b
72f16a8fed Added a comment: Re: Unknown remote type webdav 2020-09-09 09:48:16 +00:00
Joey Hess
3a9d6a2e12
add news item for git-annex 8.20200908 2020-09-08 14:21:26 -04:00
Joey Hess
1a785d05c0
releasing package git-annex version 8.20200908 2020-09-08 14:20:47 -04:00
Joey Hess
dcaa1c1cc9
reorder 2020-09-08 12:54:17 -04:00
Joey Hess
6ea511beb4
Removed the S3 and WebDAV build flags
So these special remotes are always supported.

IIRC these build flags were added because the dep chains were a bit too
long, or perhaps because the libraries were not available in Debian stable,
or something like that. That was long ago, those reasons no longer apply,
and users get confused when builtin special remotes are not available, so
it seems best to remove the build flags now.

If this does cause a problem it can be reverted of course..

This commit was sponsored by Jochen Bartl on Patreon.
2020-09-08 12:42:59 -04:00
Joey Hess
17479e45ab
comment 2020-09-08 12:31:37 -04:00
Joey Hess
101401e473
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-08 12:26:12 -04:00
Joey Hess
efd2f1a918
avoid failure when gpgconf is not in path 2020-09-08 12:21:24 -04:00
Joey Hess
54404370e5
followup 2020-09-08 12:17:08 -04:00
git@3af0a87771c4b55bee8a599b934914cd98d4bc0b
dee38c54d9 Added a comment: Unknown remote type webdav 2020-09-08 13:19:51 +00:00
Joey Hess
62372ee052
resolvemerge: Improve cleanup of cruft left in the working tree by a conflicted merge
This commit was sponsored by Jake Vosloo on Patreon.
2020-09-07 16:50:27 -04:00
Joey Hess
0e21a3221e
clean up old code
withworktree is no longer doing anything useful so remove it
2020-09-07 16:16:15 -04:00
Joey Hess
03dee56546
revert change that broke test suite
Opened a new bug about it.

This commit was sponsored by Ethan Aubin.
2020-09-07 15:42:38 -04:00