Commit graph

34586 commits

Author SHA1 Message Date
Joey Hess
354c0eb57f
support standard and groupwanted in keyless mode
Only when the preferred content expression includes them will a parse
failure due to them needing keys result in the preferred content
expression not parsing in keyless mode.
2019-05-14 14:59:03 -04:00
Joey Hess
5266da2cdd
docs for importing preferred content 2019-05-14 14:43:51 -04:00
Joey Hess
156069f621
Merge branch 'master' into preferred 2019-05-14 14:29:49 -04:00
Joey Hess
f29da41367
fix man page formatting 2019-05-14 14:29:40 -04:00
Joey Hess
9411a7c93c
matching preferred content before key is known
This will let import try to match preferred content expressions before
downloading the content and generating its key.

If an expression needs a key, it preferredContentParser with
preferredContentKeylessTokens will fail to parse it.

standard and groupwanted are not in preferredContentKeylessTokens
because they may refer to an expression that refers to a key.
That needs further work to support them.
2019-05-14 14:28:23 -04:00
Joey Hess
aa7710982b
avoid list lookup by parseToken
Minor optimisation to parsing of a preferred content expression.
2019-05-14 13:11:29 -04:00
Joey Hess
c1957b6aeb
whitespace 2019-05-14 13:01:50 -04:00
Joey Hess
5cc0ee70c0
factor out MatchFiles Annex
This makes parseToken more general
2019-05-14 12:44:50 -04:00
Joey Hess
a3e24ed533
more design work 2019-05-14 11:49:23 -04:00
Joey Hess
c5a61ee808
closing in on final design for this 2019-05-14 10:52:00 -04:00
Joey Hess
2209a21b5e
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-14 10:51:40 -04:00
Ilya_Shlyakhter
0610789285 Added a comment: checksums of remote data 2019-05-13 22:03:38 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
4c7f38fc2c 2019-05-12 17:02:07 +00:00
ndj
d45dbd678c 2019-05-11 18:33:25 +00:00
Joey Hess
fa070df373
fix usage 2019-05-10 14:52:52 -04:00
Joey Hess
0c7569bb6f
close 2019-05-10 13:59:39 -04:00
Joey Hess
c77d79d343
close old todo 2019-05-10 13:54:32 -04:00
Joey Hess
ae562ad4d7
update old todo item with what still needs doing
removed old comments that are no longer relevant
2019-05-10 13:52:40 -04:00
Joey Hess
daa0c6c1c6
close old todo 2019-05-10 13:35:55 -04:00
Joey Hess
d32143e7ad
close 2019-05-10 13:34:44 -04:00
Joey Hess
ccfb800fa6
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-10 13:31:49 -04:00
Joey Hess
82186ca58f
annex.jobs=cpus etc
Added the ability to run one job per CPU (core), by setting annex.jobs=cpus,
or using option --jobs=cpus or -Jcpus.

Built with future expansion in mind, including not defaulting matching on
Concurrency so more constructors can later be added, and using "cpu"
instead of "0".
2019-05-10 13:27:08 -04:00
Joey Hess
459bbd9005
update roadmap 2019-05-10 12:35:14 -04:00
CandyAngel
0076e9fa03 2019-05-10 11:29:10 +00:00
Ilya_Shlyakhter
e0c73c7f29 Added a comment 2019-05-09 21:07:39 +00:00
yarikoptic
a022f42ab2 new issue on inability to access ftp urls forwarded to from http URL 2019-05-09 20:42:34 +00:00
Ilya_Shlyakhter
63f6389e64 problem with multi-threaded copying to an S3 remote. 2019-05-09 03:00:34 +00:00
strmd
aa66648d2f Added a comment 2019-05-08 17:23:24 +00:00
Joey Hess
31b80132b3
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-08 10:48:59 -04:00
Joey Hess
e35f96aea9
Makefile: Added install-completions to install target. 2019-05-08 10:48:38 -04:00
quzhengrobot@6237b7730f478778d064c18a5a314535129357dd
dff0a44287 Added a comment: Android - gitlab repo 2019-05-08 11:35:04 +00:00
Joey Hess
8b44548d0e
comment 2019-05-07 13:20:03 -04:00
Joey Hess
aaeb85361c
Merge branch 'wip' 2019-05-07 13:07:45 -04:00
Joey Hess
0dead2d6ec
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 13:06:30 -04:00
Joey Hess
7264863a01
add news item for git-annex 7.20190507 2019-05-07 13:06:14 -04:00
Joey Hess
6eaa0af42f
releasing package git-annex version 7.20190507 2019-05-07 13:05:52 -04:00
Joey Hess
2d33122215
avoid ingest lockdown file escaping the withOtherTmp call
Fixes bug that caused git-annex to fail to add a file when another
git-annex process cleaned up the temp directory it was using.

Solution is just to push withOtherTmp out to a higher level, so that
the whole ingest process can be completed inside it.

But in the assistant, that was not practical to do, since withOtherTmp runs
in the Annex monad and the assistant does not. Worked around by introducing
a separate temp directory that only the assistant uses for lockdown.
Since only one assistant can run at a time, it's easy to clean up that
directory of old cruft at startup.
2019-05-07 13:04:57 -04:00
Ilya_Shlyakhter
cc7c20f428 Added a comment 2019-05-07 16:53:10 +00:00
Joey Hess
f98e97669e
comment 2019-05-07 12:10:03 -04:00
Joey Hess
eb592a1f20
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:08:30 -04:00
Joey Hess
d6198442ce
comment 2019-05-07 12:08:07 -04:00
Ilya_Shlyakhter
6d5ba46776 Added a comment 2019-05-07 16:04:58 +00:00
Joey Hess
7da721e356
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:04:19 -04:00
Joey Hess
2a41712ef1
avoid stageJournal escaping withOtherTmp
This is only done for correctness sake; I don't see any way that it
would have caused a problem here. The jlog file escaped withOtherTmp
so another process could swoop in and delete it, but the file is only
used as a buffer for a list of filenames, and its handle gets rewound
and they're read back out, which will still work even if it's already
been deleted.

The only reason I didn't just pre-delete the file and keep the handle
open is I'm not sure that works on all OS's (eg Windows). If there was
a problem that this fixed it might involve an OS that doesn't support
deleting an open file or something like that.
2019-05-07 11:57:12 -04:00
Ilya_Shlyakhter
d46b916f3b Added a comment 2019-05-07 15:50:52 +00:00
Joey Hess
ce83783fcc
bug report 2019-05-07 11:40:45 -04:00
Joey Hess
09c2516487
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 11:21:30 -04:00
Joey Hess
5c217449cc
comment 2019-05-07 11:21:18 -04:00
Joey Hess
37ce10098c
comment 2019-05-07 11:12:00 -04:00
Ilya_Shlyakhter
5638ae9688 Added a comment 2019-05-07 00:59:31 +00:00