diff options
author | 2014-04-04 18:24:01 -0400 | |
---|---|---|
committer | 2014-04-04 18:24:01 -0400 | |
commit | 27256a5c1a18430ea829d47347a0e4c64592a920 (patch) | |
tree | 1942d701c15198d9f53fbca5c9d1d339cdbf94de | |
parent | 3dfb03093f6d9951453ea93b725239d761986575 (diff) | |
parent | dd8db306cad0a9521aba0bc929a2130a3eb366cf (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
6 files changed, 194 insertions, 0 deletions
diff --git a/doc/bugs/Compilation_error_when_building_version_5.20140402_in_cabal_sandbox/comment_1_bd830cadaeffda0366b3ae46b34c0c55._comment b/doc/bugs/Compilation_error_when_building_version_5.20140402_in_cabal_sandbox/comment_1_bd830cadaeffda0366b3ae46b34c0c55._comment new file mode 100644 index 000000000..8ac4f017f --- /dev/null +++ b/doc/bugs/Compilation_error_when_building_version_5.20140402_in_cabal_sandbox/comment_1_bd830cadaeffda0366b3ae46b34c0c55._comment @@ -0,0 +1,39 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl1D_4vD5ueaDw8gRsIYPO3UHRKEpFfg9I" + nickname="Dmitry" + subject="comment 1" + date="2014-04-04T06:40:21Z" + content=""" +Author of \"dns\" library already fixed this issue. + +Next error is: +[[!format sh \"\"\" +Preprocessing executable 'git-annex' for git-annex-5.20140402... + +Utility/Yesod.hs:36:8: + Could not find module `Text.Hamlet' + It is a member of the hidden package `shakespeare-2.0.0.1'. + Perhaps you need to add `shakespeare' to the build-depends in your .cabal file. + Use -v to see a list of the files searched for. +cabal: Error: some packages failed to install: +\"\"\"]] + +Here is the fix: + + +[[!format diff \"\"\" +Index: git-annex/git-annex.cabal +=================================================================== +--- git-annex.orig/git-annex.cabal ++++ git-annex/git-annex.cabal +@@ -101,7 +101,7 @@ Executable git-annex + base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers, + IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, + SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), +- data-default, case-insensitive ++ data-default, case-insensitive, shakespeare + CC-Options: -Wall + GHC-Options: -Wall + Extensions: PackageImports +\"\"\"]] +"""]] diff --git a/doc/design/git-remote-daemon/comment_1_bfa8f33a3fdb6e271dfbdd0378b5d364._comment b/doc/design/git-remote-daemon/comment_1_bfa8f33a3fdb6e271dfbdd0378b5d364._comment new file mode 100644 index 000000000..d93bab090 --- /dev/null +++ b/doc/design/git-remote-daemon/comment_1_bfa8f33a3fdb6e271dfbdd0378b5d364._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://johan.kiviniemi.name/" + nickname="Johan" + subject="Rolling hash chunking" + date="2014-04-04T14:16:25Z" + content=""" +I am not sure which page is the best for this comment, but this one seems somewhat relevant. + +Given that a future telehash implementation may download files from multiple peers, it might be a good idea to download files in chunks, possibly in parallel. In this case, it might be a good idea to use a rolling hash for chunking (like rsync et al). [There is a package for that on Hackage](http://hackage.haskell.org/package/hash-0.2.0.1/docs/Data-Hash-Rolling.html). + +git-annex could store a list of chunk checksums in `.git/annex/objects/…/SHA….chunks` whenever the repository holds a copy of the file. The checksum list would be a small fraction of the file in size, but all the checksum lists for all the files in a repository might take up too much space to store in the `git-annex` branch. + +When getting an object, git-annex could first download the `.chunks` file from a remote/peer and then proceed to download missing chunks in a BitTorrent-like fashion. + +If git-annex has an idea about what locally present object might be an earlier version of the file, it could compare the checksum lists and only download the parts that have changed (à la rsync). +"""]] diff --git a/doc/devblog/day_145__a_plan/comment_1_c0ceea77443be1172527ed8549f000a4._comment b/doc/devblog/day_145__a_plan/comment_1_c0ceea77443be1172527ed8549f000a4._comment new file mode 100644 index 000000000..6bcc18bc2 --- /dev/null +++ b/doc/devblog/day_145__a_plan/comment_1_c0ceea77443be1172527ed8549f000a4._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + ip="2001:1928:1:9::1" + subject="look at mosh" + date="2014-04-04T14:07:51Z" + content=""" +you may want to look at how \"mosh\" handles authentication: http://mosh.mit.edu/ + +from what i understand, it negociates an authentication token using SSH and then uses that to encrypt and authenticate UDP traffic. seems like similar issues here... +"""]] diff --git a/doc/forum/A_tiny_filesystem__63__.mdwn b/doc/forum/A_tiny_filesystem__63__.mdwn new file mode 100644 index 000000000..44a397e2f --- /dev/null +++ b/doc/forum/A_tiny_filesystem__63__.mdwn @@ -0,0 +1,7 @@ +First of all, thanks for the amazing work! I've already tried Owncloud, SparkleShare, Unison, rsync and lsycnd. Finally I may have found the real deal. + +My main problem with git-annex right now is that it is not fast/reliable enough. The main issues being: broken links now and then (I've probably done something wrong) and the slow: "startup scans", "consistency checks", "attempting to fix here" and "syncing with server". (50 Giga, Work-Server-Home, setup via webapp assistant) + +Please, tell me if I'm wrong, but I have the impression that git-annex would get much more robust if it was 100% sure that nobody could mess with its file tree. One possibility would be to add the option (when creating a repo) to make a protected filesystem controlled by git-annex only via FUSE (not something like ShareBox). This could be a tiny filesystem (such as loggedfs) that does nothing but make sure that only git-annex can mount/change files. This would definitely add to speed (reducing checks) and stability. + +I'm I being too naive? Most likely there is something I'm overlooking, like the amount of work this would involve. diff --git a/doc/forum/dot_git_slash_annex_slash_tmp/comment_14_92b1e8956513dbf52da31cec3f58e2c5._comment b/doc/forum/dot_git_slash_annex_slash_tmp/comment_14_92b1e8956513dbf52da31cec3f58e2c5._comment new file mode 100644 index 000000000..b84e663cc --- /dev/null +++ b/doc/forum/dot_git_slash_annex_slash_tmp/comment_14_92b1e8956513dbf52da31cec3f58e2c5._comment @@ -0,0 +1,104 @@ +[[!comment format=mdwn + username="http://alan.petitepomme.net/" + nickname="Alan Schmitt" + subject="comment 14" + date="2014-04-04T11:07:31Z" + content=""" +I just discovered there were 30GB in this tmp directory. Here are the file names. It seems that the file names are partial (they are missing some characters: it seems most file names are missing the last 16 characters and the file extension). As I'm in dire need of disk space, I'm going to delete this files now. + + schmitta@top-wifi ~/D/a/.g/a/tmp (GIT_DIR!)> pwd + /Users/schmitta/Documents/annex/.git/annex/tmp + schmitta@top-wifi ~/D/a/.g/a/tmp (GIT_DIR!)> ls -al + total 73802184 + drwxr-xr-x 91 schmitta staff 3094 16 mar 11:15 . + drwxr-xr-x 34 schmitta staff 1156 4 avr 12:58 .. + -r--r--r--@ 6 schmitta staff 132882914 8 déc 20:17 12426. + -r--r--r--@ 6 schmitta staff 113471066 8 déc 20:15 12426.2- + -r--r--r--@ 6 schmitta staff 148673586 8 déc 20:24 12427. + -r--r--r--@ 6 schmitta staff 96197733 8 déc 20:09 12427.2- + -r--r--r--@ 6 schmitta staff 132882914 8 déc 20:17 12489. + -r--r--r--@ 6 schmitta staff 113471066 8 déc 20:15 12489.2- + -r--r--r--@ 6 schmitta staff 148673586 8 déc 20:24 12490. + -r--r--r--@ 6 schmitta staff 96197733 8 déc 20:09 12490.2- + -r--r--r--@ 6 schmitta staff 132882914 8 déc 20:17 12498. + -r--r--r--@ 6 schmitta staff 113471066 8 déc 20:15 12498.2- + -r--r--r--@ 6 schmitta staff 148673586 8 déc 20:24 12499. + -r--r--r--@ 6 schmitta staff 96197733 8 déc 20:09 12499.2- + -r--r--r--@ 6 schmitta staff 132882914 8 déc 20:17 12504. + -r--r--r--@ 6 schmitta staff 113471066 8 déc 20:15 12504.2- + -r--r--r--@ 6 schmitta staff 148673586 8 déc 20:24 12505. + -r--r--r--@ 6 schmitta staff 96197733 8 déc 20:09 12505.2- + -r--r--r--@ 6 schmitta staff 132882914 8 déc 20:17 12562. + -r--r--r--@ 6 schmitta staff 113471066 8 déc 20:15 12562.2- + -r--r--r--@ 6 schmitta staff 148673586 8 déc 20:24 12563. + -r--r--r--@ 6 schmitta staff 96197733 8 déc 20:09 12563.2- + -r--r--r-- 2 schmitta staff 1237391994 21 déc 19:27 BTSM With Flowerchild Li562 + -r--r--r-- 2 schmitta staff 1097868668 18 déc 13:24 BTSM with Flowerchild 562 + -r--r--r-- 3 schmitta staff 181962494 1 déc 05:19 Cosmos - A Personal Voyage - Episod422 + -r--r--r-- 3 schmitta staff 199341564 17 déc 14:28 Cosmos - A Personal Voyage - Episod423 + -r--r--r-- 3 schmitta staff 196677905 9 jan 08:36 Cosmos - A Personal Voyage - Episod424 + -r--r--r-- 3 schmitta staff 196671683 26 déc 19:36 Cosmos - A Personal Voyage - Episod425 + -r--r--r-- 3 schmitta staff 199297657 19 jan 14:33 Cosmos - A Personal Voyage - Episod426 + -r--r--r-- 3 schmitta staff 194250261 18 jan 17:10 Cosmos - A Personal Voyage - Episod427 + -r--r--r-- 3 schmitta staff 216726281 16 jan 16:26 Cosmos - A Personal Voyage - Episod428 + -r--r--r-- 3 schmitta staff 204634401 16 jan 12:17 Cosmos - A Personal Voyage - Episod429 + -r--r--r-- 3 schmitta staff 179412519 11 jan 11:29 Cosmos - A Personal Voyage - Episod430 + -r--r--r-- 3 schmitta staff 181962494 1 déc 05:19 Cosmos - A Personal Voyage - Episod572 + -r--r--r-- 3 schmitta staff 199341564 17 déc 14:28 Cosmos - A Personal Voyage - Episod573 + -r--r--r-- 3 schmitta staff 196677905 9 jan 08:36 Cosmos - A Personal Voyage - Episod574 + -r--r--r-- 3 schmitta staff 196671683 26 déc 19:36 Cosmos - A Personal Voyage - Episod575 + -r--r--r-- 3 schmitta staff 199297657 19 jan 14:33 Cosmos - A Personal Voyage - Episod576 + -r--r--r-- 3 schmitta staff 194250261 18 jan 17:10 Cosmos - A Personal Voyage - Episod577 + -r--r--r-- 3 schmitta staff 216726281 16 jan 16:26 Cosmos - A Personal Voyage - Episod578 + -r--r--r-- 3 schmitta staff 204634401 16 jan 12:17 Cosmos - A Personal Voyage - Episod579 + -r--r--r-- 3 schmitta staff 179412519 11 jan 11:29 Cosmos - A Personal Voyage - Episod580 + -r--r--r-- 3 schmitta staff 237284500 15 mai 2012 Cosmos - A Personal Voyage - Episode422 + -r--r--r-- 3 schmitta staff 207386296 28 jan 18:39 Cosmos - A Personal Voyage - Episode423 + -r--r--r-- 3 schmitta staff 194659898 28 jan 20:35 Cosmos - A Personal Voyage - Episode424 + -r--r--r-- 3 schmitta staff 221944244 11 jan 07:18 Cosmos - A Personal Voyage - Episode425 + -r--r--r-- 3 schmitta staff 237284500 15 mai 2012 Cosmos - A Personal Voyage - Episode572 + -r--r--r-- 3 schmitta staff 207386296 28 jan 18:39 Cosmos - A Personal Voyage - Episode573 + -r--r--r-- 3 schmitta staff 194659898 28 jan 20:35 Cosmos - A Personal Voyage - Episode574 + -r--r--r-- 3 schmitta staff 221944244 11 jan 07:18 Cosmos - A Personal Voyage - Episode575 + -r--r--r-- 1 schmitta staff 166417358 25 nov 08:47 Icy Plays - Kerbal Space Program - Better Than Starting Mann456 + -r--r--r-- 2 schmitta staff 1110410229 28 déc 00:40 Kerbal Space Program - BTSM With Flowerchild Li562 + -r--r--r-- 1 schmitta staff 898936971 26 déc 06:22 Let's Play Minecraft Better Than Wolves Ep 10 _ HARDCORE _ Ooooh le petit mat572 + -r--r--r-- 1 schmitta staff 816306596 27 déc 05:08 Let's Play Minecraft Better Than Wolves Ep 11 _ HARDCORE _ Un peu de cannabis pour le moral 572 + -r--r--r-- 1 schmitta staff 897143936 27 déc 10:42 Let's Play Minecraft Better Than Wolves Ep 12 _ HARDCORE _ Chaud l'enf572 + -r--r--r-- 1 schmitta staff 922364739 29 déc 08:30 Let's Play Minecraft Better Than Wolves Ep 13 _ HARDCORE _ Walking dea572 + -r--r--r-- 1 schmitta staff 1321555505 1 jan 02:15 Let's Play Minecraft Better Than Wolves Ep 14 l HARDCORE l Couvre572 + -r--r--r-- 1 schmitta staff 889592223 5 jan 02:07 Let's Play Minecraft Better Than Wolves Ep 15 l HARDCORE l Pa572 + -r--r--r-- 1 schmitta staff 153571799 6 jan 03:56 Let's Play Minecraft Better Than Wolves Ep 16 l HARDCORE l Point de s572 + -r--r--r-- 1 schmitta staff 1036932250 9 jan 07:36 Let's Play Minecraft Better Than Wolves Ep 17 l HARDCORE l Satané meuh572 + -r--r--r-- 1 schmitta staff 1289798767 11 jan 22:08 Let's Play Minecraft Better Than Wolves Ep 18 l HARDCORE l Un Moulin572 + -r--r--r-- 1 schmitta staff 1582120875 19 jan 15:39 Let's Play Minecraft Better Than Wolves Ep 19 l HARDCORE l Explosion de ca572 + -r--r--r-- 1 schmitta staff 728469432 13 fév 07:02 Let's Play Minecraft Better Than Wolves Ep 2 _ HARDCORE _ Préparation pour l'explorat422 + -r--r--r-- 1 schmitta staff 911653518 22 jan 13:35 Let's Play Minecraft Better Than Wolves Ep 20 l HARDCORE l Minesha572 + -r--r--r-- 1 schmitta staff 1377428597 28 jan 08:43 Let's Play Minecraft Better Than Wolves Ep 21 l HARDCORE l Terreur en sous-sol o_O !572 + -r--r--r-- 1 schmitta staff 1376224927 4 fév 03:24 Let's Play Minecraft Better Than Wolves Ep 22 l HARDCORE l Machinerie infern572 + -r--r--r-- 1 schmitta staff 1102293665 13 fév 03:56 Let's Play Minecraft Better Than Wolves Ep 23 l HARDCORE l Piston chenil572 + -r--r--r-- 1 schmitta staff 1835677068 19 fév 09:14 Let's Play Minecraft Better Than Wolves Ep 24 l HARDCORE l Piston chenille et o_Oce572 + -r--r--r-- 1 schmitta staff 753740284 30 déc 19:31 Let's Play Minecraft Better Than Wolves Ep 3 _ HARDCORE _ First pioche en fer422 + -r--r--r-- 1 schmitta staff 1019022279 30 déc 18:38 Let's Play Minecraft Better Than Wolves Ep 5 _ HARDCORE _ Fonderie super desi572 + -r--r--r-- 1 schmitta staff 788714805 30 déc 17:47 Let's Play Minecraft Better Than Wolves Ep 6 _ HARDCORE _ Minage de la mor572 + -r--r--r-- 1 schmitta staff 778987710 23 déc 19:56 Let's Play Minecraft Better Than Wolves Ep 7 _ HARDCORE _ Diamant572 + -r--r--r-- 1 schmitta staff 644564981 23 déc 23:06 Let's Play Minecraft Better Than Wolves Ep 8 _ HARDCORE _ Et le poulet ma572 + -r--r--r-- 1 schmitta staff 871173289 24 déc 10:44 Let's Play Minecraft Better Than Wolves Ep 9 _ HARDCORE _ Araignée verte de la jun572 + -r--------@ 4 schmitta staff 149520850 14 aoû 2010 OPLSS10-Mc422 + -r--------@ 4 schmitta staff 95020824 14 aoû 2010 OPLSS10-Mc423 + -r--------@ 4 schmitta staff 98980596 1 sep 2010 OPLSS10-Mc424 + -r--------@ 4 schmitta staff 207525348 1 sep 2010 OPLSS10-Mc425 + -r--------@ 4 schmitta staff 149520850 14 aoû 2010 OPLSS10-Mc534 + -r--------@ 4 schmitta staff 95020824 14 aoû 2010 OPLSS10-Mc535 + -r--------@ 4 schmitta staff 98980596 1 sep 2010 OPLSS10-Mc536 + -r--------@ 4 schmitta staff 207525348 1 sep 2010 OPLSS10-Mc537 + -r--------@ 4 schmitta staff 149520850 14 aoû 2010 OPLSS10-Mc572 + -r--------@ 4 schmitta staff 95020824 14 aoû 2010 OPLSS10-Mc573 + -r--------@ 4 schmitta staff 98980596 1 sep 2010 OPLSS10-Mc574 + -r--------@ 4 schmitta staff 207525348 1 sep 2010 OPLSS10-Mc575 + -r--r--r--@ 2 schmitta staff 150781568 10 mar 13:34 XD300-23_68HighlightsAResearchCntAugHuma469 + -r--r--r--@ 2 schmitta staff 145745487 10 mar 13:36 XD300-24_68HighlightsAResearchCntAugHuma469 + -r--r--r--@ 2 schmitta staff 142414085 10 mar 13:36 XD300-25_68HighlightsAResearchCntAugHuma469 + -r--------@ 2 schmitta staff 548973365 7 jan 20:21 laumond-20120119449.mp4 + -r--r--r--@ 2 schmitta staff 1820482781 8 mar 18:15 salt-020131469 +"""]] diff --git a/doc/tips/using_the_web_as_a_special_remote/comment_5_5ee9717e74ca2afed98e81fc0ea98a95._comment b/doc/tips/using_the_web_as_a_special_remote/comment_5_5ee9717e74ca2afed98e81fc0ea98a95._comment new file mode 100644 index 000000000..b1060147f --- /dev/null +++ b/doc/tips/using_the_web_as_a_special_remote/comment_5_5ee9717e74ca2afed98e81fc0ea98a95._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="Xyem" + ip="87.194.19.134" + subject="comment 5" + date="2014-04-04T15:25:39Z" + content=""" +Adding videos from youtube ends up with it using the URL backend, even without fast. + + $ git init quvitest + $ cd quvitest/ + $ git annex init + $ git annex addurl https://www.youtube.com/watch?v=mghhLqu31cQ + (... file is downloaded ...) + $ find .git/annex/objects/ -type f + .git/annex/objects/1J/Wp/URL--quvi&chttps&c%%www.youtube.com%watch,63v,61mghhLqu31cQ/URL--quvi&chttps&c%%www.youtube.com%watch,63v,61mghhLqu31cQ + +Is migrating manually required or should I log a bug? +"""]] |