Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-04-29 13:59:30 -04:00
commit ecdc08dbe1
3 changed files with 61 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2011-04-29T15:24:56Z"
content="""
If `tahoe ls` outputs only the key, on its own line, and exits nonzero if it's not present, then I think you did the right thing.
To remove a file, use `git annex move file --from tahoe` and then you can drop it locally.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 3"
date="2011-04-29T15:33:24Z"
content="""
@justin, I discovered that \"git annex describe\" did what I wanted
@joey, yep that is the behaviour of \"tahoe ls\", thanks for the tip on removing the file from the remote.
It seems to be working okay for now, the only concern is that on the remote everything is dumped into the same directory, but I can live with that, since I want to track biggish blobs and not lots of small little files.
"""]]

View file

@ -0,0 +1,39 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 4"
date="2011-04-29T16:17:11Z"
content="""
I've just tried to use the ANNEX_HASH_ variables, example of my configuration
<pre>
git config annex.tahoe-store-hook 'tahoe mkdir $ANNEX_HASH_1 && tahoe put $ANNEX_FILE tahoe:$ANNEX_HASH_1/$ANNEX_KEY'
git config annex.tahoe-retrieve-hook 'tahoe get tahoe:$ANNEX_HASH_1/$ANNEX_KEY $ANNEX_FILE'
git config annex.tahoe-remove-hook 'tahoe rm tahoe:$ANNEX_HASH_1/$ANNEX_KEY'
git config annex.tahoe-checkpresent-hook 'tahoe ls tahoe:$ANNEX_HASH_1/$ANNEX_KEY 2>&1 || echo FAIL'
git annex initremote library type=hook hooktype=tahoe encryption=none
git annex describe 1d1bc312-7243-11e0-a9ce-5f10c0ce9b0a library
</pre>
It's seems to work quite well for me now, I did run across this when I tried to drop a file locally, leaving the file on my remote
<pre>
jtang@x00:/tmp/annex3 $ git annex drop .
drop frink.sh (checking library...) (unsafe)
Could only verify the existence of 0 out of 1 necessary copies
Try making some of these repositories available:
1d1bc312-7243-11e0-a9ce-5f10c0ce9b0a -- library
(Use --force to override this check, or adjust annex.numcopies.)
failed
drop t/frink.jar (checking library...) (unsafe)
Could only verify the existence of 0 out of 1 necessary copies
Try making some of these repositories available:
1d1bc312-7243-11e0-a9ce-5f10c0ce9b0a -- library
(Use --force to override this check, or adjust annex.numcopies.)
failed
git-annex: 2 failed
1|jtang@x00:/tmp/annex3 $
</pre>
I do know that the files exist in my library as I have just inserted them, it seemed to work when I didnt have the hashing, it appears that the checkpresent doesn't seem to pass the ANNEX_HASH_* variables (from the limited debugging I did)
"""]]