From f820f5d9bb1b2e7ef2bea26633d45d6084cfc47e Mon Sep 17 00:00:00 2001 From: "http://a-or-b.myopenid.com/" Date: Thu, 28 Nov 2013 02:36:16 +0000 Subject: [PATCH 01/14] Added a comment --- ...mment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/New_special_remote_suggeston_-_clean_directory/comment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment diff --git a/doc/forum/New_special_remote_suggeston_-_clean_directory/comment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment b/doc/forum/New_special_remote_suggeston_-_clean_directory/comment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment new file mode 100644 index 0000000000..60d4228385 --- /dev/null +++ b/doc/forum/New_special_remote_suggeston_-_clean_directory/comment_3_eed178ce4bc4d2b3f08a1e3d3d62c086._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://a-or-b.myopenid.com/" + ip="203.45.2.230" + subject="comment 3" + date="2013-11-28T02:36:15Z" + content=""" ++1 on this suggestion. + +Not all NASs are created equal so SAMBA/NFS isn't always the most recent version, upgrades aren't always possible (yes, I'm looking at you Drobo!) so sometimes you just can't do what g-a needs to do (locks are my big problem). + +This would be a great option to have, even with the downsides of losing a lot of the awesome-sauce of git-annex. +"""]] From f935390e10e166276ff82e4c2711b23ca0499392 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Thu, 28 Nov 2013 07:25:31 +0000 Subject: [PATCH 02/14] git rm doesn't work, we better have to reset. No git commit is necessary, then. --- doc/tips/recover_data_from_lost+found.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tips/recover_data_from_lost+found.mdwn b/doc/tips/recover_data_from_lost+found.mdwn index 48ef2a1d73..506ffec394 100644 --- a/doc/tips/recover_data_from_lost+found.mdwn +++ b/doc/tips/recover_data_from_lost+found.mdwn @@ -8,8 +8,8 @@ First, check out the git repository again. Then, in the new checkout: $ sudo chown you:you recovered-content $ chmod -R u+w recovered-content $ git annex add recovered-content - $ git rm recovered-content - $ git commit -m "recovered some content" + $ git reset HEAD recovered-content + $ rm -rf recovered-content $ git annex fsck The way that works is that when git-annex adds the same content that was in From 39abdaedb196ff450681eadb0b7d6347eb1a98b2 Mon Sep 17 00:00:00 2001 From: TroisSinges Date: Thu, 28 Nov 2013 07:26:46 +0000 Subject: [PATCH 03/14] typo with tabs --- doc/tips/recover_data_from_lost+found.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/recover_data_from_lost+found.mdwn b/doc/tips/recover_data_from_lost+found.mdwn index 506ffec394..ceb43e3f37 100644 --- a/doc/tips/recover_data_from_lost+found.mdwn +++ b/doc/tips/recover_data_from_lost+found.mdwn @@ -9,7 +9,7 @@ First, check out the git repository again. Then, in the new checkout: $ chmod -R u+w recovered-content $ git annex add recovered-content $ git reset HEAD recovered-content - $ rm -rf recovered-content + $ rm -rf recovered-content $ git annex fsck The way that works is that when git-annex adds the same content that was in From d6c34d89dba77e5c49d254be6c27fe42bcee7258 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkgVQsmQmvL62wnF0VSOKFgh0AoYYjGVB0" Date: Thu, 28 Nov 2013 09:21:46 +0000 Subject: [PATCH 04/14] --- ...ial_remote_server___40__needs_ssh_tunnel__41__.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn diff --git a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn b/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn new file mode 100644 index 0000000000..45c43f4434 --- /dev/null +++ b/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn @@ -0,0 +1,10 @@ +To connect to a remote server I have to tunnel it through a server I have access to. My .ssh/config for this connection looks like this: + + + Host server-at-home + HostName foo.bar.de + User foo + Port 222 + ProxyCommand /usr/bin/ssh me@server-i-have-access-to /bin/nc -w 3700 %h %p + +Is it possible to create a connection using a similar configuration via the git-annex assistant? From 2e693a3f787a741bccbe35f81d30703917490b3d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmd-UvSg88KxOFv7DVPeWXXpEQG_QV3pXg" Date: Thu, 28 Nov 2013 12:59:52 +0000 Subject: [PATCH 05/14] --- ..._Keep_the_repositories_separate__34__.mdwn | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn diff --git a/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn b/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn new file mode 100644 index 0000000000..8cc8f4037d --- /dev/null +++ b/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn @@ -0,0 +1,107 @@ +### Please describe the problem. + +Nothing happens when clicking "Keep the repositories separate" after adding another local repository on the dashboard in the webapp. The UI is still responsive, but stuck `Waiting for 127.0.0.1...` until another action is taken. + +The repository is created successfully on the filesystem and there does seem to be knowledge it exists; both are available under "Switch repository" but it does nothing again after selecting the other. + +### What steps will reproduce the problem? + +From a fresh install: + +1. Start assistant/webapp via program menu +2. Add a repository `~/test/annex_a` in welcome screen +3. Select "Add another repository" +4. Select "Add another repository" under the "Add more repositories" option list +5. Add a repository `~/test/annex_b` under "Add another local repository" (by the by: phrasing here could be disambiguated a little) +6. Select "Keep the repositories separate" under "Combine the repositories?" +7. Nothing happens, repository is however created + +### What version of git-annex are you using? On what operating system? + +I've tried this on both Ubuntu 12.04 Precise and Ubuntu 12.10 Quantal on two separate machines with separate installation methods and the problem exists on both. + +`git-annex` was installed via `apt-get` from the repository `ppa:fmarier/git-annex` for the Precise machine. It was compiled via `cabal` in the case of the Quantal machine, version information (for the `cabal` installation) is as follows: + +[[!format sh """ +git-annex version: 5.20131120 +build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL +remote types: git gcrypt S3 bup directory rsync web webdav glacier hook +"""]] + +### Please provide any additional information below. + +Is the underlying issue perhaps one with changing context between repos? I've included a split log to clearly the log entries occurring when the webapp "hangs". + +Log between steps 1-2: + +[[!format sh """ +[2013-11-28 12:14:10 GMT] main: starting assistant version 5.20131120 +[2013-11-28 12:14:10 GMT] Cronner: You should enable consistency checking to protect your data. +(Recording state in git...) +(scanning...) [2013-11-28 12:14:10 GMT] Watcher: Performing startup scan +(started...) +"""]] + +Log entries for steps 3-5 (after enabling debug logging in preferences, username has been masked after the fact): + +[[!format sh """ +[2013-11-28 12:16:48 GMT] read: git ["init","--quiet","/home//test/annex_b"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","git-annex"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.uuid","f491c4d0-df88-4d23-856d-eeed64a5581e"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.version","3"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","core.bare","false"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","symbolic-ref","HEAD"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/master"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","checkout","-q","-B","master"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.direct","false"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/git-annex"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--verify","-q","origin/git-annex"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","write-tree"] +[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-ref","refs/heads/git-annex","10c08f73fc8ff956d304a2e0c463e5e56a4f8489"] +[2013-11-28 12:16:48 GMT] read: uname ["-n"] +[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","cat-file","--batch"] +[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","hash-object","-w","--stdin-paths","--no-filters"] +[2013-11-28 12:16:48 GMT] feed: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-index","-z","--index-info"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/git-annex"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","write-tree"] +[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit-tree","4840a6b9a27e4392accd7abef59e9f6154a2b6aa","-p","refs/heads/git-annex"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-ref","refs/heads/git-annex","2968c7a922d522268375879514ae2c1d2e50e0ca"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit","--quiet","--allow-empty","-m","created repository"] +git: 'annex' is not a git command. See 'git --help'. +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","symbolic-ref","HEAD"] +[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/master"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","checkout","-q","-B","annex/direct/master"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","core.bare","true"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.direct","true"] +[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] +[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","gc.auto","0"] +[2013-11-28 12:16:48 GMT] call: /home//.cabal/bin/git-annex ["assistant"] +"""]] + +Note the spurious `git: 'annex' is not a git command. See 'git --help'.` entry. It doesn't strike me as related, if so I can submit it as another bug report if necessary. + +Log entries for step 6 (no response): + +[[!format sh """ +[2013-11-28 12:18:34 GMT] call: /home//.cabal/bin/git-annex ["assistant"] +git-annex: Daemon is already running. +[2013-11-28 12:18:35 GMT] read: git ["config","--null","--list"] +"""]] + +Log entries for additional step (attempt to switch to repository `annex_b` via the drop down menu; again, no response): + +[[!format sh """ +[2013-11-28 12:19:18 GMT] call: /home//.cabal/bin/git-annex ["assistant"] +git-annex: Daemon is already running. +[2013-11-28 12:19:18 GMT] read: git ["config","--null","--list"] +"""]] + +Hope that's helpful! Multiple repositories is a fairly important feature for me; Sod's law I find it implemented tidily without realising and it doesn't quite work as expected, ha. From 3f7e597677a0171fdffb3ac4f37d650970717256 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmd-UvSg88KxOFv7DVPeWXXpEQG_QV3pXg" Date: Thu, 28 Nov 2013 13:39:33 +0000 Subject: [PATCH 06/14] removed --- ..._Keep_the_repositories_separate__34__.mdwn | 107 ------------------ 1 file changed, 107 deletions(-) delete mode 100644 doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn diff --git a/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn b/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn deleted file mode 100644 index 8cc8f4037d..0000000000 --- a/doc/bugs/Assistant_hangs_on___34__Keep_the_repositories_separate__34__.mdwn +++ /dev/null @@ -1,107 +0,0 @@ -### Please describe the problem. - -Nothing happens when clicking "Keep the repositories separate" after adding another local repository on the dashboard in the webapp. The UI is still responsive, but stuck `Waiting for 127.0.0.1...` until another action is taken. - -The repository is created successfully on the filesystem and there does seem to be knowledge it exists; both are available under "Switch repository" but it does nothing again after selecting the other. - -### What steps will reproduce the problem? - -From a fresh install: - -1. Start assistant/webapp via program menu -2. Add a repository `~/test/annex_a` in welcome screen -3. Select "Add another repository" -4. Select "Add another repository" under the "Add more repositories" option list -5. Add a repository `~/test/annex_b` under "Add another local repository" (by the by: phrasing here could be disambiguated a little) -6. Select "Keep the repositories separate" under "Combine the repositories?" -7. Nothing happens, repository is however created - -### What version of git-annex are you using? On what operating system? - -I've tried this on both Ubuntu 12.04 Precise and Ubuntu 12.10 Quantal on two separate machines with separate installation methods and the problem exists on both. - -`git-annex` was installed via `apt-get` from the repository `ppa:fmarier/git-annex` for the Precise machine. It was compiled via `cabal` in the case of the Quantal machine, version information (for the `cabal` installation) is as follows: - -[[!format sh """ -git-annex version: 5.20131120 -build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA CryptoHash -key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL -remote types: git gcrypt S3 bup directory rsync web webdav glacier hook -"""]] - -### Please provide any additional information below. - -Is the underlying issue perhaps one with changing context between repos? I've included a split log to clearly the log entries occurring when the webapp "hangs". - -Log between steps 1-2: - -[[!format sh """ -[2013-11-28 12:14:10 GMT] main: starting assistant version 5.20131120 -[2013-11-28 12:14:10 GMT] Cronner: You should enable consistency checking to protect your data. -(Recording state in git...) -(scanning...) [2013-11-28 12:14:10 GMT] Watcher: Performing startup scan -(started...) -"""]] - -Log entries for steps 3-5 (after enabling debug logging in preferences, username has been masked after the fact): - -[[!format sh """ -[2013-11-28 12:16:48 GMT] read: git ["init","--quiet","/home//test/annex_b"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","git-annex"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.uuid","f491c4d0-df88-4d23-856d-eeed64a5581e"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.version","3"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","core.bare","false"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","symbolic-ref","HEAD"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/master"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","checkout","-q","-B","master"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.direct","false"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/git-annex"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--verify","-q","origin/git-annex"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","write-tree"] -[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-ref","refs/heads/git-annex","10c08f73fc8ff956d304a2e0c463e5e56a4f8489"] -[2013-11-28 12:16:48 GMT] read: uname ["-n"] -[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","cat-file","--batch"] -[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","hash-object","-w","--stdin-paths","--no-filters"] -[2013-11-28 12:16:48 GMT] feed: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-index","-z","--index-info"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/git-annex"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","write-tree"] -[2013-11-28 12:16:48 GMT] chat: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit-tree","4840a6b9a27e4392accd7abef59e9f6154a2b6aa","-p","refs/heads/git-annex"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","update-ref","refs/heads/git-annex","2968c7a922d522268375879514ae2c1d2e50e0ca"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","commit","--quiet","--allow-empty","-m","created repository"] -git: 'annex' is not a git command. See 'git --help'. -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","symbolic-ref","HEAD"] -[2013-11-28 12:16:48 GMT] read: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","show-ref","--hash","refs/heads/master"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","checkout","-q","-B","annex/direct/master"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","core.bare","true"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","annex.direct","true"] -[2013-11-28 12:16:48 GMT] read: git ["config","--null","--list"] -[2013-11-28 12:16:48 GMT] call: git ["--git-dir=/home//test/annex_b/.git","--work-tree=/home//test/annex_b","config","gc.auto","0"] -[2013-11-28 12:16:48 GMT] call: /home//.cabal/bin/git-annex ["assistant"] -"""]] - -Note the spurious `git: 'annex' is not a git command. See 'git --help'.` entry. It doesn't strike me as related, if so I can submit it as another bug report if necessary. - -Log entries for step 6 (no response): - -[[!format sh """ -[2013-11-28 12:18:34 GMT] call: /home//.cabal/bin/git-annex ["assistant"] -git-annex: Daemon is already running. -[2013-11-28 12:18:35 GMT] read: git ["config","--null","--list"] -"""]] - -Log entries for additional step (attempt to switch to repository `annex_b` via the drop down menu; again, no response): - -[[!format sh """ -[2013-11-28 12:19:18 GMT] call: /home//.cabal/bin/git-annex ["assistant"] -git-annex: Daemon is already running. -[2013-11-28 12:19:18 GMT] read: git ["config","--null","--list"] -"""]] - -Hope that's helpful! Multiple repositories is a fairly important feature for me; Sod's law I find it implemented tidily without realising and it doesn't quite work as expected, ha. From ed8ffd5e2ab24da520e8d52846f4f8f018744ca1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" Date: Thu, 28 Nov 2013 15:28:37 +0000 Subject: [PATCH 07/14] Added a comment --- .../comment_3_83ac87a01639776a6e519af226bd84d5._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_3_83ac87a01639776a6e519af226bd84d5._comment diff --git a/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_3_83ac87a01639776a6e519af226bd84d5._comment b/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_3_83ac87a01639776a6e519af226bd84d5._comment new file mode 100644 index 0000000000..c6cccfeb33 --- /dev/null +++ b/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_3_83ac87a01639776a6e519af226bd84d5._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" + nickname="Carlo" + subject="comment 3" + date="2013-11-28T15:28:36Z" + content=""" +I made that previous suggestion... I'm using sshelper right now, outstanding server. He seems to have already worked through all kinds of android specific details for running an SSH server. Of course, you don't get all the git goodness. I wonder how hard it would be to get runshell working when logging in through SSHelper, or provide an add an SSHelper style configured OpenSSH binary for the git annex shell. +"""]] From bf6cce5f2f6bd0e3d157fb22334876266b1d85ab Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" Date: Thu, 28 Nov 2013 15:30:32 +0000 Subject: [PATCH 08/14] Added a comment --- .../comment_4_b376f085b802012a6f5451aa96cc72ea._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment diff --git a/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment b/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment new file mode 100644 index 0000000000..56ff24c58c --- /dev/null +++ b/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" + nickname="Carlo" + subject="comment 4" + date="2013-11-28T15:30:32Z" + content=""" +I made that previous suggestion... I'm using sshelper right now, outstanding server. The author is very dedicated and seems to have already worked through all kinds of android version specific configuration nastiness for running an SSH server. Of course, you don't get all the git goodness. I wonder how hard it would be to get runshell working when logging in through SSHelper, or provide an an SSHelper style configured OpenSSH binary to drop into the git annex shell as an additional package. +"""]] From 9823f6da0283d81dedd48e1da503fe6c43cbd79b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" Date: Thu, 28 Nov 2013 15:37:23 +0000 Subject: [PATCH 09/14] --- ...__etc__47__resolv.conf_does_not_exist.mdwn | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn diff --git a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn b/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn new file mode 100644 index 0000000000..668783c0d9 --- /dev/null +++ b/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn @@ -0,0 +1,24 @@ +### Please describe the problem. + +When entering Jabber account data, the assistant responds with: + + Internal Server Error: /etc/resolv.conf does not exist (No such file or directory). + +### What steps will reproduce the problem? + +Get a jabber account at http://jit.si. Enter your jabber name and password on Android assistant, and click "Use This Account". The dark overlay and progress message appears. After about 30 seconds the browser forwards to the "Internal Server Error: /etc/resolv.conf does not exist (No such file or directory)" page. + +### What version of git-annex are you using? On what operating system? + +Android 4.2 on Lenovo 780p. This model is only for sale in China and India and has been rooted, but the original ROM is still on. Often this makes no difference but you might want to confirm with another device. + +git-annex version 5.20131127-g736ce5e + +### 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 + +# End of transcript or log. +"""]] From 40dc675384c2dbfff56485193884a7d2120c6699 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" Date: Thu, 28 Nov 2013 16:04:46 +0000 Subject: [PATCH 10/14] removed --- .../comment_4_b376f085b802012a6f5451aa96cc72ea._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment diff --git a/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment b/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment deleted file mode 100644 index 56ff24c58c..0000000000 --- a/doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_4_b376f085b802012a6f5451aa96cc72ea._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" - nickname="Carlo" - subject="comment 4" - date="2013-11-28T15:30:32Z" - content=""" -I made that previous suggestion... I'm using sshelper right now, outstanding server. The author is very dedicated and seems to have already worked through all kinds of android version specific configuration nastiness for running an SSH server. Of course, you don't get all the git goodness. I wonder how hard it would be to get runshell working when logging in through SSHelper, or provide an an SSHelper style configured OpenSSH binary to drop into the git annex shell as an additional package. -"""]] From ed995117207eaf6f9707e58cc1c62439c2f66610 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlYSw35UMlOf9rFlP5EUTBz7is5X09qVXI" Date: Thu, 28 Nov 2013 16:10:38 +0000 Subject: [PATCH 11/14] Added a comment: Support on Motorola razr i --- ...mment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/todo/Not_working_on_Android-x86/comment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment diff --git a/doc/todo/Not_working_on_Android-x86/comment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment b/doc/todo/Not_working_on_Android-x86/comment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment new file mode 100644 index 0000000000..3f568f5555 --- /dev/null +++ b/doc/todo/Not_working_on_Android-x86/comment_2_e5c4c99cb0675ad69bf8d7796be23c8e._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlYSw35UMlOf9rFlP5EUTBz7is5X09qVXI" + nickname="Johannes" + subject="Support on Motorola razr i" + date="2013-11-28T16:10:38Z" + content=""" +Hi, +I'm using the Motorola razr i. So there is a usecase, where a x86 CPU is used in a mobile phone. If it's easy as you described, can you build a Version with x86 support? + +Thanks +Jack +"""]] From 505097bab7ee7e563445a08e18c793b85f09912e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlVE8SthKoKKW--nFZW3_T6YXrdxNQPUe8" Date: Thu, 28 Nov 2013 16:52:58 +0000 Subject: [PATCH 12/14] https://support.box.com/hc/communities/public/questions/200261028-Does-Box-support-FTP-or-WebDAV- --- doc/tips/using_box.com_as_a_special_remote.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/using_box.com_as_a_special_remote.mdwn b/doc/tips/using_box.com_as_a_special_remote.mdwn index 254d0a554b..0e08285e99 100644 --- a/doc/tips/using_box.com_as_a_special_remote.mdwn +++ b/doc/tips/using_box.com_as_a_special_remote.mdwn @@ -5,7 +5,7 @@ for providing 50 gb of free storage if you sign up with its Android client. git-annex can use Box as a [[special remote|special_remotes]]. Recent versions of git-annex make this very easy to set up: - WEBDAV_USERNAME=you@example.com WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb encryption=shared + WEBDAV_USERNAME=you@example.com WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunksize=75mb encryption=shared Note the use of chunksize; Box has a 100 mb maximum file size, and this breaks up large files into chunks before that limit is reached. From 2014100c086b37df5248f7221e2cf8e09eb52785 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8" Date: Thu, 28 Nov 2013 22:08:05 +0000 Subject: [PATCH 13/14] Added a comment --- .../comment_1_817a3ed424e4fb76fcd33295f2953250._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment diff --git a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment b/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment new file mode 100644 index 0000000000..b3e495dc22 --- /dev/null +++ b/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8" + nickname="Hamza" + subject="comment 1" + date="2013-11-28T22:08:04Z" + content=""" +You can add/clone from the remote from the command line and webapp will use it. +"""]] From 24fc17e21ab9d9e1a642dbd4985e158e99d87b7d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw" Date: Thu, 28 Nov 2013 22:36:10 +0000 Subject: [PATCH 14/14] --- ...ating_.git_directory_inside_bare_repo.mdwn | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn diff --git a/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn b/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn new file mode 100644 index 0000000000..96158dcdee --- /dev/null +++ b/doc/bugs/assistant_creating_.git_directory_inside_bare_repo.mdwn @@ -0,0 +1,88 @@ +### Please describe the problem. +Setting up a git annex repo with the webapp. Adding a small archive removeable disk. +Adding a file to repo. Moving file to archive. The file seems to get copied to the removeable disk +but it is not removed (dropped)from my repo, as I would expect + +Before I add the file to the repo, the archive directory on the removeable drive looks like a bare repo. +After adding one file and moving it to the archive folder, a ".git" directory gets created inside the bare repo. +The .git directory contains an annex directory, and nothing else. + +Is this behaviour the expected one? As far as I have understood it, the files are supposed to "disapear" from my computer when I move them to the archive folder. + + +### What steps will reproduce the problem? +Se above + +### What version of git-annex are you using? On what operating system? +Version: 5.20131127-g736ce5e +Build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA + +Chakra linux +Linux black 3.10.18-1-CHAKRA #1 SMP PREEMPT Sat Nov 9 20:18:15 UTC 2013 x86_64 GNU/Linux + +git annex installed from prebuilt tar. + +### Please provide any additional information below. + +[[!format sh """ +[2013-11-28 23:25:59 CET] main: starting assistant version 5.20131127-g736ce5e +[2013-11-28 23:25:59 CET] Cronner: You should enable consistency checking to protect your data. +(scanning...) [2013-11-28 23:25:59 CET] Watcher: Performing startup scan +(started...) gcrypt: Development version -- Repository format MAY CHANGE +gcrypt: Repository not found: /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark +fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git' +[2013-11-28 23:26:21 CET] main: Syncing with 7090f0c1abf947a1a186ba243c498172 +warning: no common commits +From /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark + * [new branch] git-annex -> 7090f0c1abf947a1a186ba243c498172/git-annex + * [new branch] master -> 7090f0c1abf947a1a186ba243c498172/master +Already up-to-date. +To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark + * [new branch] git-annex -> synced/git-annex + * [new branch] annex/direct/master -> synced/master +Already up-to-date. +Already up-to-date. +[2013-11-28 23:26:59 CET] Pusher: Syncing with test_ark +To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark + 4d435e3..e548577 git-annex -> synced/git-annex +[2013-11-28 23:27:17 CET] Committer: Adding git-annex..64.tar.gz + +(Recording state in git...) +(merging 7090f0c1abf947a1a186ba243c498172/git-annex into git-annex...) +(Recording state in git...) + + + +(Recording state in git...) +add git-annex-standalone-amd64.tar.gz (checksum...) [2013-11-28 23:27:17 CET] Committer: Committing changes to git +[2013-11-28 23:27:17 CET] Pusher: Syncing with test_ark +Already up-to-date. +To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark + e548577..b86f41c git-annex -> synced/git-annex + 658b0f2..f32a646 annex/direct/master -> synced/master +Already up-to-date. +[2013-11-28 23:27:27 CET] Committer: Adding git-annex..64.tar.gz +[2013-11-28 23:27:27 CET] Committer: Committing changes to git +[2013-11-28 23:27:27 CET] Pusher: Syncing with test_ark + +git-annex-standalone-amd64.tar.gz + + 32768 0% 0.00kB/s 0:00:00 Already up-to-date. +To /run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark + b86f41c..806a2dd git-annex -> synced/git-annex + f32a646..5e254e7 annex/direct/master -> synced/master +Already up-to-date. + + 20143752 100% 85.24MB/s 0:00:00 (xfer#1, to-check=0/1) + +sent 20146306 bytes received 31 bytes 40292674.00 bytes/sec +total size is 20143752 speedup is 1.00 +fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git' +fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git' +fatal: Not a git repository: '/run/media/daniel/7090f0c1-abf9-47a1-a186-ba243c498172/test_ark/.git' +[2013-11-28 23:27:59 CET] Pusher: Syncing with test_ark +Everything up-to-date + + +# End of transcript or log. +"""]]