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

This commit is contained in:
Joey Hess 2017-02-15 13:56:01 -04:00
commit 5e16a918ee
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 109 additions and 0 deletions

View file

@ -0,0 +1,61 @@
### Please describe the problem.
**git annex checkpresentkey --batch $remote** doesn't check all the keys it is provided with.
Depending how this is run, given 8000 keys, it may return info only the first handful or ~97.
### What steps will reproduce the problem?
The directory contains 8000 symlinks whose filename is the same as their key. The content is not in 'spearmint' (or any other configured remotes, but is present 'here').
$ find . -type l -printf "%f\n" | git annex checkpresentkey --batch | wc -l
8000
$ find . -type l -printf "%f\n" | git annex checkpresentkey --batch spearmint | wc -l
97
$ find . -type l -printf "%f\n" | git annex checkpresentkey --batch spearmint | wc -l
97
Without a remote, all get checked..
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch | wc -l
8000
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch | sort | uniq -c
8000 0
Specifying a remote only checks a small handful of keys (count changes each time)..
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch spearmint | wc -l
6
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch spearmint | wc -l
14
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch spearmint | wc -l
7
$ git annex find --format '${key}\n' . | git annex checkpresentkey --batch spearmint | wc -l
8
Putting the keys into a file seems to make this more consistent (more in line with *find -type f*)
$ git annex find --format '${key}\n' . > /tmp/keys.txt
$ cat /tmp/keys.txt | git annex checkpresentkey --batch spearmint | wc -l
96
$ cat /tmp/keys.txt | git annex checkpresentkey --batch spearmint | wc -l
96
Shuffling the key order doesn't matter much either..
$ shuf /tmp/keys.txt | git annex checkpresentkey --batch spearmint | wc -l
97
$ shuf /tmp/keys.txt | git annex checkpresentkey --batch spearmint | wc -l
96
$ shuf /tmp/keys.txt | git annex checkpresentkey --batch spearmint | wc -l
97
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20161231-g8740cd971
Arch Linux (installed from 'community')
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
I only find (what I think are) bugs because I use it and I use it because I like it. I like it because it works (except for when I find actual bugs :]).

View file

@ -0,0 +1,40 @@
[[!comment format=mdwn
username="lasitus"
avatar="http://cdn.libravatar.org/avatar/dfe778f28027aeb75876172022aa5de3"
subject="comment 5"
date="2017-02-15T02:17:25Z"
content="""
Got a decent result this last run:
Console output
```
[2017-02-14 20:40:25.3493472] logging to .git\annex\daemon.log
[2017-02-14 20:40:25.3493472] chat: C:\Program Files (x86)\Git\usr\bin\git-annex.exe [\"assistant\",\"--debug\"]
[2017-02-14 20:47:21.2931135] process done ExitFailure 1
```
daemon.log ending
```
[2017-02-14 20:47:17.4915947] process done ExitSuccess
[2017-02-14 20:47:19.7279831] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"symbolic-ref\",\"-q\",\"HEAD\"]
[2017-02-14 20:47:19.7436092] process done ExitSuccess
[2017-02-14 20:47:19.7436092] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"show-ref\",\"refs/heads/annex/direct/master\"]
[2017-02-14 20:47:19.7748596] process done ExitSuccess
[2017-02-14 20:47:19.7748596] Pusher: pushing to [Remote { name =\"origin\" }]
[2017-02-14 20:47:19.8217363] Committer: queued Upload UUID \"b77aaec0-e75b-4eec-a08c-b09cbe2947d5\" LR Main\LR Main Smart Previews.lrdata\1\117C\117C0B4F-1D99-4DF6-9E7B-7C0B655876D9.dng Nothing : new file created
[2017-02-14 20:47:19.8529873] call: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"push\",\"origin\",\"+git-annex:synced/git-annex\",\"annex/direct/master:synced/master\"]
[2017-02-14 20:47:19.9154902] Transferrer: Transferring: Upload UUID \"b77aaec0-e75b-4eec-a08c-b09cbe2947d5\" LR Main\LR Main Smart Previews.lrdata\1\117C\117C0B4F-1D99-4DF6-9E7B-7C0B655876D9.dng Nothing
[2017-02-14 20:47:19.9154902] Watcher: add LR Main\LR Main Smart Previews.lrdata\1\162B\162B90D0-CC7C-4BD9-AC2B-BA2D4C72B555.dng
117C0B4F-1D99-4DF6-9E7B-7C0B655876D9.dng
1,792,000 100% 152.52MB/s 0:00:00 (xfr#1, to-chk=0/1)
git-annex.exe: out of memory
(recording state in git...)
To storage.lan:/srv/annex/pictures
0623558..669c99c git-annex -> synced/git-annex
6309934..b8e043d annex/direct/master -> synced/master
```
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="lasitus"
avatar="http://cdn.libravatar.org/avatar/dfe778f28027aeb75876172022aa5de3"
subject="comment 6"
date="2017-02-15T16:01:38Z"
content="""
Note: The last run was the Windows side
"""]]