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

8 files changed, 162 insertions, 1 deletions

diff --git a/doc/bugs/git-annex_on_NAS_eats_all_memory/comment_7_a8b34dfe0daad646f8c1def2b7a4d999._comment b/doc/bugs/git-annex_on_NAS_eats_all_memory/comment_7_a8b34dfe0daad646f8c1def2b7a4d999._comment
new file mode 100644
index 000000000..eec2352ed
--- /dev/null
+++ b/doc/bugs/git-annex_on_NAS_eats_all_memory/comment_7_a8b34dfe0daad646f8c1def2b7a4d999._comment
@@ -0,0 +1,88 @@
+[[!comment format=c
+ username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
+ nickname="Markus"
+ subject="comment 7"
+ date="2015-02-17T14:43:02Z"
+ content="""
+ssh -t makes no difference, the strace output:
+it's completely repetitive, only the futex and mmap calls are at random positions (mmap probably leads to the enormous memory consumption)
+
+rt_sigprocmask(SIG_BLOCK, [INT], [], 8) = 0
+clock_gettime(0x2 /* CLOCK_??? */, {31, 737743240}) = 0
+clock_gettime(CLOCK_MONOTONIC, {365100, 810332327}) = 0
+clock_gettime(0x3 /* CLOCK_??? */, {31, 737155560}) = 0
+rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
+futex(0x2b32fb1c, FUTEX_WAKE_OP_PRIVATE, 1, 1, 0x2b32fb18, {FUTEX_OP_SET, 0, FUTEX_OP_CMP_GT, 1}) = 1
+futex(0x2b32fb48, FUTEX_WAKE_PRIVATE, 1) = 1
+futex(0x41981d0, FUTEX_WAKE_PRIVATE, 1) = 1
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+rt_sigprocmask(SIG_BLOCK, [INT], [], 8) = 0
+clock_gettime(0x2 /* CLOCK_??? */, {31, 851239760}) = 0
+clock_gettime(CLOCK_MONOTONIC, {365100, 933314386}) = 0
+clock_gettime(0x3 /* CLOCK_??? */, {31, 850549960}) = 0
+mmap2(0x30b00000, 1048576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x30b00000
+rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---
+sigreturn()                             = ? (mask now [])
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [HUP ILL TRAP KILL USR1 USR2 CHLD TSTP TTIN URG XFSZ VTALRM IO PWR])                   
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+rt_sigprocmask(SIG_BLOCK, [INT], [], 8) = 0                                                                                                  
+clock_gettime(0x2 /* CLOCK_??? */, {56, 575838240}) = 0                                                                                      
+clock_gettime(CLOCK_MONOTONIC, {365125, 751101804}) = 0                                                                               
+clock_gettime(0x3 /* CLOCK_??? */, {56, 574935120}) = 0                                                                               
+rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0                                                                                                 
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [])                                                                                    
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [ILL FPE KILL SEGV USR2 PIPE TERM STOP TSTP URG XCPU XFSZ VTALRM])                     
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [QUIT ABRT BUS PIPE TERM CONT STOP URG IO PWR])                                        
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [QUIT ABRT BUS PIPE TERM CONT STOP URG IO PWR])                                        
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [QUIT ABRT BUS PIPE TERM CONT STOP URG IO PWR])                                        
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                                                                                            
+sigreturn()                             = ? (mask now [QUIT ABRT BUS PIPE TERM CONT STOP URG IO PWR])                                        
+--- SIGVTALRM (Virtual timer expired) @ 0 (0) ---                   
+"""]]
diff --git a/doc/bugs/too_many_ssh_connections_during_sync_of_gcrypt_remotes/comment_2_f87b3ba05c0cdfadd4d5da894dea0abb._comment b/doc/bugs/too_many_ssh_connections_during_sync_of_gcrypt_remotes/comment_2_f87b3ba05c0cdfadd4d5da894dea0abb._comment
new file mode 100644
index 000000000..ee52566a4
--- /dev/null
+++ b/doc/bugs/too_many_ssh_connections_during_sync_of_gcrypt_remotes/comment_2_f87b3ba05c0cdfadd4d5da894dea0abb._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="sairon"
+ subject="comment 2"
+ date="2015-02-17T15:04:55Z"
+ content="""
+looks like it was the assistant
+"""]]
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index 03646c5fd..a1f206710 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -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 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 36 "Google Drive"]]
+[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 14 "OpenStack SWIFT" 36 "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
diff --git a/doc/direct_mode/comment_16_7f6805e090d0acd8a077b65214da5837._comment b/doc/direct_mode/comment_16_7f6805e090d0acd8a077b65214da5837._comment
new file mode 100644
index 000000000..d40ee9e98
--- /dev/null
+++ b/doc/direct_mode/comment_16_7f6805e090d0acd8a077b65214da5837._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 16"
+ date="2015-02-17T05:22:00Z"
+ content="""
+i believe this is [answered here](https://git-annex.branchable.com/todo/windows_support/#comment-e72601243c643d7821e68d3a04489fcb). TLDR; basically NTFS + symlink works in Linux, but not in Windows/Cygwin, which git-annex seems to be using. YMMV.
+"""]]
diff --git a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__/comment_1_0ba60f9625ccda45d59adbd385f5fe98._comment b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__/comment_1_0ba60f9625ccda45d59adbd385f5fe98._comment
new file mode 100644
index 000000000..931bab540
--- /dev/null
+++ b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__/comment_1_0ba60f9625ccda45d59adbd385f5fe98._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnPgn611P6ym5yyL0BS8rUzO0_ZKRldMt0"
+ nickname="Samuel"
+ subject="Reseting to the git-annex branch"
+ date="2015-02-17T09:21:12Z"
+ content="""
+Well, it appears you explicitely asked for reseting to the git-annex branch with the following command
+  git annex reset --hard git-annex
+To go back to the master branch, containing the symlinks, just do
+  git annex checkout master
+
+"""]]
diff --git a/doc/forum/canceling_wrong_repository_merge/comment_3_d6e45d7e4f4bdf0a08ab91a08e0c1be6._comment b/doc/forum/canceling_wrong_repository_merge/comment_3_d6e45d7e4f4bdf0a08ab91a08e0c1be6._comment
new file mode 100644
index 000000000..1fbec8603
--- /dev/null
+++ b/doc/forum/canceling_wrong_repository_merge/comment_3_d6e45d7e4f4bdf0a08ab91a08e0c1be6._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="the actual process i use"
+ date="2015-02-17T00:58:38Z"
+ content="""
+So it seems i am able to forget all of this within the matter of a few days, and since this is so error prone, here goes a more detailed explanation.
+
+What I do is:
+
+<pre>
+git clone repo repo.test
+cd repo.test
+git annex indirect # be safe! this may take a while, but it's necessary!
+git tag bak # keep track of a good working state
+git log --stat --stat-count=3 # find the commits we want to trash
+git tag firstbad badbeef1 # the first commit we want to kill
+git tag keep dada1234 # the first commit we want to keep
+git rebase -p --onto firstbad^ keep # drop everything between firstbad (inclusive) and keep (exclusive)
+git diff --stat keep # make sure this did what we expected
+git branch -D annex/direct/master synced/master # destroy this old branch that still has refs to the old commits
+</pre>
+
+Then for each repo:
+
+<pre>
+cd repo
+git tag bak
+git fetch origin # sync the master branch in
+git remote prune origin # make sure the dropped branches are gone
+git annex indirect # be safe
+git reset --hard origin/master
+git branch -D synced/master annex/direct/master
+git diff --stat bak # should change
+</pre>
+
+It would be useful to have that transition propagate properly everywhere so I don't have to do this in every repo, but at least the above should work fairly reliably.
+"""]]
diff --git a/doc/preferred_content/standard_groups/comment_3_727ae69e0ef25aa887aed18ef9430f89._comment b/doc/preferred_content/standard_groups/comment_3_727ae69e0ef25aa887aed18ef9430f89._comment
new file mode 100644
index 000000000..e70cd864f
--- /dev/null
+++ b/doc/preferred_content/standard_groups/comment_3_727ae69e0ef25aa887aed18ef9430f89._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="document in the manpage?"
+ date="2015-02-17T05:28:33Z"
+ content="""
+the manpage makes a passing reference to \"groups\", but nowhere in the manpage is there a reference to this page, which i had to find through google. maybe this should be in the manpage?
+"""]]
diff --git a/doc/todo/wishlist:_global_progress_status.mdwn b/doc/todo/wishlist:_global_progress_status.mdwn
new file mode 100644
index 000000000..3c6611af4
--- /dev/null
+++ b/doc/todo/wishlist:_global_progress_status.mdwn
@@ -0,0 +1,3 @@
+similar to [[do_not_bug_me_about_intermediate_files]] - i feel that massive `git annex get` operations should have better progress information than the current individual `rsync --progress` bits. i wonder if this couldn't be accomplished with `rsync --info=PROGRESS2`, which gives overall rsync progress, combined with copying multiple files at once with rsync (which would have the side-effect of speeding up `git annex get` for large number of small files).
+
+once this is done, it could be sent back to the webapp UI to give the user a global sense of the overall sync progress (as opposed to per-file progress). --[[anarcat]]