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

10 files changed, 192 insertions, 1 deletions

diff --git a/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn b/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn
new file mode 100644
index 000000000..d354c8eb1
--- /dev/null
+++ b/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn
@@ -0,0 +1,47 @@
+### Please describe the problem.
+Attempted to create a bup remote on the current system via ssh. It appears to have created the bup remote fine, but fails when sshing to it and does not add the remote.
+This is a normal indirect annex (currently containing a single test jpg in its root)
+I'm presuming the error is "(storing uuid...) sh: 1: cd: can't cd to /~/archie" 
+
+
+### What steps will reproduce the problem?
+git annex initremote bup type=bup encryption=none buprepo=sshservername:path
+
+I've tried using .ssh/config to remove the username from the servername passed to bup repo and it still fails.
+
+### What version of git-annex are you using? On what operating system?
+[[!format sh """
+>git-annex version
+git-annex version: 4.20130615-g29d5bb9
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 4
+upgrade supported from repository versions: 0 1 2
+"""]]
+debian wheezy i686
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+> git annex initremote bup type=bup encryption=none buprepo=bup@localhost:archie
+initremote bup (bup init...)
+Reinitialized existing Git repository in /media/backup/home/archie/.bup/
+Initialized empty Git repository in /media/backup/bup/archie/
+(storing uuid...) sh: 1: cd: can't cd to /~/archie
+git-annex: ssh failed
+
+> ssh bup@localhost
+Last login: Mon Jun 17 10:35:45 2013 from localhost
+$ ls
+archie
+$ cd archie
+$ ls
+branches  config  description  HEAD  hooks  info  objects  refs
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment
new file mode 100644
index 000000000..52bb21ae3
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-06-15T18:50:45Z"
+ content="""
+Joe, you need to carefully read [[direct_mode]]. When you manually run `git merge` in a direct mode repository, you defeat associated file tracking, with the resulting behavior you describe. This is why there is a [[todo/direct_mode_guard]] todo item.
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_2_f0ea453951daf84dbddc653ac64822b6._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_2_f0ea453951daf84dbddc653ac64822b6._comment
new file mode 100644
index 000000000..2c45f6b58
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_2_f0ea453951daf84dbddc653ac64822b6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 2"
+ date="2013-06-15T19:39:09Z"
+ content="""
+joey, Thank you for the reply. I have read that and also read about the direct mode guard. I only used git merge because I was stuck and didn't know what else to do. I assume the proper way to refresh my backup repo is to git annex sync. That's what's failing with the non-fast-forward error. I don't know what to do from there. Thank you for any help.
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_3_35a8be5ecc9d1b72c38f8ddb47678160._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_3_35a8be5ecc9d1b72c38f8ddb47678160._comment
new file mode 100644
index 000000000..c723d85bb
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_3_35a8be5ecc9d1b72c38f8ddb47678160._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 3"
+ date="2013-06-16T13:27:36Z"
+ content="""
+Making some progress. It looks like it needs a .map file for the newly added file when I pull in the backup repo.  I'm tracing the various places addAssociatedFile gets called. It looks like sync should do it. I think that's what sets up the map. If I copy the map file from another repo, I'm able to call get annex get foo2.txt. So the key is getting that map file created.
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_4_29e72997b88f91f84639587b4cede34c._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_4_29e72997b88f91f84639587b4cede34c._comment
new file mode 100644
index 000000000..c785ff77b
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_4_29e72997b88f91f84639587b4cede34c._comment
@@ -0,0 +1,76 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 4"
+ date="2013-06-16T17:27:18Z"
+ content="""
+I have a workaround that requires a small patch. I'm not sure why it's not creating the mapping, but I noticed that git annex fsck has a verifyDirectMapping which will create the mapping if it doesn't exist. 
+
+git annex fsck will throw an error on fixLinks and won't proceed to verifyDirectMapping if the map file doesn't exist. So, I needed a way to call verifyDirectMapping directly. My hack is to add an argument to git annex fsck to call verifyDirectMapping. 
+
+My workflow is this:
+
+**repo1**:
+[[!format  sh \"\"\"
+echo a > new.txt
+git annex add .
+git commit -m \"add a\"
+git copy --to origin
+git annex sync
+\"\"\"]]
+
+**repo2**:
+[[!format  sh \"\"\"
+git annex sync
+git annex pull origin synced/master
+git annex fsck --verifyDirectMapping
+git annex get .
+\"\"\"]]
+
+The new file comes down cleanly.
+
+I'm sure there's a better way to do this to fix the core issue, but here's how I patched Fsck.hs as a minimal workaround
+
+[[!format  diff \"\"\"
+
+diff --git a/Command/Fsck.hs b/Command/Fsck.hs
+old mode 100644
+new mode 100755
+index 9af6a4a..97aabb8
+--- a/Command/Fsck.hs
++++ b/Command/Fsck.hs
+@@ -59,12 +60,16 @@ incrementalScheduleOption :: Option
+ incrementalScheduleOption = Option.field [] \"incremental-schedule\" paramTime
+ 	\"schedule incremental fscking\"
+ 
++verifyDirectMappingOption :: Option
++verifyDirectMappingOption = Option.flag [] \"verifyDirectMapping\" \"verifies direct mappings are consistent\"
++
+ options :: [Option]
+ options = 
+ 	[ fromOption
+ 	, startIncrementalOption
+ 	, moreIncrementalOption
+ 	, incrementalScheduleOption
++	, verifyDirectMappingOption
+ 	]
+ 
+ seek :: [CommandSeek]
+@@ -107,18 +112,23 @@ withIncremental = withValue $ do
+ start :: Maybe Remote -> Incremental -> FilePath -> (Key, Backend) -> CommandStart
+ start from inc file (key, backend) = do
+ 	numcopies <- numCopies file
+-	case from of
+-		Nothing -> go $ perform key file backend numcopies
+-		Just r -> go $ performRemote key file backend numcopies r
++	verify <- Annex.getFlag (Option.name verifyDirectMappingOption)
++	if verify
++		then go $ verifyDirectMapping key file
++		else
++			case from of
++				Nothing -> go $ perform key file backend numcopies
++				Just r -> go $ performRemote key file backend numcopies r
+
+
+\"\"\"]]
+"""]]
diff --git a/doc/design/assistant/blog/day_284__porting.mdwn b/doc/design/assistant/blog/day_284__porting.mdwn
index 4815b5a68..f0648b0e1 100644
--- a/doc/design/assistant/blog/day_284__porting.mdwn
+++ b/doc/design/assistant/blog/day_284__porting.mdwn
@@ -1,4 +1,4 @@
-Today I got to deal with bugs on Android (busted use of `cp` amoung other
+Today I got to deal with bugs on Android (busted use of `cp` among other
 problems), Windows (fixed a strange hang when adding several files), and
 Linux (`.desktop` files suck and Wine ships a particularly nasty one).
 Pretty diverse!
diff --git a/doc/forum/Windows_usage_instructions.mdwn b/doc/forum/Windows_usage_instructions.mdwn
new file mode 100644
index 000000000..0b7b94625
--- /dev/null
+++ b/doc/forum/Windows_usage_instructions.mdwn
@@ -0,0 +1,25 @@
+Having a spot of bother in setting up for windows usage.
+
+I'm attempting to have a windows box syncing to a server (over ssh) and a linux box also syncing against that*
+
+So, on each machine I do
+
+ git init
+ git annex init
+
+
+On the windows and linux desktops I then do a 
+ 
+ git remote add server serverdetails.
+
+Now the problem is that if I don't add files to the repos on the machines, they won't sync as there is no branch checked out; and if I do then the first one is fine but the second will fail as it doesn't allow fast-forwards. What am I doing wrong? I've tried making the server repo bare / not bare.
+
+I'm using the latest nightly windows build, and a build from git from today (29d5bb94b4512cfe3072c9ff840cb0ce9f2af744)
+
+
+
+
+
+
+
+*Actually I'm trying to do something a little more complex than that, but this is the simplest version I can come up with.
diff --git a/doc/forum/Windows_usage_instructions/comment_1_d43dbd9406da3b9747b147715eca94ac._comment b/doc/forum/Windows_usage_instructions/comment_1_d43dbd9406da3b9747b147715eca94ac._comment
new file mode 100644
index 000000000..6162b9540
--- /dev/null
+++ b/doc/forum/Windows_usage_instructions/comment_1_d43dbd9406da3b9747b147715eca94ac._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 1"
+ date="2013-06-16T11:29:36Z"
+ content="""
+This may be related to [this](http://git-annex.branchable.com/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/#comment-a023dca06c2bcb9636d8a332f8e95ae4)
+"""]]
diff --git a/doc/forum/clear_box.com_repository/comment_2_8f9c7248a148a24ae2aba39c4a79a6d1._comment b/doc/forum/clear_box.com_repository/comment_2_8f9c7248a148a24ae2aba39c4a79a6d1._comment
new file mode 100644
index 000000000..9725c96e5
--- /dev/null
+++ b/doc/forum/clear_box.com_repository/comment_2_8f9c7248a148a24ae2aba39c4a79a6d1._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="tomas"
+ ip="188.167.111.235"
+ subject="comment 2"
+ date="2013-06-16T13:32:31Z"
+ content="""
+The result of that command returned without writing any files.
+"""]]
diff --git a/doc/todo/wishlist:_Add_to_Android_version_to_Google_Play.mdwn b/doc/todo/wishlist:_Add_to_Android_version_to_Google_Play.mdwn
new file mode 100644
index 000000000..a08c00a37
--- /dev/null
+++ b/doc/todo/wishlist:_Add_to_Android_version_to_Google_Play.mdwn
@@ -0,0 +1,3 @@
+If possible a frequently updated daily build in separate package for those more adventurous of us.
+
+It would make installing and testing much easier and no need to change configuration settings to allow untrusted source.