Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2023-03-08 12:17:40 -04:00
commit 59adf4309c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 155 additions and 0 deletions

View file

@ -0,0 +1,40 @@
### Please describe the problem.
For the past few days consistently
```
496 T Mar 06 GitHub Actions *-4.4* (4.8K/0) datalad/git-annex daily summary: 14 PASSED, 3 FAILED, 5 INCOMPLETE
935 T Mar 05 GitHub Actions *-4.3* (4.8K/0) datalad/git-annex daily summary: 14 PASSED, 3 FAILED, 5 INCOMPLETE
1471 N T Mar 04 GitHub Actions *-1.9* (4.8K/0) datalad/git-annex daily summary: 15 PASSED, 2 FAILED, 5 INCOMPLETE
1704 T Mar 03 GitHub Actions *-0.9* (4.8K/0) datalad/git-annex daily summary: 15 PASSED, 2 FAILED, 5 INCOMPLETE
2619 T Mar 01 GitHub Actions *-3.1* (6.5K/0) datalad/git-annex daily summary: 30 PASSED
2935 O T Feb 28 GitHub Actions *-3.8* (6.5K/0) datalad/git-annex daily summary: 30 PASSED
```
[sample build on OSX](https://github.com/datalad/git-annex/actions/runs/4320138939/jobs/7540059666) says
```
Utility/RawFilePath.hs:40:1: error:
Could not load module System.Posix.Files.ByteString
It is a member of the hidden package unix-2.7.2.2.
You can run :set -package unix to expose it.
(Note: this unloads all the modules in the current scope.)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
|
40 | import System.Posix.Files.ByteString
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Utility/RawFilePath.hs:41:1: error:
Could not load module System.Posix.Directory.ByteString
It is a member of the hidden package unix-2.7.2.2.
You can run :set -package unix to expose it.
(Note: this unloads all the modules in the current scope.)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
|
41 | import qualified System.Posix.Directory.ByteString as D
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
```
[[!meta author=yoh]]
[[!tag projects/datalad]]

View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="hurlebouc"
avatar="http://cdn.libravatar.org/avatar/bda734a6d937c1fe0c9778a6eaefffbc"
subject="comment 5"
date="2023-03-08T15:11:26Z"
content="""
Hi, and thank you for keeping anwsering my question!
I do succeed in reading this file. And here is the content:
sqlite> .dump
PRAGMA foreign_keys=OFF;
BEGIN TRANSACTION;
CREATE TABLE IF NOT EXISTS \"associated\"(\"id\" INTEGER PRIMARY KEY,\"key\" BLOB NOT NULL,\"file\" BLOB NOT NULL,CONSTRAINT \"key_file_index\" UNIQUE (\"key\",\"file\"),CONSTRAINT \"file_key_index\" UNIQUE (\"file\",\"key\"));
CREATE TABLE IF NOT EXISTS \"content\"(\"id\" INTEGER PRIMARY KEY,\"key\" BLOB NOT NULL,\"inodecache\" VARCHAR NOT NULL,\"filesize\" VARCHAR NOT NULL,\"mtime\" INTEGER NOT NULL,CONSTRAINT \"key_inode_cache_index\" UNIQUE (\"key\",\"inodecache\"),CONSTRAINT \"inode_cache_key_index\" UNIQUE (\"inodecache\",\"key\"));
COMMIT;
sqlite>
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="hurlebouc"
avatar="http://cdn.libravatar.org/avatar/bda734a6d937c1fe0c9778a6eaefffbc"
subject="comment 6"
date="2023-03-08T15:16:28Z"
content="""
Problem identified!
The directory `repo` was actually containing \"é\" char. When I remove this char, problem disapeared.
"""]]

View file

@ -0,0 +1,53 @@
### Please describe the problem.
```
(dandisets) dandi@drogon:/mnt/backup/dandi/dandizarrs/27964c5b-6ccd-4e23-a67d-a535282bab34$ git annex whereis 0/0/0/13/2/12 | head
whereis 0/0/0/13/2/12 (1 copy)
00000000-0000-0000-0000-000000000001 -- web
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/0/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/1/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/10/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/11/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/12/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/13/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/14/0
(dandisets) dandi@drogon:/mnt/backup/dandi/dandizarrs/27964c5b-6ccd-4e23-a67d-a535282bab34$ time git annex copy --from web --to dandi-dandizarrs-dropbox 0/0/0/13/2/12
copy 0/0/0/13/2/12 (from web...) (to dandi-dandizarrs-dropbox...) ok
real 0m0.366s
user 0m0.104s
sys 0m0.042s
(dandisets) dandi@drogon:/mnt/backup/dandi/dandizarrs/27964c5b-6ccd-4e23-a67d-a535282bab34$ git annex whereis 0/0/0/13/2/12 | head
whereis 0/0/0/13/2/12 (1 copy)
00000000-0000-0000-0000-000000000001 -- web
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/0/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/1/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/10/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/11/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/12/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/13/0
web: https://api.dandiarchive.org/api/zarr/27964c5b-6ccd-4e23-a67d-a535282bab34.zarr/0/0/0/1/14/0
(dandisets) dandi@drogon:/mnt/backup/dandi/dandizarrs/27964c5b-6ccd-4e23-a67d-a535282bab34$ git annex list 0/0/0/13/2/12
here
|github
||dandiapi
|||web
||||bittorrent
|||||dandi-dandizarrs-dropbox (untrusted)
||||||
__XX__ 0/0/0/13/2/12
```
I would expect `copy` to make a record locally that now the content is also on destination remote, so 2nd invocation of `copy --from ... --to ... --auto` does nothing.
### What version of git-annex are you using? On what operating system?
```
10.20230227-gb02b9cc Debian GNU/Linux
```
[[!meta author=yoh]]
[[!tag projects/dandi]]

View file

@ -0,0 +1,33 @@
### Please describe the problem.
ref: [https://github.com/datalad/datalad/issues/7173#issuecomment-1314968568](https://github.com/datalad/datalad/issues/7173#issuecomment-1314968568)
```
mkdir "/tmp/new
dquote> line"
cd "/tmp/new
line"
git init
Initialized empty Git repository in /tmp/new
line/.git/
git annex init
init ok
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
fatal: Cannot open '/tmp/new': No such file or directory
git-annex: fd:19: Data.ByteString.hGetLine: end of file
git annex version
git-annex version: 10.20230214+git26-g8f2829e646-1~ndall+1
```
as `git` doesn't mind, and now annex batched commands support `-z` already for filenames with newlines in them, I think git-annex should tolerate repository folders with newlines in them too.