From acd1b88741f9842bc072a8e600dffbe27172b235 Mon Sep 17 00:00:00 2001 From: Oliver Matthews Date: Fri, 21 Jun 2013 09:28:43 +0100 Subject: [PATCH 01/74] Strip leading /~/ from bup relatively pathed bup remotes --- Remote/Bup.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Remote/Bup.hs b/Remote/Bup.hs index f5c802e098..9b3675cfa5 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -217,10 +217,13 @@ storeBupUUID u buprepo = do onBupRemote :: Git.Repo -> (FilePath -> [CommandParam] -> IO a) -> FilePath -> [CommandParam] -> Annex a onBupRemote r a command params = do - let dir = shellEscape (Git.repoPath r) sshparams <- sshToRepo r [Param $ "cd " ++ dir ++ " && " ++ unwords (command : toCommand params)] liftIO $ a "ssh" sshparams + where + path = Git.repoPath r + base = fromMaybe path (stripPrefix "/~/" path) + dir = shellEscape base {- Allow for bup repositories on removable media by checking - local bup repositories to see if they are available, and getting their From 0aaabc093ecfa7e43dea8ab390b1e861467b8e3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 22 Jun 2013 11:11:35 -0400 Subject: [PATCH 02/74] I'm told raring has the webapp --- doc/install/Ubuntu.mdwn | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/install/Ubuntu.mdwn b/doc/install/Ubuntu.mdwn index b6c092527d..107a1a8e70 100644 --- a/doc/install/Ubuntu.mdwn +++ b/doc/install/Ubuntu.mdwn @@ -1,14 +1,7 @@ -## Saucy +## Saucy, Raring sudo apt-get install git-annex -## Raring - - sudo apt-get install git-annex - -Note: This version does not have the WebApp enabled (see [here](https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/1084693)), but is otherwise -usable. - ## Precise sudo apt-get install git-annex From 9f89133260ea452221465a7eaa24be56bf53d0a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 22 Jun 2013 13:47:19 -0400 Subject: [PATCH 03/74] typo --- standalone/windows/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 43c4e2e085..f62bc14a05 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -17,7 +17,7 @@ withcyg () { PATH="$PATH:/c/cygwin/bin" "$@" } -# Don't allow build artifact from a past successfuly build to be extracted +# Don't allow build artifact from a past successful build to be extracted # if we fail. rm -f git-annex-installer.exe From ce13dbab18edd155243e61dc229186b06465c7a9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl99Gxq3NPNvwZHp3PDufaknQH4rZb_KKY" Date: Sat, 22 Jun 2013 18:39:35 +0000 Subject: [PATCH 04/74] --- doc/bugs/Problems_with_syncing_gnucash.mdwn | 563 ++++++++++++++++++++ 1 file changed, 563 insertions(+) create mode 100644 doc/bugs/Problems_with_syncing_gnucash.mdwn diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn new file mode 100644 index 0000000000..92c7f2e601 --- /dev/null +++ b/doc/bugs/Problems_with_syncing_gnucash.mdwn @@ -0,0 +1,563 @@ +### Please describe the problem. +I am trying to sync gnucash between my server and my notebook. Both devices are connected via VPN to provide bidirectional SSH connectivity. After adding some data in gnucash the logfiles get synced properly but the changes to the gnucash.gnucash file are not recognized. Touching the file afterwards causes git-annex to immediately transfer the file. + +### What steps will reproduce the problem? + +Store your gnucash configuration in a git-annex repository. Add some transactions and wait for git-annex to sync your *.gnucash file. + +### What version of git-annex are you using? On what operating system? + +server and notebook -> Ubuntu 12.04.2 LTS: +[[!format sh """ +florz@server:~$ git-annex version +git-annex version: 4.20130601 +build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS +"""]] + +### Please provide any additional information below. + +before opening gnucash: +[[!format sh """ +florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 113902 Blöcke: 240 EA Block: 4096 Normale Datei +Gerät: 15h/21d Inode: 2974371 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:32:37.974073365 +0200 +Modifiziert: 2013-06-22 19:32:37.846073367 +0200 +Geändert : 2013-06-22 19:32:37.970073365 +0200 + Geburt : - + +florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 113902 Blöcke: 224 EA Block: 4096 Normale Datei +Gerät: fc00h/64512d Inode: 401737579 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:40:24.148876398 +0200 +Modifiziert: 2013-06-22 19:24:18.000000000 +0200 +Geändert : 2013-06-22 19:24:26.817865369 +0200 + Geburt : - +"""]] + +after doing some changes in gnucash: +[[!format sh """ +florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 114039 Blöcke: 240 EA Block: 4096 Normale Datei +Gerät: 15h/21d Inode: 2974990 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:52:12.226049268 +0200 +Modifiziert: 2013-06-22 19:52:12.342049265 +0200 +Geändert : 2013-06-22 19:52:12.342049265 +0200 + Geburt : - + +florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 113902 Blöcke: 224 EA Block: 4096 Normale Datei +Gerät: fc00h/64512d Inode: 401737579 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:40:24.148876398 +0200 +Modifiziert: 2013-06-22 19:24:18.000000000 +0200 +Geändert : 2013-06-22 19:24:26.817865369 +0200 + Geburt : - + +# after some time -> still no transfer + +florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 113902 Blöcke: 224 EA Block: 4096 Normale Datei +Gerät: fc00h/64512d Inode: 401737579 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:40:24.148876398 +0200 +Modifiziert: 2013-06-22 19:24:18.000000000 +0200 +Geändert : 2013-06-22 19:24:26.817865369 +0200 + Geburt : - +"""]] + +doing a touch on the file: +[[!format sh """ +florz@notebook:~$ touch annex-sync/gnucash/gnucash.gnucash +florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 114039 Blöcke: 240 EA Block: 4096 Normale Datei +Gerät: 15h/21d Inode: 2974990 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:54:27.222046497 +0200 +Modifiziert: 2013-06-22 19:54:27.070046501 +0200 +Geändert : 2013-06-22 19:54:27.214046498 +0200 + Geburt : - + +#it syncs immediately + +florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash + Datei: »annex-sync/gnucash/gnucash.gnucash“ + Größe: 114039 Blöcke: 224 EA Block: 4096 Normale Datei +Gerät: fc00h/64512d Inode: 401737638 Verknüpfungen: 1 +Zugriff: (0600/-rw-------) Uid: ( 1000/ florz) Gid: ( 1000/ florz) +Zugriff : 2013-06-22 19:54:35.307056482 +0200 +Modifiziert: 2013-06-22 19:54:27.000000000 +0200 +Geändert : 2013-06-22 19:54:34.787072264 +0200 + Geburt : - +"""]] + +on my notebook: +[[!format sh """ +Everything up-to-date +Everything up-to-date +Everything up-to-date +[2013-06-22 19:52:12 CEST] Watcher: file deleted gnucash/gnucash.gnucash.tmp-rFzA3U +[2013-06-22 19:52:12 CEST] Committer: committing 1 changes +[2013-06-22 19:52:12 CEST] Committer: Committing changes to git +[2013-06-22 19:52:12 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"] +[2013-06-22 19:52:12 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 +[2013-06-22 19:52:12 CEST] Watcher: add direct gnucash/gnucash.gnucash.20130622195200.log +[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:12 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }] +[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:13 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"] +[2013-06-22 19:52:13 CEST] Committer: Adding gnucash.g..95200.log +ok +(Recording state in git...) +(Recording state in git...) + + + +(Recording state in git...) +add gnucash/gnucash.gnucash.20130622195200.log (checksum...) [2013-06-22 19:52:13 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +[2013-06-22 19:52:13 CEST] Committer: committing 1 changes +[2013-06-22 19:52:13 CEST] Committer: Committing changes to git +[2013-06-22 19:52:13 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:52:13 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"] +[2013-06-22 19:52:13 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing : new file created +[2013-06-22 19:52:13 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing +[2013-06-22 19:52:13 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing : new file created +[2013-06-22 19:52:13 CEST] call: /home/florz/bin/git-annex ["transferkeys","--readfd","29","--writefd","27"] +[2013-06-22 19:52:13 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing +[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/books/gnucash.gnucash.gcm +[2013-06-22 19:52:14 CEST] Watcher: file deleted gnucash/gnucash.gnucash.7f0101.29284.LNK +[2013-06-22 19:52:14 CEST] Watcher: file deleted gnucash/gnucash.gnucash.LCK +[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/accelerator-map +[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/expressions-2.0 +[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/stylesheets-2.0 +[2013-06-22 19:52:14 CEST] Watcher: add direct gnucash/gnucash.gnucash.20130622195212.log +[2013-06-22 19:52:14 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"] +[2013-06-22 19:52:14 CEST] Committer: Adding 5 files +ok +(Recording state in git...) +add .gnucash/books/gnucash.gnucash.gcm (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +ok +add .gnucash/accelerator-map (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +ok +add .gnucash/expressions-2.0 (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +ok +add .gnucash/stylesheets-2.0 (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +ok +add gnucash/gnucash.gnucash.20130622195212.log (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +[2013-06-22 19:52:15 CEST] Committer: committing 7 changes +[2013-06-22 19:52:15 CEST] Committer: Committing changes to git +[2013-06-22 19:52:15 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +To ssh://florz@192.168.1.3/home/florz/annex-sync/ + 7d4c30d..1954c7f master -> synced/master +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"] +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:15 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master +[2013-06-22 19:52:15 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing : new file created +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:15 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing : new file created +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:15 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"] +Already up-to-date. +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"] +To ssh://florz@192.168.2.2/home/florz/annex-sync/ + 7d4c30d..e1cb6c3 master -> synced/master +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:16 CEST] Merger: merging refs/remotes/server192.168.2.2/synced/master into refs/heads/master +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:16 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/server192.168.2.2/synced/master"] +Already up-to-date. +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"] + +gnucash.gnucash.20130622195200.log + + 778 100% 0.00kB/s 0:00:00 + 778 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) +[2013-06-22 19:52:17 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Just 778 + +sent 876 bytes received 31 bytes 201.56 bytes/sec +total size is 778 speedup is 0.86 +[2013-06-22 19:52:17 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "8b8aa5c2cfe4466c6b897f7987246021468033301a696e2db0070386f7d0f3fd.log", keyBackendName = "SHA256E", keySize = Just 778, keyMtime = Nothing}} +[2013-06-22 19:52:17 CEST] Transferrer: Uploaded gnucash.g..95200.log +[2013-06-22 19:52:17 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing +[2013-06-22 19:52:17 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing +[2013-06-22 19:52:18 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 +[2013-06-22 19:52:18 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"] +[2013-06-22 19:52:18 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:52:18 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","f2463d30e73fec86e14c9df4bcae5e568398a503","-p","refs/heads/git-annex"] +[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","776258f91d4245ffe13117a771dc8c7723867c1a"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:18 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:18 CEST] Merger: merging refs/heads/synced/master into refs/heads/master +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/heads/synced/master"] +Already up-to-date. +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"] + +gnucash.gnucash.20130622195212.log + + 411 100% 0.00kB/s 0:00:00 + 411 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) +[2013-06-22 19:52:20 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Just 411 + +sent 509 bytes received 31 bytes 154.29 bytes/sec +total size is 411 speedup is 0.76 +[2013-06-22 19:52:20 CEST] Transferrer: Uploaded gnucash.g..95212.log +[2013-06-22 19:52:20 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "36e8842e91f7577d12992724c8f52586e9ea7cb0234312dc5544ea4dc6f6c39a.log", keyBackendName = "SHA256E", keySize = Just 411, keyMtime = Nothing}} +[2013-06-22 19:52:20 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing +[2013-06-22 19:52:20 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing +To ssh://florz@192.168.1.3/home/florz/annex-sync/ + e7d4504..776258f git-annex -> synced/git-annex +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:21 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:21 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"] +Already up-to-date. +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"] + +gnucash.gnucash.20130622195212.log + + 411 100% 0.00kB/s 0:00:00 + 411 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) +[2013-06-22 19:52:21 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Just 411 + +sent 509 bytes received 31 bytes 360.00 bytes/sec +total size is 411 speedup is 0.76 +[2013-06-22 19:52:22 CEST] Transferrer: Uploaded gnucash.g..95212.log +[2013-06-22 19:52:22 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "36e8842e91f7577d12992724c8f52586e9ea7cb0234312dc5544ea4dc6f6c39a.log", keyBackendName = "SHA256E", keySize = Just 411, keyMtime = Nothing}} +[2013-06-22 19:52:22 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing +[2013-06-22 19:52:22 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing +To ssh://florz@192.168.2.2/home/florz/annex-sync/ + e7d4504..776258f git-annex -> synced/git-annex +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"] +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +git-annex-shell: key is already present in annex +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9] +[2013-06-22 19:52:22 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "8b8aa5c2cfe4466c6b897f7987246021468033301a696e2db0070386f7d0f3fd.log", keyBackendName = "SHA256E", keySize = Just 778, keyMtime = Nothing}} +git-annex-shell: key is already present in annex +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9] +[2013-06-22 19:52:24 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 +[2013-06-22 19:52:24 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"] +[2013-06-22 19:52:24 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:52:24 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","1641422d48162f533f80693486d7c5a1208b9fcf","-p","refs/heads/git-annex"] +[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","48cfe2eb07d63d4a59c237994eb07896c92ef1c4"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:52:24 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..48cfe2eb07d63d4a59c237994eb07896c92ef1c4","--oneline","-n1"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..48cfe2eb07d63d4a59c237994eb07896c92ef1c4","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-index","--raw","-z","-r","--no-renames","-l0","--cached","df87e3bef80902abc6d48ce0fbfe3432c790cd21"] +[2013-06-22 19:52:25 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","df87e3bef80902abc6d48ce0fbfe3432c790cd21..refs/heads/git-annex","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:52:25 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","5bf44cd143b2c35a44e609e083af23093eb02028","-p","refs/heads/git-annex","-p","df87e3bef80902abc6d48ce0fbfe3432c790cd21"] +[2013-06-22 19:52:25 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","4cd264f192611f5a0d76e54d31329921a650f896"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +To ssh://florz@192.168.1.3/home/florz/annex-sync/ + df87e3b..4cd264f git-annex -> synced/git-annex +[2013-06-22 19:52:26 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:26 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"] +[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"] +[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +To ssh://florz@192.168.2.2/home/florz/annex-sync/ + 776258f..4cd264f git-annex -> synced/git-annex +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"] +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:53:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"] +[2013-06-22 19:54:27 CEST] Watcher: changed direct gnucash/gnucash.gnucash +[2013-06-22 19:54:27 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"] +[2013-06-22 19:54:27 CEST] Committer: Adding gnucash.gnucash +ok +(Recording state in git...) + + +(Recording state in git...) + + +(Recording state in git...) +(merging synced/git-annex into git-annex...) +(Recording state in git...) +add gnucash/gnucash.gnucash (checksum...) [2013-06-22 19:54:27 CEST] read: sha256sum ["/home/florz/annex-sync/.git/annex/tmp/gnucash25536.gnucash"] +[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +[2013-06-22 19:54:27 CEST] Committer: committing 1 changes +[2013-06-22 19:54:27 CEST] Committer: Committing changes to git +[2013-06-22 19:54:27 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"] +[2013-06-22 19:54:27 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing : new file created +[2013-06-22 19:54:27 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 +[2013-06-22 19:54:27 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing +[2013-06-22 19:54:27 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing : new file created +[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"] +[2013-06-22 19:54:27 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","4c81716cf1a0e0df472ffb43770ac8a27ca45420","-p","refs/heads/git-annex"] +[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","e9e2f951a5c1c645447ccc565bc3def9caeff93c"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:27 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }] +[2013-06-22 19:54:27 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:27 CEST] Merger: merging refs/heads/synced/master into refs/heads/master +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/heads/synced/master"] +Already up-to-date. +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"] + + + +gnucash.gnucash + + 32768 28% 0.00kB/s 0:00:00 [2 + 114039 100% 15.50MB/s 0:00:00 (xfer#1, to-check=0/1) +013-06-22 19:54:28 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Just 32768 +[2013-06-22 19:54:28 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Just 114039 +To ssh://florz@192.168.1.3/home/florz/annex-sync/ + 4cd264f..e9e2f95 git-annex -> synced/git-annex + e1cb6c3..e41ffae master -> synced/master +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:33 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:33 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"] +Already up-to-date. +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/ann +sent 114130 bytes received 31 bytes 20756.55 bytes/sec +total size is 114039 espeedup is 1.00 +x-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:33 CEST] Transferrer: Uploaded gnucash.gnucash +[2013-06-22 19:54:33 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "91ec950e4004863219ea33f1398ea4308e0969267c207272e046858ede8bf9d9", keyBackendName = "SHA256E", keySize = Just 114039, keyMtime = Nothing}} +[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"] +[2013-06-22 19:54:33 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing +[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing + +gnucash.gnucash + + 32768 28% 0.00kB/s 0:00:00 + 114039 100% 19.38MB/s 0:00:00 (xfer#1, to-check=0/1) +[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Just 32768 +[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Just 114039 +To ssh://florz@192.168.2.2/home/florz/annex-sync/ + 4cd264f..e9e2f95 git-annex -> synced/git-annex + e1cb6c3..e41ffae master -> synced/master +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:34 CEST] Merger: merging refs/remotes/server192.168.2.2/synced/master into refs/heads/master +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:34 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/server192.168.2.2/synced/master"] +Already up-to-date. +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"] +[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"] + +sent 114130 bytes received 31 bytes 45664.40 bytes/sec +total size is 114039 speedup is 1.00 +[2013-06-22 19:54:35 CEST] Transferrer: Uploaded gnucash.gnucash +[2013-06-22 19:54:35 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "91ec950e4004863219ea33f1398ea4308e0969267c207272e046858ede8bf9d9", keyBackendName = "SHA256E", keySize = Just 114039, keyMtime = Nothing}} +[2013-06-22 19:54:36 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 +[2013-06-22 19:54:36 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"] +[2013-06-22 19:54:36 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:54:36 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","fb43dcef4baa4b928faec6622a4f7889125c6c0a","-p","refs/heads/git-annex"] +[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","b74b3402e31d7394815733811b9668b00cc51aa9"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"] +[2013-06-22 19:54:36 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..b74b3402e31d7394815733811b9668b00cc51aa9","--oneline","-n1"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:39 CEST] read: git ["--gitTo ssh://florz@192.168.1.3/home/florz/annex-sync/ +- ! [rejected] dgit-annex -> synced/git-annexi (r=/non-fast-forwardh)o +me/florz/aerror: failed to push some refs to 'ssh://florz@192.168.1.3/home/florz/annex-sync/' +nTo prevent you from losing history, non-fast-forward updates were rejected +Merge the remote changes (e.g. 'git pull') before pushing again. See the +'Note about fast-forwards' section of 'git push --help' for details. +nex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..b74b3402e31d7394815733811b9668b00cc51aa9","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-index","--raw","-z","-r","--no-renames","-l0","--cached","89e2137442dfdb06facbaba3079873d90c7af281"] +[2013-06-22 19:54:39 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","89e2137442dfdb06facbaba3079873d90c7af281..refs/heads/git-annex","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"] +[2013-06-22 19:54:39 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","f175a05b82160942363f46bf1af3e7af1660dfa1","-p","refs/heads/git-annex","-p","89e2137442dfdb06facbaba3079873d90c7af281"] +[2013-06-22 19:54:39 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","fabac4b203dce9e812b4637f7e95375b15a3f739"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +To ssh://florz@192.168.2.2/home/florz/annex-sync/ + e9e2f95..fabac4b git-annex -> synced/git-annex +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:40 CEST] Pusher: trying manual pull to resolve failed pushes +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"] +[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:40 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","fetch","home192.168.1.3"] +From ssh://192.168.1.3/home/florz/annex-sync + e9e2f95..89e2137 synced/git-annex -> home192.168.1.3/synced/git-annex +[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--verify","-q","refs/remotes/home192.168.1.3/master"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/master..refs/remotes/home192.168.1.3/master","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--verify","-q","refs/remotes/home192.168.1.3/synced/master"] +[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/synced/master..refs/remotes/home192.168.1.3/synced/master","--oneline","-n1"] +[2013-06-22 19:54:43 CEST] Pusher: pushing to [Remote { name ="home192.168.1.3" }] +[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"] +[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"] +[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +Everything up-to-date +[2013-06-22 19:54:46 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"] +[2013-06-22 19:54:46 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"] +[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"] +[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] +[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] +"""]] From 34ad134d0adf5cf0f86a66ef58e32ff7c69ec0d4 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl99Gxq3NPNvwZHp3PDufaknQH4rZb_KKY" Date: Sat, 22 Jun 2013 19:42:07 +0000 Subject: [PATCH 05/74] updated to 4.20130601 --- doc/bugs/Problems_with_syncing_gnucash.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn index 92c7f2e601..55c729b0a6 100644 --- a/doc/bugs/Problems_with_syncing_gnucash.mdwn +++ b/doc/bugs/Problems_with_syncing_gnucash.mdwn @@ -13,6 +13,7 @@ florz@server:~$ git-annex version git-annex version: 4.20130601 build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS """]] +(the problem still occurs with version 4.20130601 on both devices) ### Please provide any additional information below. From 7d2d4c1364f6119ea750f2a04107f45736dc2d8b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl99Gxq3NPNvwZHp3PDufaknQH4rZb_KKY" Date: Sat, 22 Jun 2013 19:44:52 +0000 Subject: [PATCH 06/74] whoops this is still the same version. --- doc/bugs/Problems_with_syncing_gnucash.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn index 55c729b0a6..92c7f2e601 100644 --- a/doc/bugs/Problems_with_syncing_gnucash.mdwn +++ b/doc/bugs/Problems_with_syncing_gnucash.mdwn @@ -13,7 +13,6 @@ florz@server:~$ git-annex version git-annex version: 4.20130601 build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS """]] -(the problem still occurs with version 4.20130601 on both devices) ### Please provide any additional information below. From 8b54552599db14c38b4f07d915a7f52a790f7209 Mon Sep 17 00:00:00 2001 From: "http://nicolas-schodet.myopenid.com/" Date: Sun, 23 Jun 2013 12:53:42 +0000 Subject: [PATCH 07/74] New wishlist, preview transfer size --- ...ishlist:_Have_a_preview_of_download_or_upload_size.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size.mdwn diff --git a/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size.mdwn b/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size.mdwn new file mode 100644 index 0000000000..e8a758dfd0 --- /dev/null +++ b/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size.mdwn @@ -0,0 +1,7 @@ +When using SSH remote repository, git-annex uses rsync to download or upload files one at a time. I would like to have a preview of the overall transfer size so that I can estimate the transfer duration. + +This could be done as an option of get, move or copy, or as a separated command. + +If part of get, move or copy, git-annex could print how much has been done or how much left between every files. + +Thanks. From 674fb494d2f17765b0c5b8f1a2a500611821a2f7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc" Date: Sun, 23 Jun 2013 13:45:52 +0000 Subject: [PATCH 08/74] --- doc/forum/git-annex_on_Samba_share.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/git-annex_on_Samba_share.mdwn diff --git a/doc/forum/git-annex_on_Samba_share.mdwn b/doc/forum/git-annex_on_Samba_share.mdwn new file mode 100644 index 0000000000..0235820c06 --- /dev/null +++ b/doc/forum/git-annex_on_Samba_share.mdwn @@ -0,0 +1,9 @@ +I want to put my photos into a git-annex repository, syncing it with my girlfriends computer and our NAS. +If possible, I'd like to be able to add files to the NAS and have them synced, so I guess a special remote doesn't work here. + +Unfortunately, git-annex doesn't run on my NAS directly (yet), so I thought of mounting the NAS with CIFS, and creating an annex there that syncs with the local ones. +While this seems to work fine with one computer, I wonder what will happen if I mount the Samba share on my and my girlfriend's computer at the same time. + +In theory, the NAS supports Samba Unix extensions which includes POSIX locking, but a weird bug that prevents you from removing a named pipe from Samba, making git-annex init fail (sent a bug report to Synology). When I disable Unix extensions it works. It then detects a crippled file system though. + +Any thoughts? From 1f7f9ede3a6aae26e40223d0b96f17f89d2646bf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Jun 2013 12:39:37 -0400 Subject: [PATCH 09/74] bup: Handle /~/ in bup remote paths. Thanks, Oliver Matthews --- debian/changelog | 2 ++ doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6b6685d063..ec41c91471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (4.20130622) UNRELEASED; urgency=low * assistant --autostart: Automatically ionices the daemons it starts. * assistant: Daily sanity check thread is run niced. + * bup: Handle /~/ in bup remote paths. + Thanks, Oliver Matthews -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn b/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn index d354c8eb14..c15de5b3e6 100644 --- a/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn +++ b/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn @@ -45,3 +45,5 @@ branches config description HEAD hooks info objects refs # End of transcript or log. """]] + +> applied patchm, [[done]] --[[Joey]] From 9fb7fa4b52c95b2d5629c4d3efb1e400592d776a Mon Sep 17 00:00:00 2001 From: "http://erikhopp.myopenid.com/" Date: Mon, 24 Jun 2013 05:16:43 +0000 Subject: [PATCH 10/74] --- .../Hanging_on_install_on_Mountain_lion.mdwn | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn b/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn new file mode 100644 index 0000000000..dc55089e46 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn @@ -0,0 +1,24 @@ +### Please describe the problem. + +In trying to install git-annex on my mac OSX Mountain Lion, the program is hanging when I open the program. + +### What steps will reproduce the problem? + +Open the DMG, drag the app to applications folder, double-click on the application. Web browser opens with a localhost url. The webpage says "Starting webapp..." and doesn't go anywhere. Initialization seems to fail and I need to force quit the application. + +### What version of git-annex are you using? On what operating system? + +I'm not totally sure (since it hangs and I can't check a version number, but since I just downloaded it now and the homepage says the latest version is "version 4.20130621" which was released 2 days and 13 hours ago, I assume that is it. + +I'm using OSX 10.8.4. + + +### 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 80b32b84f7e50f3abd18a78ee88d6a4c3a7e6ac8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnGrQBFPptA2GU_Nx8KrxRGtyAS7PIlwjw" Date: Mon, 24 Jun 2013 07:33:55 +0000 Subject: [PATCH 11/74] Added a comment: me too. --- .../comment_1_523d3c0c71f80536850a001b90fd0e9e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_1_523d3c0c71f80536850a001b90fd0e9e._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_1_523d3c0c71f80536850a001b90fd0e9e._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_1_523d3c0c71f80536850a001b90fd0e9e._comment new file mode 100644 index 0000000000..06ab0f9048 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_1_523d3c0c71f80536850a001b90fd0e9e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnGrQBFPptA2GU_Nx8KrxRGtyAS7PIlwjw" + nickname="Nathan" + subject="me too." + date="2013-06-24T07:33:54Z" + content=""" +I'm having the exact same problem (OSX 10.8.2) +"""]] From c40021e736d48df9abb815c462e4a26c2404b17c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmZ9EwisYI1DDev8HXY6zFjPrLKt60-3QI" Date: Mon, 24 Jun 2013 12:23:16 +0000 Subject: [PATCH 12/74] Added a comment --- .../comment_1_26c1734d41d5374f18fc688d862d6b8e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/multiple_routes_to_same_repository/comment_1_26c1734d41d5374f18fc688d862d6b8e._comment diff --git a/doc/forum/multiple_routes_to_same_repository/comment_1_26c1734d41d5374f18fc688d862d6b8e._comment b/doc/forum/multiple_routes_to_same_repository/comment_1_26c1734d41d5374f18fc688d862d6b8e._comment new file mode 100644 index 0000000000..94eadcd557 --- /dev/null +++ b/doc/forum/multiple_routes_to_same_repository/comment_1_26c1734d41d5374f18fc688d862d6b8e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmZ9EwisYI1DDev8HXY6zFjPrLKt60-3QI" + nickname="Yo" + subject="comment 1" + date="2013-06-24T12:23:15Z" + content=""" +I believe I have a similar set up as you're trying to achieve. What I did was just add a repository using the public domain name only (DDNS). My home router seems to be smart enough to realize the IP the domain name resolves to is its own, so I get gigabit speeds when at home, and I can still access it when I'm not at home. +"""]] From ce9be5ec14bf2e4eeb685c60b3f7860da81a8ea4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Jun 2013 12:44:51 -0400 Subject: [PATCH 13/74] fix crash in drop scan when there are no associated files maximum is partial, so need to ensure the list is not empty. This lack of associated files would most likely be a problem -- and fsck fixes it. It could also occur legitimately due to a race. --- Assistant/Drop.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index 4e81c284ab..1fc2f75d92 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -45,7 +45,11 @@ handleDropsFrom :: [UUID] -> [Remote] -> Reason -> Bool -> Key -> AssociatedFile handleDropsFrom _ _ _ _ _ Nothing _ = noop handleDropsFrom locs rs reason fromhere key (Just afile) knownpresentremote = do fs <- liftAnnex $ ifM isDirect - ( associatedFilesRelative key + ( do + l <- associatedFilesRelative key + if null l + then return [afile] + else return l , return [afile] ) n <- getcopies fs From 11bf82855a0b936b98a5b7a5031f02520fddc165 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Mon, 24 Jun 2013 17:48:03 +0000 Subject: [PATCH 14/74] Added a comment: Impossible? --- ...comment_3_fab70c642d5aaf26de05270860281030._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/preferred_content_settings_for_multiple_symlinks/comment_3_fab70c642d5aaf26de05270860281030._comment diff --git a/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_3_fab70c642d5aaf26de05270860281030._comment b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_3_fab70c642d5aaf26de05270860281030._comment new file mode 100644 index 0000000000..12c49a89c7 --- /dev/null +++ b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_3_fab70c642d5aaf26de05270860281030._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + ip="82.36.235.9" + subject="Impossible?" + date="2013-06-24T17:48:02Z" + content=""" +I have now investigated this further and believe that what I am trying to do is impossible. Suppose we have a file `song.mp3` in both `music/` and `old/` and the special remote's preferred content expression is set-up to prefer `music/` and not to prefer `old/`. So initially, git-annex won't try to upload the content when it scans `old/song.mp3`, but it will when it scans `music/song.mp3`. Fine. Now consider a later scan. On scanning the filename `music/song.mp3` git-annex will suppose the file was dropped from the remote, and then see it would be preferred again so won't drop it. But then when it gets to scanning the filename `old/song.mp3` it will see that it wouldn't be preferred and will drop the content. So we get the loop. + +In order to stop the unwanted drop here, the preferred content expression must prefer \"files in old/* that is also in music/*\" but since preferred content expressions concern filenames without reference to their contents, this is impossible to express. The expression `include=music/* and include=old/*` will never match anything. +"""]] From a35bdcb3f22a6a29d7f33440906657deb2d7940b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Jun 2013 16:26:00 -0400 Subject: [PATCH 15/74] fsck: Ensures that direct mode is used for files when it's enabled. A common failure mode for direct mode has been for files to end up still stored in indirect mode. While I hope that doesn't happen anymore, fsck should deal with it. --- Command/Fsck.hs | 18 +++++++++++++++++- debian/changelog | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index b95ba7ff70..ce1a289899 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -1,6 +1,6 @@ {- git-annex command - - - Copyright 2010-2011 Joey Hess + - Copyright 2010-2013 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -20,6 +20,7 @@ import qualified Types.Key import qualified Backend import Annex.Content import Annex.Content.Direct +import Annex.Direct import Annex.Perms import Annex.Link import Logs.Location @@ -120,6 +121,7 @@ perform key file backend numcopies = check [ fixLink key file , verifyLocationLog key file , verifyDirectMapping key file + , verifyDirectMode key file , checkKeySize key , checkBackend backend key (Just file) , checkKeyNumCopies key file numcopies @@ -275,6 +277,20 @@ verifyDirectMapping key file = do void $ removeAssociatedFile key f return True +{- Ensures that files whose content is available are in direct mode. -} +verifyDirectMode :: Key -> FilePath -> Annex Bool +verifyDirectMode key file = do + whenM (isDirect <&&> islink) $ do + v <- toDirectGen key file + case v of + Nothing -> noop + Just a -> do + showNote "fixing direct mode" + a + return True + where + islink = liftIO $ isSymbolicLink <$> getSymbolicLinkStatus file + {- The size of the data for a key is checked against the size encoded in - the key's metadata, if available. - diff --git a/debian/changelog b/debian/changelog index ec41c91471..dcf5e41af6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ git-annex (4.20130622) UNRELEASED; urgency=low * assistant: Daily sanity check thread is run niced. * bup: Handle /~/ in bup remote paths. Thanks, Oliver Matthews + * fsck: Ensures that direct mode is used for files when it's enabled. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 From e4e2a807f945285e8440b349ce3c7579ba729cc1 Mon Sep 17 00:00:00 2001 From: krig Date: Tue, 25 Jun 2013 06:14:19 +0000 Subject: [PATCH 16/74] Added a comment: Could not resolve dependencies for yesod --- ..._129c4f2e404c874e5adfa52902a81104._comment | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/install/cabal/comment_7_129c4f2e404c874e5adfa52902a81104._comment diff --git a/doc/install/cabal/comment_7_129c4f2e404c874e5adfa52902a81104._comment b/doc/install/cabal/comment_7_129c4f2e404c874e5adfa52902a81104._comment new file mode 100644 index 0000000000..40b202d4e0 --- /dev/null +++ b/doc/install/cabal/comment_7_129c4f2e404c874e5adfa52902a81104._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="krig" + ip="46.194.28.123" + subject="Could not resolve dependencies for yesod" + date="2013-06-25T06:14:18Z" + content=""" +I'm having problems installing from cabal, and it seems related to yesod. I found an older discussion on something similar, where a constraint to require a newer version of yesod had been added, but I haven't figured out what was done to solve it. + +The problem seems to be that git-annex requires yesod < 1.2, but cabal is unable to install an older version. + + $ cabal install git-annex --bindir=$HOME/bin + Resolving dependencies... + cabal: Could not resolve dependencies: + trying: git-annex-4.20130601 + trying: git-annex-4.20130601:+webapp + rejecting: yesod-1.2.1.1, 1.2.1, 1.2.0.1, 1.2.0 (conflict: + git-annex-4.20130601:webapp => yesod(<1.2)) + trying: yesod-1.1.9.3 + $ + +From what I can tell, the problem is fixed in github master since yesod >= 1.2 is supported again. +"""]] From 7967bb197cf42e2ee4c8cd0c36a8f6ae7e0bc751 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawn-KDr_Z4CMkjS0v_TxQ08SzAB5ecHG3K0" Date: Tue, 25 Jun 2013 10:30:08 +0000 Subject: [PATCH 17/74] Added a comment: This sounds good --- ...comment_1_431b6e1577bbd30b07dce9002a8fe1a2._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/todo/direct_mode_guard/comment_1_431b6e1577bbd30b07dce9002a8fe1a2._comment diff --git a/doc/todo/direct_mode_guard/comment_1_431b6e1577bbd30b07dce9002a8fe1a2._comment b/doc/todo/direct_mode_guard/comment_1_431b6e1577bbd30b07dce9002a8fe1a2._comment new file mode 100644 index 0000000000..01cddc8a3e --- /dev/null +++ b/doc/todo/direct_mode_guard/comment_1_431b6e1577bbd30b07dce9002a8fe1a2._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn-KDr_Z4CMkjS0v_TxQ08SzAB5ecHG3K0" + nickname="Glen" + subject="This sounds good" + date="2013-06-25T10:30:07Z" + content=""" +I think we might have been talking about this feature.. Seems like a good idea to me. + +Glen +"""]] From fc4a4c2b97f3f32234d027d92c6da18bf6b5608d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnrFnHRRNUQBB5RCDaIwhVmCcxQp8_yiYw" Date: Tue, 25 Jun 2013 11:19:34 +0000 Subject: [PATCH 18/74] Added a comment --- ...comment_2_6c360c64093b016c2150206dc3ad1709._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_2_6c360c64093b016c2150206dc3ad1709._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_2_6c360c64093b016c2150206dc3ad1709._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_2_6c360c64093b016c2150206dc3ad1709._comment new file mode 100644 index 0000000000..46c53294ce --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_2_6c360c64093b016c2150206dc3ad1709._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnrFnHRRNUQBB5RCDaIwhVmCcxQp8_yiYw" + nickname="Oliver" + subject="comment 2" + date="2013-06-25T11:19:34Z" + content=""" +Had that on snow leopard as well, using both the release and the nightlies. In the end I built it myself using cabal and that was OK. + +Possibly using the cli from inside the app to initialize the repo might fix it. +"""]] From 648a5bdfcdd26c232bce8bbb69e426283229bda2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnVTPaZaIfnZqDbkmW97pqxwi2QuZIJAF4" Date: Tue, 25 Jun 2013 13:00:46 +0000 Subject: [PATCH 19/74] Added a comment: jabberd also affected --- ..._151d3fd7d3cceb30fd20a8f3bd54036c._comment | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/forum/XMPP_authentication_failure/comment_8_151d3fd7d3cceb30fd20a8f3bd54036c._comment diff --git a/doc/forum/XMPP_authentication_failure/comment_8_151d3fd7d3cceb30fd20a8f3bd54036c._comment b/doc/forum/XMPP_authentication_failure/comment_8_151d3fd7d3cceb30fd20a8f3bd54036c._comment new file mode 100644 index 0000000000..2700343ca2 --- /dev/null +++ b/doc/forum/XMPP_authentication_failure/comment_8_151d3fd7d3cceb30fd20a8f3bd54036c._comment @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnVTPaZaIfnZqDbkmW97pqxwi2QuZIJAF4" + nickname="Boris" + subject="jabberd also affected" + date="2013-06-25T13:00:46Z" + content=""" +I tried logging in to my local 'jabberd' server and got the same response: + +AuthenticationError \"No supported authentication mechanism\" + +checking the version gives: + + jabberd -v + jabberd14 version 1.6.1.1 + + The following optional features have been enabled: + - support for IPv6. + - support for TLS using GNU TLS + - support for MySQL + - support for PostgreSQL + +-------------- +Can I do anything, investigate something? +"""]] From 9c79659515d2dcad37e6ec2318b8114697452676 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnGrQBFPptA2GU_Nx8KrxRGtyAS7PIlwjw" Date: Tue, 25 Jun 2013 13:39:55 +0000 Subject: [PATCH 20/74] Added a comment --- ...3_7b77fd9b7dc236c345f2f6149c8138ee._comment | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_3_7b77fd9b7dc236c345f2f6149c8138ee._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_3_7b77fd9b7dc236c345f2f6149c8138ee._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_3_7b77fd9b7dc236c345f2f6149c8138ee._comment new file mode 100644 index 0000000000..823474f95a --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_3_7b77fd9b7dc236c345f2f6149c8138ee._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnGrQBFPptA2GU_Nx8KrxRGtyAS7PIlwjw" + nickname="Nathan" + subject="comment 3" + date="2013-06-25T13:39:55Z" + content=""" +Hi there, I couldn't get it to build with cabal (likely my fault, ie. inexperience). + +Can I please confirm something: Theoretically I dont need to do *any* preparation to start using git-annex assistant, right? As in I dont need to first configure git separately, or set up any folder hierarchies or such? The idea is that the assistant itself does all that's required? I just wonder if through my naivety I am missing a basic step and making a rookie mistake. + +A couple of notes: + +Running **/Applications/git-annex.app/Contents/MacOS/git-annex init** + +Returns **git-annex: Not in a git repository.** + +Any further assistance you may offer woudl be great, because I'd love to start investigating the potential for using git-annex in a multi-user environment (managing motion design projects). +"""]] From 36a6261cd8feefa4d7ca2707f7ee103d001699c9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" Date: Tue, 25 Jun 2013 14:54:36 +0000 Subject: [PATCH 21/74] Added a comment --- .../comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment new file mode 100644 index 0000000000..adc6b617b0 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" + nickname="Darren" + subject="comment 4" + date="2013-06-25T14:54:36Z" + content=""" +same problem here, latest version from the website and running OSX 10.8.4. +"""]] From 1dd3ffd42af8b4dcf64859458a53b6717be02cd1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" Date: Tue, 25 Jun 2013 14:54:47 +0000 Subject: [PATCH 22/74] Added a comment --- .../comment_5_08289596445d7588e43d35490fbfe5f4._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_08289596445d7588e43d35490fbfe5f4._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_08289596445d7588e43d35490fbfe5f4._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_08289596445d7588e43d35490fbfe5f4._comment new file mode 100644 index 0000000000..d9700eab0d --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_08289596445d7588e43d35490fbfe5f4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" + nickname="Darren" + subject="comment 5" + date="2013-06-25T14:54:47Z" + content=""" +same problem here, latest version from the website and running OSX 10.8.4. +"""]] From aeb28ee79e5f3999a99ba08f43ce3026fb6782e5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" Date: Tue, 25 Jun 2013 14:55:09 +0000 Subject: [PATCH 23/74] removed --- .../comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment deleted file mode 100644 index adc6b617b0..0000000000 --- a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_4_568d38f7c6c9f9d79e9ae7901583b0a7._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawmxns2UBAMDbTwrwHq_Lx1sNKrVVayq1X4" - nickname="Darren" - subject="comment 4" - date="2013-06-25T14:54:36Z" - content=""" -same problem here, latest version from the website and running OSX 10.8.4. -"""]] From 9c11e594d5b0e3a0791b1bf53f3865128c925fd4 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:10:17 +0000 Subject: [PATCH 24/74] Added a comment --- .../comment_1_0450673ab74f184a47ac7bab568d26dc._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git-annex_teams___47___groups/comment_1_0450673ab74f184a47ac7bab568d26dc._comment diff --git a/doc/forum/git-annex_teams___47___groups/comment_1_0450673ab74f184a47ac7bab568d26dc._comment b/doc/forum/git-annex_teams___47___groups/comment_1_0450673ab74f184a47ac7bab568d26dc._comment new file mode 100644 index 0000000000..4b77da8f55 --- /dev/null +++ b/doc/forum/git-annex_teams___47___groups/comment_1_0450673ab74f184a47ac7bab568d26dc._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T17:10:17Z" + content=""" +Anyone with access to a git repository can access all the files stored in it. git-annex does not try to change this, so you need to find a way to have one repository for each group. +"""]] From 28d012d3b4e2860be56468a7b970df658cff71a4 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:12:17 +0000 Subject: [PATCH 25/74] Added a comment --- ...comment_2_8f978d2811c8fbf11e3d12f245bdb52b._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/design/assistant/blog/day_267__windows_autobuilder/comment_2_8f978d2811c8fbf11e3d12f245bdb52b._comment diff --git a/doc/design/assistant/blog/day_267__windows_autobuilder/comment_2_8f978d2811c8fbf11e3d12f245bdb52b._comment b/doc/design/assistant/blog/day_267__windows_autobuilder/comment_2_8f978d2811c8fbf11e3d12f245bdb52b._comment new file mode 100644 index 0000000000..796dea21e7 --- /dev/null +++ b/doc/design/assistant/blog/day_267__windows_autobuilder/comment_2_8f978d2811c8fbf11e3d12f245bdb52b._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 2" + date="2013-06-25T17:12:17Z" + content=""" +That is the same problem that is currently making the test suite fail on the windows autobuilder. + +I don't know what is causing this problem, and have not been able to reproduce it locally in order to debug it. +"""]] From 46baeef9fa51915b55456557c1fca0146d66ddc5 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:14:02 +0000 Subject: [PATCH 26/74] Added a comment --- .../comment_5_2a336fe7b8aed07cbdaa868bd34078f9._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_2a336fe7b8aed07cbdaa868bd34078f9._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_2a336fe7b8aed07cbdaa868bd34078f9._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_2a336fe7b8aed07cbdaa868bd34078f9._comment new file mode 100644 index 0000000000..aceafcf9f4 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_5_2a336fe7b8aed07cbdaa868bd34078f9._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 5" + date="2013-06-25T17:14:02Z" + content=""" +To get this fixed, someone is going to need to do some investigation of what is happening. I do not have resources to debug OSX problems that cannot be reproduced using the command line. +"""]] From 03efc426df59c415323cd84aae03f9857880248f Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:16:46 +0000 Subject: [PATCH 27/74] Added a comment --- .../comment_8_738c108f131e3aab0d720bc4fd6a81fd._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/install/cabal/comment_8_738c108f131e3aab0d720bc4fd6a81fd._comment diff --git a/doc/install/cabal/comment_8_738c108f131e3aab0d720bc4fd6a81fd._comment b/doc/install/cabal/comment_8_738c108f131e3aab0d720bc4fd6a81fd._comment new file mode 100644 index 0000000000..536f30da09 --- /dev/null +++ b/doc/install/cabal/comment_8_738c108f131e3aab0d720bc4fd6a81fd._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 8" + date="2013-06-25T17:16:46Z" + content=""" +git-annex 4.20130621 once again builds with the current version of yesod. +"""]] From aa9fca1fd2c8cd6158217a3331219f7a9d406f64 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:18:56 +0000 Subject: [PATCH 28/74] Added a comment --- .../comment_9_fbb9eba65fbb72201f08511945fbcf8c._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/XMPP_authentication_failure/comment_9_fbb9eba65fbb72201f08511945fbcf8c._comment diff --git a/doc/forum/XMPP_authentication_failure/comment_9_fbb9eba65fbb72201f08511945fbcf8c._comment b/doc/forum/XMPP_authentication_failure/comment_9_fbb9eba65fbb72201f08511945fbcf8c._comment new file mode 100644 index 0000000000..e019056de6 --- /dev/null +++ b/doc/forum/XMPP_authentication_failure/comment_9_fbb9eba65fbb72201f08511945fbcf8c._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 9" + date="2013-06-25T17:18:56Z" + content=""" +Boris, that seems like an unrelated problem to the one affecting ejabberd. Different error message. + +"""]] From b9f8a95852262b07a8dce5c4fe2dd2f4cbe057d8 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:22:53 +0000 Subject: [PATCH 29/74] Added a comment --- ...comment_4_3cbd06de53b6a13e2741124a8e7b5b5b._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/preferred_content_settings_for_multiple_symlinks/comment_4_3cbd06de53b6a13e2741124a8e7b5b5b._comment diff --git a/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_4_3cbd06de53b6a13e2741124a8e7b5b5b._comment b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_4_3cbd06de53b6a13e2741124a8e7b5b5b._comment new file mode 100644 index 0000000000..1868e9736a --- /dev/null +++ b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_4_3cbd06de53b6a13e2741124a8e7b5b5b._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 4" + date="2013-06-25T17:22:53Z" + content=""" +spwhitton, your analysis is correct -- except this problem was finessed in git-annex version 4.20130621. Now, when using direct mode, it knows that `old/song.mp3` is also `music/song.mp3`, and so it only drops it if the preferred content expression allows dropping both files. + +Still doesn't work in indirect mode, and I think not likely to in the forseeable future. See [[bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time]] +"""]] From 5d675c1ece4941da49ff81401ffbd2d5ecd538f4 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:26:25 +0000 Subject: [PATCH 30/74] Added a comment --- .../comment_1_019a2457e07377510feaa089a93bd76c._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size/comment_1_019a2457e07377510feaa089a93bd76c._comment diff --git a/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size/comment_1_019a2457e07377510feaa089a93bd76c._comment b/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size/comment_1_019a2457e07377510feaa089a93bd76c._comment new file mode 100644 index 0000000000..4a59f37f12 --- /dev/null +++ b/doc/todo/wishlist:_Have_a_preview_of_download_or_upload_size/comment_1_019a2457e07377510feaa089a93bd76c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T17:26:25Z" + content=""" +git-annex is designed to work with really large trees of files, and so it processes files one at a time in a stream. To get an overall estimate of the size, it would need to traverse the whole directory to get the total, and then traverse it again to perform the transfer. This would make no-op transfers take twice as long, which is why I'm unlikely to implement it. +"""]] From 7abc3390dab2d2cf45c9c97018a9467832ed1a05 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:30:05 +0000 Subject: [PATCH 31/74] Added a comment --- .../comment_1_ca195af3ba4a286eb5ab687634192fa4._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Problems_with_syncing_gnucash/comment_1_ca195af3ba4a286eb5ab687634192fa4._comment diff --git a/doc/bugs/Problems_with_syncing_gnucash/comment_1_ca195af3ba4a286eb5ab687634192fa4._comment b/doc/bugs/Problems_with_syncing_gnucash/comment_1_ca195af3ba4a286eb5ab687634192fa4._comment new file mode 100644 index 0000000000..481f65d5bf --- /dev/null +++ b/doc/bugs/Problems_with_syncing_gnucash/comment_1_ca195af3ba4a286eb5ab687634192fa4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T17:30:05Z" + content=""" +First of all, are you sure that git-annex is even the right tool for this job? gnucash files tend to be pretty small, and are easy to check into git directly. What happens if two machines make conflicting edits, and the git-annex assistant automatically resolves the merge conflict by moving files around and making .variant copies of gnucash log files? +"""]] From bf9df89894f0dd2612be8194fc70c4d89d2245d9 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:49:08 +0000 Subject: [PATCH 32/74] Added a comment --- ..._754fb430381ad88e6248ecb902b32118._comment | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/bugs/Problems_with_syncing_gnucash/comment_2_754fb430381ad88e6248ecb902b32118._comment diff --git a/doc/bugs/Problems_with_syncing_gnucash/comment_2_754fb430381ad88e6248ecb902b32118._comment b/doc/bugs/Problems_with_syncing_gnucash/comment_2_754fb430381ad88e6248ecb902b32118._comment new file mode 100644 index 0000000000..ff81b4d988 --- /dev/null +++ b/doc/bugs/Problems_with_syncing_gnucash/comment_2_754fb430381ad88e6248ecb902b32118._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 2" + date="2013-06-25T17:49:08Z" + content=""" +I was able to reproduce this with gnucash, and came up with a small test case: + +[[!format perl \"\"\" +my $foo=\"foo\"; +open(OUT, \">$foo.new\"); +link(\"$foo.new\", \"$foo\"); +unlink(\"$foo.new\"); +close OUT; +\"\"\"]] + +This defeats the watcher, which sees the file be opened for write, and then deleted before it's closed. To fix this it would need to correlate the hard link with the original file, to know that when the original file is closed, the hard link can now be safely added to the annex. + +The daily sanity checker will find and eventually add these files, or the assistant will see them the next time it's started. +"""]] From ca5285c6a9e40d51f92daf1a63b49328e04bc0dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 13:50:05 -0400 Subject: [PATCH 33/74] categorize --- doc/bugs/Problems_with_syncing_gnucash.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn index 92c7f2e601..15a7076071 100644 --- a/doc/bugs/Problems_with_syncing_gnucash.mdwn +++ b/doc/bugs/Problems_with_syncing_gnucash.mdwn @@ -561,3 +561,6 @@ Everything up-to-date [2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"] [2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"] """]] + +[[!tag /design/assistant]] +[[!meta title="hard link to open file which is then deleted"]] From 986d8e96203462a421273fc06f83b49b87e70bce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 13:55:17 -0400 Subject: [PATCH 34/74] close --- ...windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn index 84f7717b5f..76c05aa72f 100644 --- a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn +++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn @@ -554,3 +554,6 @@ C:\joe\backup\repo-bak> # End of transcript or log. """]] + +> Apparently the last of the issues discussed here is fixed. +> Closing this bug report before it grows a new issue. ;) [[done]] --[[Joey]] From 37d245286eda8265f51ab88f1da20abb99f52e07 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 17:58:57 +0000 Subject: [PATCH 35/74] Added a comment --- .../comment_2_74cccae04ea23a8600069c7e658143aa._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/install/Android/comment_2_74cccae04ea23a8600069c7e658143aa._comment diff --git a/doc/install/Android/comment_2_74cccae04ea23a8600069c7e658143aa._comment b/doc/install/Android/comment_2_74cccae04ea23a8600069c7e658143aa._comment new file mode 100644 index 0000000000..bf5978674c --- /dev/null +++ b/doc/install/Android/comment_2_74cccae04ea23a8600069c7e658143aa._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 2" + date="2013-06-25T17:58:57Z" + content=""" +I have not heard of anyone using older than 4.x with success. In particular, several people reported 2.3 doesn't work. +"""]] From 4b3abb35f891c5dd10f5223a85c1ca53b3685083 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 14:01:58 -0400 Subject: [PATCH 36/74] close --- .../wishlist:_Add_to_Android_version_to_Google_Play.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) 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 index a08c00a37a..f9016fb4d3 100644 --- a/doc/todo/wishlist:_Add_to_Android_version_to_Google_Play.mdwn +++ b/doc/todo/wishlist:_Add_to_Android_version_to_Google_Play.mdwn @@ -1,3 +1,9 @@ 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. + +> While it's vaid to wish that someone might put the apk into Google Play, +> I a) don't feel it's ready b) don't know if I want to go through +> the rigamarole required to use that service and c) don't feel this +> bug tracker is an appropriate place to track what is effectively a +> nontechnical request. [[done]] --[[Joey]] From 0e17ad1a7952cb4a725f280e69044048670ed68b Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 18:08:55 +0000 Subject: [PATCH 37/74] Added a comment --- ...comment_1_8229df64a872bee7590f75eb78f78c4a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_1_8229df64a872bee7590f75eb78f78c4a._comment diff --git a/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_1_8229df64a872bee7590f75eb78f78c4a._comment b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_1_8229df64a872bee7590f75eb78f78c4a._comment new file mode 100644 index 0000000000..26881f17b2 --- /dev/null +++ b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_1_8229df64a872bee7590f75eb78f78c4a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T18:08:55Z" + content=""" +As far as I know, there have been no changes to the local pairing protocol that would cause a problem like this. 3.20121112 is a few months after local pairing was first developed. + +Have you tried upgrading and re-pairing? +"""]] From 5d1611aae49feeb3560e21f1373c6dc4b8e2bc1b Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 18:20:05 +0000 Subject: [PATCH 38/74] Added a comment --- ...ent_1_88fbf70eae48484988dbb433a437c717._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo/comment_1_88fbf70eae48484988dbb433a437c717._comment diff --git a/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo/comment_1_88fbf70eae48484988dbb433a437c717._comment b/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo/comment_1_88fbf70eae48484988dbb433a437c717._comment new file mode 100644 index 0000000000..84686f1e45 --- /dev/null +++ b/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo/comment_1_88fbf70eae48484988dbb433a437c717._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T18:20:05Z" + content=""" +It's true that deleting a ssh repository in the webapp does not delete any ssh keys that the webapp configured to access that repository. I'm a bit reluctant to try to clean it up entirely automatically, because the ssh configuration might have been manually altered, or might be used by another local repository. Particularly, if another local repo is set up to use the same ssh remote, the webapp will reuse the ssh key. + +> Create, delete and create again a new repo on remote ssh server with password auth. + +I tried doing this, and did not encounter any problem. Since the new repo had a different path on the ssh server, I simply ended up with two ssh keys configured in `~/.ssh/config` for two different repositories. The presence or absence of the first key did not affect the second key. + +I think you need to go into more detail about exactly what you did, or show the files in .ssh that were set up, so I can see what the actual problem is. +"""]] From 10072157cb6205ef954afd92bb7c5cef9ebbf35f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 14:46:20 -0400 Subject: [PATCH 39/74] webapp: Fix bug when setting up a remote ssh repo repeatedly on the same server. The ssh setup first runs ssh to the real hostname, to probe if a ssh key is needed. If one is, it generates a mangled hostname that uses a key. This mangled hostname was being used to ssh into the server to set up the key. But if the server already had the key set up, and it was locked down, the setup would fail. This changes it to use the real hostname when sshing in to set up the key, which avoids the problem. Note that it will redundantly set up the key on the ssh server. But it's the same key; the ssh key generation code uses the key if it already exists. --- Assistant/WebApp/Configurators/Ssh.hs | 12 ++++++------ debian/changelog | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs index ffef008495..c4308f00b8 100644 --- a/Assistant/WebApp/Configurators/Ssh.hs +++ b/Assistant/WebApp/Configurators/Ssh.hs @@ -284,18 +284,18 @@ makeSsh rsync setup sshdata | needsPubKey sshdata = do keypair <- liftIO genSshKeyPair sshdata' <- liftIO $ setupSshKeyPair keypair sshdata - makeSsh' rsync setup sshdata' (Just keypair) + makeSsh' rsync setup sshdata sshdata' (Just keypair) | sshPort sshdata /= 22 = do sshdata' <- liftIO $ setSshConfig sshdata [] - makeSsh' rsync setup sshdata' Nothing - | otherwise = makeSsh' rsync setup sshdata Nothing + makeSsh' rsync setup sshdata sshdata' Nothing + | otherwise = makeSsh' rsync setup sshdata sshdata Nothing -makeSsh' :: Bool -> (Remote -> Handler ()) -> SshData -> Maybe SshKeyPair -> Handler RepHtml -makeSsh' rsync setup sshdata keypair = +makeSsh' :: Bool -> (Remote -> Handler ()) -> SshData -> SshData -> Maybe SshKeyPair -> Handler RepHtml +makeSsh' rsync setup origsshdata sshdata keypair = do sshSetup [sshhost, remoteCommand] "" $ makeSshRepo rsync setup sshdata where - sshhost = genSshHost (sshHostName sshdata) (sshUserName sshdata) + sshhost = genSshHost (sshHostName origsshdata) (sshUserName origsshdata) remotedir = T.unpack $ sshDirectory sshdata remoteCommand = shellWrap $ intercalate "&&" $ catMaybes [ Just $ "mkdir -p " ++ shellEscape remotedir diff --git a/debian/changelog b/debian/changelog index dcf5e41af6..85a356122b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ git-annex (4.20130622) UNRELEASED; urgency=low * bup: Handle /~/ in bup remote paths. Thanks, Oliver Matthews * fsck: Ensures that direct mode is used for files when it's enabled. + * webapp: Fix bug when setting up a remote ssh repo repeatedly on the same + server. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 From 3f0c74685e1d3ba6135768181dfaf282fa3f6136 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm01ida6POv7vqyUYtOlymEbJTbrImAIzM" Date: Tue, 25 Jun 2013 18:50:00 +0000 Subject: [PATCH 40/74] Added a comment --- ...mment_2_f37be896396915b1c85cff8811dceb4a._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_2_f37be896396915b1c85cff8811dceb4a._comment diff --git a/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_2_f37be896396915b1c85cff8811dceb4a._comment b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_2_f37be896396915b1c85cff8811dceb4a._comment new file mode 100644 index 0000000000..d9ad17e79f --- /dev/null +++ b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_2_f37be896396915b1c85cff8811dceb4a._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm01ida6POv7vqyUYtOlymEbJTbrImAIzM" + nickname="Reinis" + subject="comment 2" + date="2013-06-25T18:50:00Z" + content=""" +I have not tried to upgrade, but I fixed it using annex describe followed by assistant restart as hinted in /usr/share/doc/git-annex/html/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.html. + +From that document I understood that at worst it should use one of the two uuids (from Ubuntu or Gentoo repo), but it should not leave it without uuid and hence this report. + +I have tried it a couple of times and it is perfectly reproducible. +"""]] From a42ba34b8b16dd713d6522490288c346f9645352 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 19:13:06 +0000 Subject: [PATCH 41/74] Added a comment --- ...comment_3_df7fc1078059538a76f384a40541e91f._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_3_df7fc1078059538a76f384a40541e91f._comment diff --git a/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_3_df7fc1078059538a76f384a40541e91f._comment b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_3_df7fc1078059538a76f384a40541e91f._comment new file mode 100644 index 0000000000..75fd81d465 --- /dev/null +++ b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_3_df7fc1078059538a76f384a40541e91f._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 3" + date="2013-06-25T19:13:06Z" + content=""" +An old bug report that was fixed in 2011 seems very unlikely to have anything to do with your local pairing problem. + +Why don't you try upgrading? +"""]] From c8e694769394f80b8b2ba10607ab0b26d0eeb738 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 15:23:46 -0400 Subject: [PATCH 42/74] webapp: Ensure that ssh keys generated for different directories on a server are always different. --- Assistant/Ssh.hs | 10 ++++++- debian/changelog | 2 ++ ...ository_on_the_server_don__39__t_work.mdwn | 30 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 87347571ec..38ec347cb3 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -16,6 +16,7 @@ import Git.Remote import Data.Text (Text) import qualified Data.Text as T import Data.Char +import Network.URI data SshData = SshData { sshHostName :: Text @@ -216,10 +217,16 @@ setSshConfig sshdata config = do {- This hostname is specific to a given repository on the ssh host, - so it is based on the real hostname, the username, and the directory. + - + - The mangled hostname has the form "git-annex-realhostname-username_dir". + - The only use of "-" is to separate the parts shown; this is necessary + - to allow unMangleSshHostName to work. Any unusual characters in the + - username or directory are url encoded, except using "." rather than "%" + - (the latter has special meaning to ssh). -} mangleSshHostName :: SshData -> String mangleSshHostName sshdata = "git-annex-" ++ T.unpack (sshHostName sshdata) - ++ "-" ++ filter safe extra + ++ "-" ++ escape extra where extra = intercalate "_" $ map T.unpack $ catMaybes [ sshUserName sshdata @@ -229,6 +236,7 @@ mangleSshHostName sshdata = "git-annex-" ++ T.unpack (sshHostName sshdata) | isAlphaNum c = True | c == '_' = True | otherwise = False + escape s = replace "%" "." $ escapeURIString safe s {- Extracts the real hostname from a mangled ssh hostname. -} unMangleSshHostName :: String -> String diff --git a/debian/changelog b/debian/changelog index 85a356122b..b465fac5eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (4.20130622) UNRELEASED; urgency=low * fsck: Ensures that direct mode is used for files when it's enabled. * webapp: Fix bug when setting up a remote ssh repo repeatedly on the same server. + * webapp: Ensure that ssh keys generated for different directories + on a server are always different. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn index 0e950f3606..a2fa6a9e56 100644 --- a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn +++ b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn @@ -12,3 +12,33 @@ Linux 64bit Please provide any additional information below. git and git-annex are available on the Remote Server +> While this bug report was about a server that did not get git-annex-shell +> installed in PATH (something trivially fixed by `apt-get install +> git-annex`), the comments below would like to turn this into a bug report about +> the error message "unknown UUID; cannot modify". All right then.. +> --[[Joey]] +> +> This can occur if a ssh key is locked down to use directory A, and a +> new repo is added in directory B which uses the same ssh key. Things will +> then fail when git-annex-shell rejects the attept to use directory B, and +> this results in the webapp displaying an internal server error of +> "unknown UUID; cannot modify" since NoUUID is retreived for the repo. +> +> In fact, I already dealt with this +> once in 79561774450c8abf7c2cb42b08575a3ca27010dc; it used to not use +> the directory name at all as part of the mangled hostname. Most of the +> "me too" responses" predate that fix. +> +> Now, this can only happen +> if the mangled hostname for directory A and B is the same. One way this can +> happen is if the directories are "annex" and "~/annex". In other words, +> I suspect that users are entering "annex" once, and "~/annex" another +> time, when setting up what they intend to be the same repo. Perhaps the +> first time something else fails (like the original problem of +> git-annex-shell not being in path), or they want to set it up again, +> and the next time the subtly different directory is entered. +> +> To fix this, +> `mangleSshHostName` would need to be changed to generate different mangled +> hostnames in all cases. Currently, it skips non-alpha-numeric +> characters in the directory. [[done]] --[[Joey]] From 27ea399405092c217d21a9b49403d2aceb1abcb0 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm01ida6POv7vqyUYtOlymEbJTbrImAIzM" Date: Tue, 25 Jun 2013 19:34:12 +0000 Subject: [PATCH 43/74] Added a comment --- .../comment_4_70c444c61f41df2f59294c10f94f0c09._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_4_70c444c61f41df2f59294c10f94f0c09._comment diff --git a/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_4_70c444c61f41df2f59294c10f94f0c09._comment b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_4_70c444c61f41df2f59294c10f94f0c09._comment new file mode 100644 index 0000000000..8e895be5f0 --- /dev/null +++ b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex/comment_4_70c444c61f41df2f59294c10f94f0c09._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm01ida6POv7vqyUYtOlymEbJTbrImAIzM" + nickname="Reinis" + subject="comment 4" + date="2013-06-25T19:34:12Z" + content=""" +I was expecting the version in distribution which came out two months ago to be somewhat recent, probably unfounded expectation for non-rolling release distribution. I'll add PPA and try using that one. +"""]] From f1fe8edbbba0f68ed14780dc3e3d3e8780875190 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 15:43:46 -0400 Subject: [PATCH 44/74] webapp: Fix bug setting up ssh repo if the user enters "~/" at the start of the path. --- Assistant/MakeRemote.hs | 1 + debian/changelog | 2 ++ .../Use_a_git_repository_on_the_server_don__39__t_work.mdwn | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 6cd542231e..17020c62ab 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -49,6 +49,7 @@ makeSshRemote forcersync sshdata mcost = do h = sshHostName sshdata d | T.pack "/" `T.isPrefixOf` sshDirectory sshdata = sshDirectory sshdata + | T.pack "~/" `T.isPrefixOf` sshDirectory sshdata = T.concat [T.pack "/", sshDirectory sshdata] | otherwise = T.concat [T.pack "/~/", sshDirectory sshdata] {- Runs an action that returns a name of the remote, and finishes adding it. -} diff --git a/debian/changelog b/debian/changelog index b465fac5eb..ee1e2100a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ git-annex (4.20130622) UNRELEASED; urgency=low server. * webapp: Ensure that ssh keys generated for different directories on a server are always different. + * webapp: Fix bug setting up ssh repo if the user enters "~/" at the start + of the path. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn index a2fa6a9e56..1bb9858918 100644 --- a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn +++ b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn @@ -42,3 +42,8 @@ git and git-annex are available on the Remote Server > `mangleSshHostName` would need to be changed to generate different mangled > hostnames in all cases. Currently, it skips non-alpha-numeric > characters in the directory. [[done]] --[[Joey]] +> --[[Joey]] +> +> Additionally, just entering a path starting with "~/" would cause this +> error, since the webapp tacks on "/~/" to make a relative path absolute. +> I've also fixed that. [[done]] --[[Joey]] From 62fc4b4bb564feee9ad7d869936482924b150d71 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Tue, 25 Jun 2013 19:47:19 +0000 Subject: [PATCH 45/74] Added a comment --- ...comment_5_963558ab261d8a6315402d371e8348f9._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/preferred_content_settings_for_multiple_symlinks/comment_5_963558ab261d8a6315402d371e8348f9._comment diff --git a/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_5_963558ab261d8a6315402d371e8348f9._comment b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_5_963558ab261d8a6315402d371e8348f9._comment new file mode 100644 index 0000000000..f7ae3216a4 --- /dev/null +++ b/doc/forum/preferred_content_settings_for_multiple_symlinks/comment_5_963558ab261d8a6315402d371e8348f9._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + ip="82.36.235.9" + subject="comment 5" + date="2013-06-25T19:47:19Z" + content=""" +I assume you mean that if I use direct mode locally, it will get things right. I didn't think a special remote could ever be in direct mode. + +Thank you for the info. I don't want to lose the safeguards of indirect mode just for this, so I'll stick with my inelegant manual preferred content strings for now. +"""]] From 0de4d8f614d864faeda5c5f3cb9cfbb6258597c6 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 19:49:25 +0000 Subject: [PATCH 46/74] Added a comment --- ...comment_1_cceba12ed25cd671c7cee5a28631163e._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/endless_password_prompt_loop/comment_1_cceba12ed25cd671c7cee5a28631163e._comment diff --git a/doc/forum/endless_password_prompt_loop/comment_1_cceba12ed25cd671c7cee5a28631163e._comment b/doc/forum/endless_password_prompt_loop/comment_1_cceba12ed25cd671c7cee5a28631163e._comment new file mode 100644 index 0000000000..d162ff3e52 --- /dev/null +++ b/doc/forum/endless_password_prompt_loop/comment_1_cceba12ed25cd671c7cee5a28631163e._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 1" + date="2013-06-25T19:49:25Z" + content=""" +What version of git-annex? Did more than one password prompt window somehow appear at the same time? What is doing the ssh password prompting, is it ssh-askpass, or something provided by your desktop environment? + +What happens if you manually ssh from your computer to the NAS, using the special hostname that git-annex has configured (you can find this hostname in the `.git/config`). `ssh -v` is generally a good way to track these problems down. +"""]] From e540177f2ac9427d666b7e1267284e6decec9de8 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Tue, 25 Jun 2013 20:05:46 +0000 Subject: [PATCH 47/74] Added a comment --- .../comment_2_d119ab485fb2d5512c15372efdb2327d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/multiple_routes_to_same_repository/comment_2_d119ab485fb2d5512c15372efdb2327d._comment diff --git a/doc/forum/multiple_routes_to_same_repository/comment_2_d119ab485fb2d5512c15372efdb2327d._comment b/doc/forum/multiple_routes_to_same_repository/comment_2_d119ab485fb2d5512c15372efdb2327d._comment new file mode 100644 index 0000000000..48cae0211b --- /dev/null +++ b/doc/forum/multiple_routes_to_same_repository/comment_2_d119ab485fb2d5512c15372efdb2327d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 2" + date="2013-06-25T20:05:46Z" + content=""" +I don't see anything that prevents you from adding two repositories that use different names for the same server. +"""]] From 5e2b5ebd151130157bd665884e1086c4e43fc6f6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jun 2013 17:32:50 -0400 Subject: [PATCH 48/74] blog for the day --- .../blog/day_288__success_stories.mdwn | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories.mdwn diff --git a/doc/design/assistant/blog/day_288__success_stories.mdwn b/doc/design/assistant/blog/day_288__success_stories.mdwn new file mode 100644 index 0000000000..c19f64e1ff --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories.mdwn @@ -0,0 +1,32 @@ +Got caught up on a big queue of messages today. Mostly I hear from people +when git-annex is not working for them, or they have a question about using +it. From time to time someone does mention that it's working for them. + +> We have 4 or so machines all synching with each other via the local +> network thing. I'm always amazed when it doesn't just explode :) + +Due to the nature of git-annex, a lot of people can be using it without +anyone knowing about it. Which is great. But these little success stories +can make all the difference. It motivates me to keep pounding out the +development hours, it encourages other people to try it, and it'd be a good +thing to be able to point at if I tried to raise more funding now that I'm +out of Kickstarter money. + +I'm posting my own success story to my main blog: +[git annex and my mom](http://joeyh.name/blog/entry/git_annex_and_my_mom) + +If you have a success story to share, why not blog about it, microblog it, +or just post a comment here, or even send me a private message. Just a +quick note is fine. Thanks! + +---- + +Going through the bug reports and questions today, I ended up fixing +three separate bugs that could break setting up a repo on a remote ssh +server from the webapp. + +Also developed a minimal test case for some gnucash behavior that prevents +the watcher from seeing files it writes out. I understand the problem, +but don't have a fix for that yet. Will have to think about it. (A year ago +today, my blog featured the +[[first_release_of_the_watcher|day_16__more_robust_syncing]].) From 8685af7df29541a258b3f7f2ca867b2b84c3e38a Mon Sep 17 00:00:00 2001 From: "http://edheil.wordpress.com/" Date: Tue, 25 Jun 2013 22:26:27 +0000 Subject: [PATCH 49/74] Added a comment --- ...omment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories/comment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment b/doc/design/assistant/blog/day_288__success_stories/comment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment new file mode 100644 index 0000000000..494cb798a5 --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories/comment_1_22b28ca3d4d3283ad8c21ae052fb9752._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://edheil.wordpress.com/" + ip="99.54.57.201" + subject="comment 1" + date="2013-06-25T22:26:27Z" + content=""" +I've been real quiet cause everything's been working great. :) + +One thing I have not messed with yet is the whole XMPP thing. I mostly don't share between two machines that are online at the same time, I just use git annex for backups and to have content \"optionally\" available. I should give XMPP a try sometime. + +"""]] From fd828957211ecdec29f4b12a09b382c72e50f2b9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" Date: Wed, 26 Jun 2013 02:47:35 +0000 Subject: [PATCH 50/74] Added a comment: Happy to debug --- ...comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment new file mode 100644 index 0000000000..16ecca625c --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_6_ea7a40c3b6748738421aed00a6f7ca10._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" + nickname="Zellyn" + subject="Happy to debug" + date="2013-06-26T02:47:35Z" + content=""" +Hi Joey, I'm having the same problem. I'm currently trying the homebrew route. + +I would be happy to debug, but I'm not familiar at all with git annex or the assistant, so I don't even know where to start looking. Let me know what would be useful to try, and I'll try it and post the results. +"""]] From 8341d42745b68723fce43f698c6ddf0b986b7a3c Mon Sep 17 00:00:00 2001 From: "46.115.86.1" <46.115.86.1@web> Date: Wed, 26 Jun 2013 03:34:39 +0000 Subject: [PATCH 51/74] poll vote (/sdcard/annex) --- doc/design/assistant/polls/Android_default_directory.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index b8587cf84d..7ab99dc049 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 48 "/sdcard/annex" 4 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 49 "/sdcard/annex" 4 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] From 35475ff43f98e2d91c3afd45e9013553399df5d5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" Date: Wed, 26 Jun 2013 04:21:47 +0000 Subject: [PATCH 52/74] Added a comment: More info --- ...nt_7_00962da9288976f8a48d0cbc08e1d9e2._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_7_00962da9288976f8a48d0cbc08e1d9e2._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_7_00962da9288976f8a48d0cbc08e1d9e2._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_7_00962da9288976f8a48d0cbc08e1d9e2._comment new file mode 100644 index 0000000000..2bddffc703 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_7_00962da9288976f8a48d0cbc08e1d9e2._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" + nickname="Zellyn" + subject="More info" + date="2013-06-26T04:21:47Z" + content=""" +Looking at what the browser is doing: + +1. Open file://localhost/var/folders/00/0wpr8000h01000cxqpysvccm003kv1/T/webapp72069.html +2. Meta refresh to: http://127.0.0.1:64190/?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9 +3. Redirect to: http://127.0.0.1:64190/config?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9 +4. Redirect to: http://127.0.0.1:64190/config/repository/new/first?auth=7b8464a1fe3ed0386520bd2b214dbb963864b345151edc0b5febc0310a7974d89fda2ab6464d5791e6b1a474bebb86026b7c90ebb920c51a8291940c75e7c1f9 +5. hang indefinitely + +"""]] From cfb577db0a306d521d9d2f4107d1ef6efab5b950 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~subito" Date: Wed, 26 Jun 2013 07:00:16 +0000 Subject: [PATCH 53/74] Added a comment: Big success! --- ...comment_2_343333356de20e170edb8020faa7400d._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories/comment_2_343333356de20e170edb8020faa7400d._comment diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_2_343333356de20e170edb8020faa7400d._comment b/doc/design/assistant/blog/day_288__success_stories/comment_2_343333356de20e170edb8020faa7400d._comment new file mode 100644 index 0000000000..768469e3e0 --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories/comment_2_343333356de20e170edb8020faa7400d._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://launchpad.net/~subito" + nickname="subito" + subject="Big success!" + date="2013-06-26T07:00:15Z" + content=""" +Annex is working great for me since 8/2012 or something... Using it a lot and the Assistant is awesome! + +If you would raise some more funding, I'd be more than happy to support you once more - really great software! +"""]] From 8e61a9424a132a20edaa4042741c431d5f5ca4d6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" Date: Wed, 26 Jun 2013 08:36:33 +0000 Subject: [PATCH 54/74] Added a comment --- ..._1065e756dc6d66aefd214eb8ac5ebe1d._comment | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/design/assistant/blog/day_285__fixed_the_archive_directory_loop/comment_1_1065e756dc6d66aefd214eb8ac5ebe1d._comment diff --git a/doc/design/assistant/blog/day_285__fixed_the_archive_directory_loop/comment_1_1065e756dc6d66aefd214eb8ac5ebe1d._comment b/doc/design/assistant/blog/day_285__fixed_the_archive_directory_loop/comment_1_1065e756dc6d66aefd214eb8ac5ebe1d._comment new file mode 100644 index 0000000000..41494c02f3 --- /dev/null +++ b/doc/design/assistant/blog/day_285__fixed_the_archive_directory_loop/comment_1_1065e756dc6d66aefd214eb8ac5ebe1d._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" + nickname="Jimmy" + subject="comment 1" + date="2013-06-26T08:36:33Z" + content=""" +Been pretty bad with keeping the osx builder going, but this should fix it... + + +
+[jtang@x00 build ((cfb577d...))]$ git diff
+diff --git a/.gitignore b/.gitignore
+index 93bd49e..717b58a 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -24,3 +24,5 @@ cabal-dev
+ .virthualenv
+ tags
+ Setup
++*.hi
++*.o
+
+ +The build on OSX leaves some stray files and it complains about it. +"""]] From afe452879ca7cc3158316e997de486f1bb8c3eee Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl3A5oeZFLreGhDTFVMOJYIy1auKiTL_ZY" Date: Wed, 26 Jun 2013 15:04:46 +0000 Subject: [PATCH 55/74] Added a comment: :) --- ...nt_3_4e4034bec789543b562ac263df3e21dd._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories/comment_3_4e4034bec789543b562ac263df3e21dd._comment diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_3_4e4034bec789543b562ac263df3e21dd._comment b/doc/design/assistant/blog/day_288__success_stories/comment_3_4e4034bec789543b562ac263df3e21dd._comment new file mode 100644 index 0000000000..c8ae3d7850 --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories/comment_3_4e4034bec789543b562ac263df3e21dd._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl3A5oeZFLreGhDTFVMOJYIy1auKiTL_ZY" + nickname="Maggie" + subject=":)" + date="2013-06-26T15:04:45Z" + content=""" +Poets aren't humble people. +We revel in our own narcissism. +So being mentioned in my brother's blog +was great for me. + +I am proud of the success of Git Annex. + +(My poems tend to be _much_ better than this.) +"""]] From c3bfcdf71d034b51724ea2ba25980a116e36080b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 11:43:45 -0400 Subject: [PATCH 56/74] re-enable .o and .hi exclusion jimmy tells me this was what was breaking his OSX autobuilder. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 93bd49edb9..717b58abc4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ cabal-dev .virthualenv tags Setup +*.hi +*.o From 579446aed48ec5e27d5b68f63779cf9fdb35e5c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 12:30:37 -0400 Subject: [PATCH 57/74] assistant: Fix bug that prevented adding files written by gnucash, and more generally support adding hard links to files. However, other operations on hard links are still unsupported. --- Utility/INotify.hs | 20 +++++++++++++------- debian/changelog | 3 +++ doc/bugs/Problems_with_syncing_gnucash.mdwn | 2 ++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Utility/INotify.hs b/Utility/INotify.hs index 7b5a1fbeae..2ce2b36aa3 100644 --- a/Utility/INotify.hs +++ b/Utility/INotify.hs @@ -90,15 +90,21 @@ watchDir i dir ignored hooks | otherwise -> noop - -- Ignore creation events for regular files, which won't be - -- done being written when initially created, but handle for - -- directories and symlinks. go (Created { isDirectory = isd, filePath = f }) | isd = recurse $ indir f - | hashook addSymlinkHook = - checkfiletype Files.isSymbolicLink addSymlinkHook f - | otherwise = noop - -- Closing a file is assumed to mean it's done being written. + | otherwise = do + ms <- getstatus f + case ms of + Just s + | Files.isSymbolicLink s -> + when (hashook addSymlinkHook) $ + runhook addSymlinkHook f ms + | Files.isRegularFile s -> + when (hashook addHook) $ + runhook addHook f ms + _ -> noop + -- Closing a file is assumed to mean it's done being written, + -- so a new add event is sent. go (Closed { isDirectory = False, maybeFilePath = Just f }) = checkfiletype Files.isRegularFile addHook f -- When a file or directory is moved in, scan it to add new diff --git a/debian/changelog b/debian/changelog index ee1e2100a7..9b92c1aa32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ git-annex (4.20130622) UNRELEASED; urgency=low on a server are always different. * webapp: Fix bug setting up ssh repo if the user enters "~/" at the start of the path. + * assistant: Fix bug that prevented adding files written by gnucash, + and more generally support adding hard links to files. However, + other operations on hard links are still unsupported. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn index 15a7076071..6a1f96a9fe 100644 --- a/doc/bugs/Problems_with_syncing_gnucash.mdwn +++ b/doc/bugs/Problems_with_syncing_gnucash.mdwn @@ -564,3 +564,5 @@ Everything up-to-date [[!tag /design/assistant]] [[!meta title="hard link to open file which is then deleted"]] + +> I have fixed this bug. [[done]] --[[Joey]] From 61676b5a79af3faf9498baa75cacd6af2c3ff091 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 16:34:23 +0000 Subject: [PATCH 58/74] Added a comment --- ...ent_5_949c891209713a2c0a5e66af11ed4c79._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/bugs/Hard_links_not_synced_in_direct_mode/comment_5_949c891209713a2c0a5e66af11ed4c79._comment diff --git a/doc/bugs/Hard_links_not_synced_in_direct_mode/comment_5_949c891209713a2c0a5e66af11ed4c79._comment b/doc/bugs/Hard_links_not_synced_in_direct_mode/comment_5_949c891209713a2c0a5e66af11ed4c79._comment new file mode 100644 index 0000000000..52f3e30f7d --- /dev/null +++ b/doc/bugs/Hard_links_not_synced_in_direct_mode/comment_5_949c891209713a2c0a5e66af11ed4c79._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 5" + date="2013-06-26T16:34:23Z" + content=""" +To fix [[Problems_with_syncing_gnucash]], I have made some changes to how hard links are dealt with. + +Assistant will now notice when a hard link is created, and add the same thing to git it would add for any other file. The hard link is not propigated to other repositories. + +Files remain hard linked locally. This means that a change to one will affect the contents of the other. The assistant, lacking a hard link cache, will not notice this, and so will commit the change to the file that was written to, but not commit its hard link. Running `git annex add` manually (or restarting the assistant) will make it finally notice the other file has changed. + +So, the assistant still does not keep hard links in sync on an ongoing basis. This bug is still unsolved. +"""]] From 222ecc5cb8793e270f24a946d377c22c52c14f81 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc" Date: Wed, 26 Jun 2013 17:26:05 +0000 Subject: [PATCH 59/74] Added a comment: Update --- ...mment_1_3e9cfdf2c088e48c967ad08f79966742._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/git-annex_on_Samba_share/comment_1_3e9cfdf2c088e48c967ad08f79966742._comment diff --git a/doc/forum/git-annex_on_Samba_share/comment_1_3e9cfdf2c088e48c967ad08f79966742._comment b/doc/forum/git-annex_on_Samba_share/comment_1_3e9cfdf2c088e48c967ad08f79966742._comment new file mode 100644 index 0000000000..dead483161 --- /dev/null +++ b/doc/forum/git-annex_on_Samba_share/comment_1_3e9cfdf2c088e48c967ad08f79966742._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc" + nickname="Sören" + subject="Update" + date="2013-06-26T17:26:05Z" + content=""" +After reading trough this again, I'd like to rephrase my question. + +Is it safe if two independent assistants access the same repository at the same time (assuming locking works)? + +But, much more important, a big thanks for creating git-annex! I'm using it successfully to keep my files in sync at home and at work and I think it is a really amazing tool. So thanks for the hard work! +"""]] From 06d24e4a10376e538e171d5303b576ddfbe86e3e Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 17:40:21 +0000 Subject: [PATCH 60/74] Added a comment --- ...mment_2_9d3df393b7b727653598453d94dd33db._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/git-annex_on_Samba_share/comment_2_9d3df393b7b727653598453d94dd33db._comment diff --git a/doc/forum/git-annex_on_Samba_share/comment_2_9d3df393b7b727653598453d94dd33db._comment b/doc/forum/git-annex_on_Samba_share/comment_2_9d3df393b7b727653598453d94dd33db._comment new file mode 100644 index 0000000000..7b17cb2a2d --- /dev/null +++ b/doc/forum/git-annex_on_Samba_share/comment_2_9d3df393b7b727653598453d94dd33db._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 2" + date="2013-06-26T17:40:21Z" + content=""" +If you're asking if you can run two git-annex assistant programs inside the same repository at the same time, the answer is no. Assuming locking works (grin), the second program will detect the first is running and refuse to start. + +If your question is, can two or more git-annex assistant or other programs, running in separate repositories, access files in the same remote safely at the same time, the answer is yes! You can, for that matter, run multiple git-annex commands at the same time in the same repository, and they're also entirely safe, thanks to some locking it does. + +You should post your story to [[design/assistant/blog/day_288__success_stories]]! +"""]] From a77506995c7ac6edf4d160c954cfc36636d054d0 Mon Sep 17 00:00:00 2001 From: "http://nicolas-schodet.myopenid.com/" Date: Wed, 26 Jun 2013 17:52:12 +0000 Subject: [PATCH 61/74] Added a comment --- ...comment_6_325aac80b86588912c4fd61339ccbd0b._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/special_remotes/directory/comment_6_325aac80b86588912c4fd61339ccbd0b._comment diff --git a/doc/special_remotes/directory/comment_6_325aac80b86588912c4fd61339ccbd0b._comment b/doc/special_remotes/directory/comment_6_325aac80b86588912c4fd61339ccbd0b._comment new file mode 100644 index 0000000000..7b9d216055 --- /dev/null +++ b/doc/special_remotes/directory/comment_6_325aac80b86588912c4fd61339ccbd0b._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://nicolas-schodet.myopenid.com/" + ip="2a01:e35:8ae6:f130:1e4b:d6ff:fe78:1ddb" + subject="comment 6" + date="2013-06-26T17:52:12Z" + content=""" +I tried the suggestion on comment 4, but when I add again a remote with the same path, it gets the same repository identifier and is considered dead. Is that expected? + +My use case: I use a usb drive to transfer some large files from one git annex to another, then I use the usb drive for something else and the special remote is removed. Later I want to use the same usb drive again, but when I create the repository, it starts in the dead state. +"""]] From e55bc6feca3107b5b216dc4a32c567017b87055b Mon Sep 17 00:00:00 2001 From: "http://nicolas-schodet.myopenid.com/" Date: Wed, 26 Jun 2013 18:10:05 +0000 Subject: [PATCH 62/74] Added a comment: Thank you for this great tool! --- .../comment_4_0c52794c77a9b7afc5112f5edf9cb793._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories/comment_4_0c52794c77a9b7afc5112f5edf9cb793._comment diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_4_0c52794c77a9b7afc5112f5edf9cb793._comment b/doc/design/assistant/blog/day_288__success_stories/comment_4_0c52794c77a9b7afc5112f5edf9cb793._comment new file mode 100644 index 0000000000..f285863f51 --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories/comment_4_0c52794c77a9b7afc5112f5edf9cb793._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://nicolas-schodet.myopenid.com/" + ip="2a01:e35:8ae6:f130:1e4b:d6ff:fe78:1ddb" + subject="Thank you for this great tool!" + date="2013-06-26T18:10:05Z" + content=""" +I use git-annex for my picture collection. I can add pictures from my computers, or my FTP server when someone wants to send me their pictures. Then I push them to my online gallery. Git annex is great to keep all my repository synchronized while not requesting that all my pictures are present on my laptop. Thank you! +"""]] From c113d811598e28e92cb944f17e2ec588e7b5c3e9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlJEI45rGczFAnuM7gRSj4C6s9AS9yPZDc" Date: Wed, 26 Jun 2013 18:12:39 +0000 Subject: [PATCH 63/74] Added a comment: SynoCommunity --- .../comment_12_94023593d294b9cf69090fcfd6ca0e5a._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/todo/Build_for_Synology_DSM/comment_12_94023593d294b9cf69090fcfd6ca0e5a._comment diff --git a/doc/todo/Build_for_Synology_DSM/comment_12_94023593d294b9cf69090fcfd6ca0e5a._comment b/doc/todo/Build_for_Synology_DSM/comment_12_94023593d294b9cf69090fcfd6ca0e5a._comment new file mode 100644 index 0000000000..39c243ec44 --- /dev/null +++ b/doc/todo/Build_for_Synology_DSM/comment_12_94023593d294b9cf69090fcfd6ca0e5a._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlJEI45rGczFAnuM7gRSj4C6s9AS9yPZDc" + nickname="Kevin" + subject="SynoCommunity" + date="2013-06-26T18:12:39Z" + content=""" +Creating an installable git-annex package available via [SynoCommunity](http://www.synocommunity.com/) would be awesome. They have created [cross-compilation tools](https://github.com/SynoCommunity/spksrc) to help build the packages and integrate the start/stop scripts with the package manager. + +"""]] From 6d9406d904d0d31a8bf3f09aa85ad6e99f8906d3 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 18:30:39 +0000 Subject: [PATCH 64/74] Added a comment --- ...mment_7_4206db69d68d9917623ce02500387021._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/special_remotes/directory/comment_7_4206db69d68d9917623ce02500387021._comment diff --git a/doc/special_remotes/directory/comment_7_4206db69d68d9917623ce02500387021._comment b/doc/special_remotes/directory/comment_7_4206db69d68d9917623ce02500387021._comment new file mode 100644 index 0000000000..b1a3b953ee --- /dev/null +++ b/doc/special_remotes/directory/comment_7_4206db69d68d9917623ce02500387021._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 7" + date="2013-06-26T18:30:39Z" + content=""" +@nicolas, I suspect you are using `git annex initremote` with the same name that you used for the now dead-and-buried remote. That causes it to be reanimated, which is not what you want. + +Since git-annex version 4.20130501, `git annex initremote` is reserved for creating new remotes, not enabling old ones, so it will refuse to do this. That's to avoid exactly this confusion. + +Using `git annex initremote` with a different remote name, and the same directory should work just fine. +"""]] From ca62de2537b083f4f0ae68caef4b591c7cc68687 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 14:45:12 -0400 Subject: [PATCH 65/74] add --- doc/links/other_stuff.mdwn | 1 + doc/privacy.mdwn | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 doc/privacy.mdwn diff --git a/doc/links/other_stuff.mdwn b/doc/links/other_stuff.mdwn index 7ac139ce7e..74ec2d5e69 100644 --- a/doc/links/other_stuff.mdwn +++ b/doc/links/other_stuff.mdwn @@ -1,6 +1,7 @@ ### other stuff * [[testimonials]] +* [[privacy]] * [[what git annex is not|not]] * [[related_software]] * [[sitemap]] diff --git a/doc/privacy.mdwn b/doc/privacy.mdwn new file mode 100644 index 0000000000..0aef186631 --- /dev/null +++ b/doc/privacy.mdwn @@ -0,0 +1,43 @@ +git-annex users entrust it with data that is often intensively private. +Here's some things to know about how to maintain your privacy while using +git-annex. + +## repository contents + +In general, anyone who can clone a git repository gets the ability to see +all current and past filenames in the repository, and their contents. +It's best to assume this also holds true for git-annex, as a general rule. + +There are some obvious exceptions: If you `git annex dropunused` old +content from all your repositories, then it's *gone*. If you `git annex +move` files to a offline drive then only those with physical access can see +their content. (The names of the files are still visible to anyone with a +clone of the repository.) + +git-annex can encrypt data stored in special remotes. This allows you to +store files in the cloud without exposing their file names, or their +contents. See [[design/encryption]] for details. + +When using the shared enctyption method, the encryption key gets stored +in git, and so anyone who has a clone of your repository can decrypt files +from the encrypted special remote. + +When using encryption with a GPG key or keys, only those with access to the +GPG key can decrypt the content of files stored in an encrypted special +remote. + +## bug reporting + +When you file a [[bug]] report on git-annex, you may need to provide +debugging output or details about your repository. In general, git-annex +does not sanitize `--debug` output at all, so it may include the names of +files or other repository details. You should review any debug or other +output you post, and feel free to remove identifying information. + +Note that the git-annex assistant *does* sanitize XMPP protocol information +logged when debugging is enabled. + +If you prefer not to post information publically, you can send a GPG +encrypted mail to Joey Hess (gpg key ID 2512E3C7). +Or you can post a public bug report, and send a followup email with private +details. From caa3006173c13632f6a06f62d3dac53e6d210b40 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q" Date: Wed, 26 Jun 2013 18:46:40 +0000 Subject: [PATCH 66/74] Added a comment --- .../comment_8_acd9023511fe43817718bc89430f96c3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/special_remotes/directory/comment_8_acd9023511fe43817718bc89430f96c3._comment diff --git a/doc/special_remotes/directory/comment_8_acd9023511fe43817718bc89430f96c3._comment b/doc/special_remotes/directory/comment_8_acd9023511fe43817718bc89430f96c3._comment new file mode 100644 index 0000000000..29801fa36c --- /dev/null +++ b/doc/special_remotes/directory/comment_8_acd9023511fe43817718bc89430f96c3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q" + nickname="Andrew" + subject="comment 8" + date="2013-06-26T18:46:40Z" + content=""" +For the use case you're describing, it might be better to define the usb key as a remote set to \"manual.\" Then, you can copy over the things you want with git annex copy --to=usbkey and when you're done drop everything with git annex drop --from=usbkey and never destroy the remote. +"""]] From c16453cf6c0866273d94fb2fd576255f1ad25914 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 19:06:42 +0000 Subject: [PATCH 67/74] Added a comment --- ...omment_8_5d53d23e529f33f6e7deb10643831613._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_8_5d53d23e529f33f6e7deb10643831613._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_8_5d53d23e529f33f6e7deb10643831613._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_8_5d53d23e529f33f6e7deb10643831613._comment new file mode 100644 index 0000000000..14cc3ec556 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_8_5d53d23e529f33f6e7deb10643831613._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 8" + date="2013-06-26T19:06:42Z" + content=""" +Thanks, I've reproduced the hang using wget at the command line. + +Probably something has been broken in the switch to a new version of Yesod. + +"""]] From cc050e5e828c0575e33bcfd04ce70cebcb22d1d1 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 19:39:15 +0000 Subject: [PATCH 68/74] Added a comment --- ...5_7ca419aa3a187857b19268572d5df297._comment | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/design/assistant/blog/day_288__success_stories/comment_5_7ca419aa3a187857b19268572d5df297._comment diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_5_7ca419aa3a187857b19268572d5df297._comment b/doc/design/assistant/blog/day_288__success_stories/comment_5_7ca419aa3a187857b19268572d5df297._comment new file mode 100644 index 0000000000..1dd6fa4a98 --- /dev/null +++ b/doc/design/assistant/blog/day_288__success_stories/comment_5_7ca419aa3a187857b19268572d5df297._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 5" + date="2013-06-26T19:39:15Z" + content=""" +Excerpt from an email I received: --[[Joey]] + +Another story, but without the assistant this time: I've \"designed\" a +small f2f file sharing network with it, I'm using it with a friend to +share accross several computer. This is basically a workflow +with git annex and gitoline, the flexibility of git and the capacities +of git annex just gave us this out of the box. Some specs are here if +you are curious +http://worlddomination.be/ideas/2012/idea-n-21-build-a-f2f-sharing-network-using +-git-annex.html + +"""]] From bd5a533f742bad9974450769dc242329ab5602db Mon Sep 17 00:00:00 2001 From: "http://nicolas-schodet.myopenid.com/" Date: Wed, 26 Jun 2013 20:05:22 +0000 Subject: [PATCH 69/74] Added a comment --- .../comment_9_d330eb808a990bb71034613c297a265e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/special_remotes/directory/comment_9_d330eb808a990bb71034613c297a265e._comment diff --git a/doc/special_remotes/directory/comment_9_d330eb808a990bb71034613c297a265e._comment b/doc/special_remotes/directory/comment_9_d330eb808a990bb71034613c297a265e._comment new file mode 100644 index 0000000000..47ac7541d8 --- /dev/null +++ b/doc/special_remotes/directory/comment_9_d330eb808a990bb71034613c297a265e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://nicolas-schodet.myopenid.com/" + ip="2a01:e35:8ae6:f130:1e4b:d6ff:fe78:1ddb" + subject="comment 9" + date="2013-06-26T20:05:20Z" + content=""" +Thanks for your answers. You're right, the simplest solution for me is to never remove the remote. If my directory is lost, I realized that I can simply create an empty directory. +"""]] From 071fa04a76fcf9080d6f048c184c1f70138dc05a Mon Sep 17 00:00:00 2001 From: "http://nicolas-schodet.myopenid.com/" Date: Wed, 26 Jun 2013 20:25:17 +0000 Subject: [PATCH 70/74] Replace initremote with enableremote in example --- doc/git-annex.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index f0da25e146..7d77d8b714 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -274,7 +274,7 @@ subdirectories). set when using initremote. For example, to add a new gpg key to the keys that can access an encrypted remote: - git annex initremote mys3 encryption=friend@example.com + git annex enableremote mys3 encryption=friend@example.com * trust [repository ...] From bff08b352e74803ea5af65a42b90515ccf90f77f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" Date: Wed, 26 Jun 2013 21:01:39 +0000 Subject: [PATCH 71/74] Added a comment: Excellent --- ...comment_9_f00c8761e3184975b6645c0c3e241365._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_9_f00c8761e3184975b6645c0c3e241365._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_9_f00c8761e3184975b6645c0c3e241365._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_9_f00c8761e3184975b6645c0c3e241365._comment new file mode 100644 index 0000000000..2639fb350c --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_9_f00c8761e3184975b6645c0c3e241365._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI" + nickname="Zellyn" + subject="Excellent" + date="2013-06-26T21:01:38Z" + content=""" +Excellent news. If you need any more help debugging, let me know. + +Out of curiosity, what would be the next step of useful information for you? lsof on the process didn't seem to show anything interesting... +"""]] From b7178234025d0550a29e4c6e281bdc066f2c8c92 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 17:52:39 -0400 Subject: [PATCH 72/74] Temporarily revert back to building with yesod before 1.2. Version 1.2 of yesod, or the new version of warp seem to have a bug that causes the webapp to hang. --- debian/changelog | 3 +++ git-annex.cabal | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9b92c1aa32..a81c3e8068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ git-annex (4.20130622) UNRELEASED; urgency=low * assistant: Fix bug that prevented adding files written by gnucash, and more generally support adding hard links to files. However, other operations on hard links are still unsupported. + * Temporarily revert back to building with yesod before 1.2. + Version 1.2 of yesod, or the new version of warp seem to have a + bug that causes the webapp to hang. -- Joey Hess Fri, 21 Jun 2013 13:16:17 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index a7a1c31e1b..78d5dbbac8 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -133,7 +133,7 @@ Executable git-annex if flag(Webapp) Build-Depends: - yesod, yesod-default, yesod-static, yesod-form, yesod-core, + yesod (< 1.2), yesod-default (< 1.2), yesod-static (< 1.2), yesod-form (< 1.3), case-insensitive, http-types, transformers, wai, wai-logger, warp, blaze-builder, crypto-api, hamlet, clientsession, aeson, template-haskell, data-default From cea8c44aa4f31786836db869ee2e51c34dcdbc77 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Jun 2013 22:10:39 +0000 Subject: [PATCH 73/74] Added a comment --- ...omment_10_f57ff027b19ca16e2ecf1fc6aee9ef4a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Hanging_on_install_on_Mountain_lion/comment_10_f57ff027b19ca16e2ecf1fc6aee9ef4a._comment diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_10_f57ff027b19ca16e2ecf1fc6aee9ef4a._comment b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_10_f57ff027b19ca16e2ecf1fc6aee9ef4a._comment new file mode 100644 index 0000000000..91de599c39 --- /dev/null +++ b/doc/bugs/Hanging_on_install_on_Mountain_lion/comment_10_f57ff027b19ca16e2ecf1fc6aee9ef4a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.193" + subject="comment 10" + date="2013-06-26T22:10:39Z" + content=""" +Seems to be caused by an upgrade of the Mac the autobuilds run on. Particularly, downgrading yesod and warp to older versions seems to avoid the hang, so I've temporarily adjusted the deps so it will build with the old versions. + +I have updated the daily autobuild for OSX, as well as the dmg for the current release. Testing appreciated. +"""]] From 3187f0ae86754e0c4cf79085422e3816b8a2fab0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Jun 2013 18:13:02 -0400 Subject: [PATCH 74/74] blog for the day --- .../blog/day_289__back_in_the_swing.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/design/assistant/blog/day_289__back_in_the_swing.mdwn diff --git a/doc/design/assistant/blog/day_289__back_in_the_swing.mdwn b/doc/design/assistant/blog/day_289__back_in_the_swing.mdwn new file mode 100644 index 0000000000..75923f8978 --- /dev/null +++ b/doc/design/assistant/blog/day_289__back_in_the_swing.mdwn @@ -0,0 +1,16 @@ +Came up with a fix for the gnucash hard linked file problem that makes the +assistant notice the files gnucash writes. This is not full hard link support; +hard linked files still don't cleanly sync around. But new hard links to +files are noticed and added, which is enough to support gnucash. + +Spent around 4 hours on reproducing and trying to debug +[[bugs/Hanging_on_install_on_Mountain_lion]]. It seems that recent upgrades +of the OSX build machine led to this problem. And indeed, building with an +older version of Yesod and Warp seems to have worked around the problem. So +I updated the OSX build for the last release. I will have to re-install the +new Yesod on my laptop and investigate further -- is this an OSX specific +problem, or does it affect Linux? Urgh, this is the second hang I've +encountered involving Warp.. + +Got several nice [[success stories|day_288__success_stories]], but I don't +think I've seen *yours* yet. ;) Please post!