mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2012-12-10 15:25:13 -04:00
commit b28c0e28cf
7 changed files with 75 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform.mdwn Normal file
View file

@ -0,0 +1,20 @@
I updated haskell platform, and now
<pre>
[jtang@x00 git-annex (master)]$ make test
Assistant/Threads/NetWatcher.hs:26:2:
warning: #warning Building without dbus support; will poll for network connection changes [-Wcpp]
Assistant/Threads/MountWatcher.hs:33:2:
warning: #warning Building without dbus support; will use mtab polling [-Wcpp]
test.hs:11:8:
Could not find module `Test.HUnit.Tools'
Perhaps you meant Test.HUnit.Text (from HUnit-1.2.5.1)
Use -v to see a list of the files searched for.
** failed to build the test suite
make: *** [test] Error 1
</pre>
Looks like a missing dep somewhere with testpack or quickcheck... I haven't had time to figure it out yet, its not git-annex specific but I thought I might log it as a reminder for myself just in case if the osxapp is more borked than usual, I probably need to flush my .cabal directory of installed userland dependancies.

8
doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform/comment_1_20a6fe046111e9ae56fd4d9c9f41f536._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.8.117"
subject="comment 1"
date="2012-12-10T19:18:59Z"
content="""
Test.HUnit.Tools is part of testpack: <http://hackage.haskell.org/package/testpack>
"""]]

10
doc/forum/How_to_set_up_two_assistants_with_one_shared_transfer_repository__63__/comment_4_bfbcc041db472f4808979e6b3d7c4be2._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawniCRkhl_W87gOK5eElfsef3FoUsUFpAr4"
nickname="Alexandre"
subject="Simplifying this kind of setup"
date="2012-12-10T14:33:08Z"
content="""
Maybe it is possible to avoid the XMPP account setup and transferring via XMPP, maybe getting notifications through the SSH connection is possible.
I'm thinking about a \"git-annex-shell server\" unix socket to which clients would connect using the SSH connection and get update notifications from other clients.
"""]]

8
doc/forum/gadu_-_git-annex_disk_usage/comment_4_1bcc94f9982c6cfd0888f3dba0f9221e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://sunny256.sunbase.org/"
nickname="sunny256"
subject="comment 4"
date="2012-12-09T20:13:47Z"
content="""
Thanks a lot, Steve. Awesome, got everything on my wishlist. :) A very useful utility, and works perfectly. Will be using this a lot. git-annex-utils is a good name for this, I'm sure if you place it on GitHub or somewhere else you'll get lots of contributions and this could grow to be a project containing many useful utilities for git-annex.
"""]]

18
doc/forum/gadu_-_git-annex_disk_usage/comment_5_4365cd3031456fac1b563ee72984638e._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="Steve"
ip="92.104.175.136"
subject="comment 5"
date="2012-12-10T04:07:53Z"
content="""
I pay attention to feedback ;)
I'm not done with it yet, I want to add in some options to limit what gets counted.
For example: If you have two annexed files that contain the same content using the same backend, they will be stored only once in the .git/annex/objects directory but be counted twice by gadu.
I want to fix that, but I'll leave an option to keep that behavior if you want. I also want to add options to count or not count files that exist in a certain repo. It will be very easy to add options to only count files that you have or don't have locally as well.
Making it pay attention to environment variables that git and git-annex do would also be a good idea. (like GIT_DIR, etc...)
I'm open to good ideas that anybody has, unfortunately I can only work on it on the weekends for now.
"""]]

8
doc/install/OSX/comment_4_bbe99673033e4c48c8bb3db24ee419f9._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 4"
date="2012-12-10T17:00:43Z"
content="""
For those that care, I've updated my autobuilder to the latest version of haskell-platform 2012.4.0.0 and it appears to be building correctly.
"""]]

6
doc/scalability.mdwn
View file

@ -23,9 +23,9 @@ git-annex is designed for scalability. The key points are:
improves this will improve. Scaling to hundreds of thousands of files
is not a problem, scaling beyond that and git will start to get slow.
To some degree, git-annex works around innefficiencies in git; for
example it batches input sent to certian git commands that are slow
when run in an emormous repository.
To some degree, git-annex works around inefficiencies in git; for
example it batches input sent to certain git commands that are slow
when run in an enormous repository.
* It can use as much, or as little bandwidth as is available. In
particular, any interrupted file transfer can be resumed by git-annex.