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

This commit is contained in:
Joey Hess 2014-03-12 12:23:13 -04:00
commit 8d8f8bbbb5
7 changed files with 100 additions and 1 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM"
nickname="David"
subject="Seems to be working now"
date="2014-03-12T02:36:59Z"
content="""
Just tried again off of the most recent osx release build and it appears to be working without crashing. Not sure what else you did but thanks!
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 2"
date="2014-03-12T07:54:08Z"
content="""
Would it be better to put the home directory under git-annex' directory
in `/data`, so it isn't available to every app (and every user, if more
than one) on the device? If other apps can write to its `.gitconfig`
then I think they can make git-annex run arbitrary code with its own
permissions.
"""]]

View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 71 "My phone (or MP3 player)" 24 "Tahoe-LAFS" 10 "OpenStack SWIFT" 31 "Google Drive"]]
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 71 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 10 "OpenStack SWIFT" 31 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

View file

@ -0,0 +1,68 @@
Hi,
Git-annex is really awesome. It has made my life really easier when having to
move files around.
Yet, I have been struggling with a use case that I cannot get working with git
annex.
In short, my request is: could it be possible to have --want-get and --want-drop
accept a repository as argument to match the preferred content of that
repository instead of here?
Now, let me explain why I need this:a
All my files are stored into a NAS accessible via a local network.
I have an annex in my desktop computer. Using preferred content (via "git annex
wanted") and "git annex get|drop --auto", I am able to almost automatically
handle what files are put into my computer. What I do is to "git annex wanted"
to indicate what I want to be here and launch a home made script that basically
does "git annex get --auto" and "git annex drop --auto".
Let's say I have a android phone to which I connect via ssh over adb. It
contains a git repository but few files are in it. It has no wifi and so no
access to the network, meaning no access to the NAS.
The links between annexes then looks like:
NAS <-> Computer <-> Phone
When I want to put a file into my phone, I generally launch "git annex get file"
from my computer (then I get the file from the NAS) and "git annex copy --to
phone file".
I want to be able to automatise this a bit by playing with preferred content
(like I do with my computer). This means that I want to launch "git annex
wanted" to edit the preferred content of the phone annex and then "git annex get
--auto" and launch "git annex copy --auto --to phone". This way, when I am not
in front of my computer, I can still from my phone run "git annex wanted here
'preferred content'" and hope for my synchronisation scripts (run in my
computer) to put the good files into my phone.
Obviously those commands won't work since the git annex get --auto command will
only get what my computer wants, not what my phone wants.
The intuitive (IMHO) way to do would be to launch:
git annex get --want-get phone
git annex copy --auto --to phone
git annex drop --auto
With "--want-get repository" meaning, "Matches files that the preferred content
settings for the repository make it want to get.".
For the time being, I succeed in doing this with
OLD_WANTED=$(git annex wanted here)
git annex wanted here $(git annex wanted phone)
git annex copy --auto --to phone
git annex wanted ${OLD_WANTED}
git annex drop --auto
This is complicated and adds two extra commits in the git-annex branch (one for
each setting of git annex wanted) each time I call the script.
What do you think?
Thanks for reading.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnDXvDvWTXmCqQ90ATTD4dV3Ii4YbnE8E0"
nickname="sys"
subject="git annex direct when not all content is in this repo"
date="2014-03-12T14:41:53Z"
content="""
what does git annex direct do when all the content isn't available in the current repo (i am assuming it will leave symlinks for the missing content)
"""]]

View file

@ -3,6 +3,7 @@ A walkthrough of the basic features of git-annex.
[[!toc]]
[[!inline feeds=no trail=yes show=0 template=walkthrough pagenames="""
walkthrough/setup_git
walkthrough/creating_a_repository
walkthrough/adding_a_remote
walkthrough/adding_files

View file

@ -0,0 +1,2 @@
If you haven't configured your identity for GIT, you will have to do this before git annex will work.