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

This commit is contained in:
Joey Hess 2014-05-19 13:07:03 -04:00
commit ff6ac90138
14 changed files with 138 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 6"
date="2014-05-19T17:06:30Z"
content="""
See [[git-annex_auto_upgrade_is_redundant]] for analysis of this problem.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 3"
date="2014-05-19T16:44:19Z"
content="""
When the assistant wants to download a file, it queues a transfer from all remotes that are known to have the file, with the lowest cost remotes first. If it fails to get the file from the lowest cost remote, it automatically falls back to the next lowest cost, and so on.
If there's a bug here, I'd suspect strongly it's due to having 2 remotes with the same UUID.
Yes, I think I've found it. Assistant.TransferSlots.genTransfer calls performTransfer, which is passed only the Transfer, not the Remote. So it then looks up a remote with the UUID from the Transfer. To fix this, I will need to adjust the transferkeys command's protocol to include the name of the remote that should be used.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 2"
date="2014-05-19T17:04:16Z"
content="""
Direct mode and indirect mode behave the same here -- in indirect mode, if you unlock and modify a file, whereis will show the location of the annexed file, not the un-added version. In general all git-annex commands except of course `add` and `status` operate on the files that are staged in the index or committed, not un-staged files in the work tree. This is consistent with git's own behavior.
It is true that in direct mode, whereis will say that a file that has been modified is present locally, even though the modification has changed the only local copy of the file -- so it's not actually present locally. However, I don't think it makes sense to make whereis check if the file is actually still locally present before showing it is. whereis shows location tracking information, which can be out of date for many reasons.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 4"
date="2014-05-19T16:28:01Z"
content="""
I can reproduce this problem on OSX.
I've only gotten as far as seeing that the gcrypt repository never gets initialized as a git repository. It has a config file, but no objects are ever pushed to it. This is why gcrypt sees no repository there in subsequent runs.
This is a bug in gcrypt, so filed: <https://github.com/blake2-ppc/git-remote-gcrypt/issues/15>
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 2"
date="2014-05-19T15:47:19Z"
content="""
I don't feel comfortable prompting for gpg passphrases in the webapp. See [[gpgkeys]] for thoughts on this.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 8"
date="2014-05-19T16:48:09Z"
content="""
4.20130815 is too old. Get a current version.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 1"
date="2014-05-19T15:41:05Z"
content="""
`git annex drop --auto` *does* automatically drop files that are not wanted, according to your preferred content settings.
If your preferred content for a repo is `metadata=tag=done`, then only files tagged \"done\" will be kept in the repository.
Of course, files are only dropped if enough other copies can be verified to exist in other repositories..
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 3"
date="2014-05-19T15:45:57Z"
content="""
There is not currently any UI to do git-annex get/drop.
There is some recent work on [[tips/file_manager_integration]] which lets you use a file manager and pick files you want and files to drop. Nobody has gotten it working with android file manager yet AFAIK.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 4"
date="2014-05-19T15:38:14Z"
content="""
No, box.com cannot decrypt your files, because the git repository is not stored on box.com.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 15"
date="2014-05-19T15:43:52Z"
content="""
Since version 5.20140517, the git-annex assistant will automatically clean up stale tmp files on startup.
If not using the assistant, you can do it yourself..
So far, all the tmp files people have been kind enough to share the details about with me seem to be created by the assistant when it locks a file down. I know this can result in dangling files if the computer is rebooted while the assistant is in the middle of doing that.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 4"
date="2014-05-19T16:46:55Z"
content="""
I suggest you upgrade to yesterday's release. It moves ssh password prompting during repository setup into a field in the webapp, so should avoid this class of problems.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 1"
date="2014-05-19T15:50:34Z"
content="""
There have been recent improvements in the assistant's handling of ssh keys. This includes no more prompting for ssh keys in the console, ever. Instead, the ssh remote setup would presumably fail if the ssh key didn't work for some reason.
To debug your problem, you need to use the shell. I would first try running \"git annex get\" or \"git annex copy\" or \"git annex drop\" on a file, and verify that it prompts for the ssh password. Then, take a look at /sdcard/git-annex.home/.ssh/config, and see if you can ssh to the special hostname set up there, from android, and if it asks for a password. If so, ssh -v might be interesting, as it should show it presenting the ssh key to the server.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 1"
date="2014-05-19T15:05:49Z"
content="""
If spideroak has a CLI tool that can get/put/delete individual files, it should be quite easy to use [[the_external_special_remote|special_remotes/external]] to support it. The demo shell script could be used as a starting place.
I built that so that others can easily write special remotes, and so unless spideroak's CLI is free software, I don't anticipate working on this myself.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="216.145.95.162"
subject="comment 4"
date="2014-05-19T16:56:15Z"
content="""
erics, that all makes a lot of sense, except I don't know if there's actually a use case for a git-annex that behaves that way. It doesn't seem to solve the original use case.
I'd be inclinded to instead use the new metadata support. A file could have a tag that indicates it's not strongly wanted, and if git-annex get doesn't have enough space it could seek out and drop such files.
"""]]