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

8 files changed, 223 insertions, 43 deletions

diff --git a/doc/Android/comment_6_455bcbd36c7b5eeb905cc56da4666b07._comment b/doc/Android/comment_6_455bcbd36c7b5eeb905cc56da4666b07._comment
new file mode 100644
index 000000000..75a1db4c2
--- /dev/null
+++ b/doc/Android/comment_6_455bcbd36c7b5eeb905cc56da4666b07._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="madduck"
+ subject="Weirdness when run from adb shell"
+ date="2015-05-06T14:28:43Z"
+ content="""
+How is this designed to work in the contact of Androids crap permissions?
+
+    shell@kminilte:/ $ /data/data/ga.androidterm/runshell
+    /system/bin/sh: /data/data/ga.androidterm/runshell: can't execute: Permission denied
+
+    126|shell@kminilte:/ $ /system/bin/sh /data/data/ga.androidterm/runshell
+    Falling back to hardcoded app location; cannot find expected files in /data/app-lib
+
+    shell@kminilte:/sdcard/git-annex.home $ git
+    /system/bin/sh: git: not found
+
+    127|shell@kminilte:/sdcard/git-annex.home $ echo $PATH
+    /data/data/ga.androidterm/bin:/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
+
+    shell@kminilte:/sdcard/git-annex.home $ /data/data/ga.androidterm/bin/git                                                          <
+    /data/data/ga.androidterm/bin/git: Permission denied
+
+    shell@kminilte:/sdcard/git-annex.home $ ls -l /data/data/ga.androidterm/bin -d
+    drwx------ u0_a255  u0_a255           2015-05-05 07:58 bin
+
+    shell@kminilte:/sdcard/git-annex.home $ id
+    uid=2000(shell) gid=2000(shell) groups=1003(graphics),1004(input),1007(log),1011(adb),1015(sdcard_rw),1028(sdcard_r),3001(net_bt_admin),3002(net_bt),3003(inet),3006(net_bw_stats) context=u:r:shell:s0
+
+
+"""]]
diff --git a/doc/forum/Where_did_my_files_go__63__.mdwn b/doc/forum/Where_did_my_files_go__63__.mdwn
new file mode 100644
index 000000000..f7d811d8f
--- /dev/null
+++ b/doc/forum/Where_did_my_files_go__63__.mdwn
@@ -0,0 +1,20 @@
+I import some files that I've seen before somewhere:
+
+    $ git annex import --deduplicate .../download
+    ...
+    import download/What_is_The_Digital_Fiction_Factory-Conker_Media.pdf (duplicate) ok
+    ...
+
+But the resulting download directory is empty, and `list` doesn't show any of the files:
+
+    $ git annex list --allrepos What_is_The_Digital_Fiction_Factory-Conker_Media.pdf
+    here
+    |...
+    |...
+    |...
+    |...
+    |...
+    |...
+    git-annex: What_is_The_Digital_Fiction_Factory-Conker_Media.pdf not found
+
+How do I find out where this file can be found?
diff --git a/doc/forum/Where_did_my_files_go__63__/comment_1_3ff3ffa95eb2745ff9ec2a903e071d97._comment b/doc/forum/Where_did_my_files_go__63__/comment_1_3ff3ffa95eb2745ff9ec2a903e071d97._comment
new file mode 100644
index 000000000..f0b2ae3e7
--- /dev/null
+++ b/doc/forum/Where_did_my_files_go__63__/comment_1_3ff3ffa95eb2745ff9ec2a903e071d97._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc"
+ nickname="Jean"
+ subject="comment 1"
+ date="2015-05-06T09:21:19Z"
+ content="""
+I did a dump of all known files: `$ git annex whereis > ../git-annex-whereis`
+No sign of the imported file. 
+"""]]
diff --git a/doc/forum/__96__git_annex_sync__96___uses_too_much_space__63__.mdwn b/doc/forum/__96__git_annex_sync__96___uses_too_much_space__63__.mdwn
deleted file mode 100644
index 303cbb8be..000000000
--- a/doc/forum/__96__git_annex_sync__96___uses_too_much_space__63__.mdwn
+++ /dev/null
@@ -1,43 +0,0 @@
-When I create a new blank annex and try to sync it, I immediately run out of
-space.
-
-This is the original:
-
-    $ git annex info 
-    repository mode: indirect
-    trusted repositories: 0
-    semitrusted repositories: 4
-        00000000-0000-0000-0000-000000000001 -- web
-        ...
-    untrusted repositories: 0
-    transfers in progress: none
-    available local disk space: 50.51 gigabytes (+1 megabyte reserved)
-    local annex keys: 2581
-    local annex size: 135.87 gigabytes
-    annexed files in working tree: 4672
-    size of annexed files in working tree: 231.16 gigabytes
-    bloom filter size: 16 mebibytes (0.5% full)
-    backend usage: 
-        SHA256E: 7253
-
-Then I try to sync on the newly created annex:
-
-    $ git annex sync 
-    commit  ok
-    pull laptop
-    warning: no common commits
-    remote: Counting objects: 28801, done.
-    remote: Compressing objects: 100% (20301/20301), done.
-    fatal: write error: No space left on device22 MiB | 13.30 MiB/s   
-    fatal: index-pack failed
-    failed
-    git-annex: sync: 1 failed
-
-Now `.git` in the new annex is using 487M (this is the total size of mounted disk):
-
-    $ du -sh .git/
-    487M	.git/
-
-How big should the target annex be? Is it a multiple of the remote?
-
-As far as I understand, `sync` should get only the metadata, not the file contents. How can this be bigger than the entire source annex?
diff --git a/doc/metadata/comment_5_fd30444aecfc4792eb4dbfdebc230786._comment b/doc/metadata/comment_5_fd30444aecfc4792eb4dbfdebc230786._comment
new file mode 100644
index 000000000..195eea278
--- /dev/null
+++ b/doc/metadata/comment_5_fd30444aecfc4792eb4dbfdebc230786._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="madduck"
+ subject="TODO written"
+ date="2015-05-06T14:24:56Z"
+ content="""
+@joeyh, yes, it would overwrite all metadata. The idea would be to export with --json, manipulate, import…
+
+http://git-annex.branchable.com/todo/ability_to_set_metadata_from_json/?updated
+"""]]
diff --git a/doc/todo/ability_to_set_metadata_from_json.mdwn b/doc/todo/ability_to_set_metadata_from_json.mdwn
new file mode 100644
index 000000000..ee4d68823
--- /dev/null
+++ b/doc/todo/ability_to_set_metadata_from_json.mdwn
@@ -0,0 +1,6 @@
+I can export metadata to JSON format, which is nice as this can now be read into any other tool and manipulated. But I cannot find a way to set the metadata from JSON and so I am left to figure out what changes need to be made via the g-a interface to get to the desired state, and that is hard to get right.
+
+Maybe g-a metadata could grow an import-json function which would set (overwrite) the metadata for the given file(s) from JSON input.
+
+Thanks,
+-m
diff --git a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn
new file mode 100644
index 000000000..241a07ff2
--- /dev/null
+++ b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn
@@ -0,0 +1,141 @@
+Hi,
+these three patches sort .mailmap to get consistent ordering, add nine 
+names with proper emails to it, and then there is the third one, which 
+contains all the joeyh changes. I put them in a separate patch in case 
+you have other opinions about that.
+
+I notice you're not a fan of GitHub pull requests, and attachments 
+wasn't allowed here, so I just paste a `cat 000* >all.patch` here, hope 
+that's ok. The branches are also available from 
+<https://github.com/sunny256/git-annex> as the branches "edit-mailmap" 
+(this version) and "edit-mailmap.wip" (the whole process) in case that's 
+easier.
+
+There will be more "useful" patches in the future, have started browsing 
+"Learn you a Haskell for great good", it's awesome. I'll have to get the 
+build working first, though. There is some dependency problem:
+
+[[!format hs """
+
+$ make
+if [ "cabal " = ./Setup ]; then ghc --make Setup; fi
+cabal  configure
+Resolving dependencies...
+
+Utility/Exception.hs:25:18:
+    Could not find module `Control.Monad.Catch'
+    Perhaps you meant
+      Control.Monad.CatchIO (from MonadCatchIO-mtl-0.3.0.4)
+      Control.Monad.Cont (needs flag -package mtl-2.1.1)
+      Control.Monad.State (needs flag -package mtl-2.1.1)
+    Use -v to see a list of the files searched for.
+make: *** [Build/SysConfig.hs] Error 1
+
+"""]]
+
+Mentioning it just in case you have a quick solution. Have tried to fix 
+it by summoning cabal in various ways, but no luck yet. The OS used is 
+Debian GNU/Linux 7.8 (wheezy) on x86_64.
+
+[[!format sh """
+
+From 20317aff9fbb8662aaeda4aa2285f92e728adc58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
+Date: Sat, 2 May 2015 17:22:48 +0200
+Subject: [PATCH 1/3] Filter .mailmap through "sort -u" for predictability
+
+---
+ .mailmap | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/.mailmap b/.mailmap
+index 275b236..5d51042 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -1,7 +1,7 @@
+ Joey Hess <id@joeyh.name> http://joey.kitenet.net/ <joey@web>
+-Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web>
+ Joey Hess <id@joeyh.name> http://joeyh.name/ <http://joeyh.name/@web>
++Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web>
++Richard Hartmann <richih@debian.org> https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web>
+ Yaroslav Halchenko <debian@onerussian.com>
+ Yaroslav Halchenko <debian@onerussian.com> http://yarikoptic.myopenid.com/ <site-myopenid@web>
+ Yaroslav Halchenko <debian@onerussian.com> https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY <Yaroslav@web>
+-Richard Hartmann <richih@debian.org> https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web>
+-- 
+2.4.0
+
+From b216bfdb3ab65f025e46c7fcdc86db3a3440b0af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
+Date: Mon, 4 May 2015 15:36:41 +0200
+Subject: [PATCH 2/3] .mailmap: Add nine more uncontroversial names
+
+Including only those with a proper email where there is no doubt about
+which is the correct one.
+---
+ .mailmap | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/.mailmap b/.mailmap
+index 5d51042..2dafcea 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -1,7 +1,20 @@
++Antoine Beaupré <anarcat@koumbit.org> anarcat <anarcat@web>
++Antoine Beaupré <anarcat@koumbit.org> https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web>
++Greg Grossmeier <greg@grossmeier.net> http://grossmeier.net/ <greg@web>
++Jimmy Tang <jtang@tchpc.tcd.ie> jtang <jtang@web>
++Joachim Breitner <mail@joachim-breitner.de> http://www.joachim-breitner.de/ <nomeata@web>
+ Joey Hess <id@joeyh.name> http://joey.kitenet.net/ <joey@web>
+ Joey Hess <id@joeyh.name> http://joeyh.name/ <http://joeyh.name/@web>
+ Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web>
++Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <Johan@web>
++Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <http://johan.kiviniemi.name/@web>
++Nicolas Pouillard <nicolas.pouillard@gmail.com> http://ertai.myopenid.com/ <npouillard@web>
++Peter Simons <simons@cryp.to> Peter Simons <simons@ubuntu-12.04>
++Peter Simons <simons@cryp.to> http://peter-simons.myopenid.com/ <http://peter-simons.myopenid.com/@web>
++Philipp Kern <pkern@debian.org> http://phil.0x539.de/ <Philipp_Kern@web>
+ Richard Hartmann <richih@debian.org> https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web>
+ Yaroslav Halchenko <debian@onerussian.com>
+ Yaroslav Halchenko <debian@onerussian.com> http://yarikoptic.myopenid.com/ <site-myopenid@web>
+ Yaroslav Halchenko <debian@onerussian.com> https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY <Yaroslav@web>
++Øyvind A. Holm <sunny@sunbase.org> http://sunny256.sunbase.org/ <sunny256@web>
++Øyvind A. Holm <sunny@sunbase.org> https://sunny256.wordpress.com/ <sunny256@web>
+-- 
+2.4.0
+
+From b730720bf85217051b0bd6414650f3bfd5928edb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
+Date: Mon, 4 May 2015 15:46:29 +0200
+Subject: [PATCH 3/3] .mailmap: Add all variations for Joey Hess
+
+---
+ .mailmap | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/.mailmap b/.mailmap
+index 2dafcea..3013a39 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -3,9 +3,17 @@ Antoine Beaupré <anarcat@koumbit.org> https://id.koumbit.net/anarcat <https://i
+ Greg Grossmeier <greg@grossmeier.net> http://grossmeier.net/ <greg@web>
+ Jimmy Tang <jtang@tchpc.tcd.ie> jtang <jtang@web>
+ Joachim Breitner <mail@joachim-breitner.de> http://www.joachim-breitner.de/ <nomeata@web>
++Joey Hess <id@joeyh.name> Joey Hess <joey@gnu.kitenet.net>
++Joey Hess <id@joeyh.name> Joey Hess <joey@kitenet.net>
++Joey Hess <id@joeyh.name> Joey Hess <joeyh@debian.org>
++Joey Hess <id@joeyh.name> Joey Hess <joeyh@fischer.debian.org>
++Joey Hess <id@joeyh.name> Joey Hess <joeyh@joeyh.name>
++Joey Hess <id@joeyh.name> Joey Hess <joeyh@oberon.tam-lin.net>
++Joey Hess <id@joeyh.name> Joey Hess <joeyh@oberon.underhill.private>
+ Joey Hess <id@joeyh.name> http://joey.kitenet.net/ <joey@web>
+ Joey Hess <id@joeyh.name> http://joeyh.name/ <http://joeyh.name/@web>
+ Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web>
++Joey Hess <id@joeyh.name> https://www.google.com/accounts/o8/id?id=AItOawmJfIszzreLNvCqzqzvTayA9_9L6gb9RtY <Joey@web>
+ Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <Johan@web>
+ Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <http://johan.kiviniemi.name/@web>
+ Nicolas Pouillard <nicolas.pouillard@gmail.com> http://ertai.myopenid.com/ <npouillard@web>
+-- 
+2.4.0
+
+"""]]
diff --git a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment
new file mode 100644
index 000000000..474c61c1e
--- /dev/null
+++ b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://sunny256.wordpress.com/"
+ nickname="sunny256"
+ subject="Character encoding error"
+ date="2015-05-06T14:53:50Z"
+ content="""
+Hm, seems as there are some character encoding problem there, two names (Antoine Beaupré and mine) in the second patch. The infamous 'Ø' strikes again. Just wanted to mention it so the patch doesn't introduce errors. Maybe it's safest to fetch it from GitHub.
+"""]]