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

Merge branch 'master' into remotecontrol

Browse source 
Conflicts:
	doc/devblog/day_152__more_ssh_connection_caching.mdwn
This commit is contained in:
Joey Hess 2014-04-14 13:38:35 -04:00
commit 138d25518d
20 changed files with 93 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Annex/Init.hs
View file

@ -16,7 +16,6 @@ module Annex.Init (
) where
import Common.Annex
import Utility.Network
import qualified Annex
import qualified Git
import qualified Git.LsFiles

1
Assistant/WebApp/Configurators/Local.hs
View file

@ -27,7 +27,6 @@ import Utility.DiskFree
import Utility.Mounts
#endif
import Utility.DataUnits
import Utility.Network
import Remote (prettyUUID)
import Annex.UUID
import Annex.Direct

1
Assistant/WebApp/Configurators/Pairing.hs
View file

@ -21,7 +21,6 @@ import Assistant.Ssh
import Assistant.Alert
import Assistant.DaemonStatus
import Utility.Verifiable
import Utility.Network
#endif
#ifdef WITH_XMPP
import Assistant.XMPP.Client

1
Common.hs
View file

@ -32,5 +32,6 @@ import Utility.Data as X
import Utility.Applicative as X
import Utility.FileSystemEncoding as X
import Utility.PosixFiles as X
import Utility.Network as X
import Utility.PartialPrelude as X

1
Git/Types.hs
View file

@ -11,6 +11,7 @@ import Network.URI
import qualified Data.Map as M
import System.Posix.Types
import Utility.SafeCommand
import Utility.URI ()
{- Support repositories on local disk, and repositories accessed via an URL.
-

18
Utility/URI.hs Normal file
View file

@ -0,0 +1,18 @@
{- Network.URI
-
- Copyright 2014 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}
module Utility.URI where
-- Old versions of network lacked an Ord for URI
#if ! MIN_VERSION_network(2,4,0)
import Network.URI
instance Ord URI where
a `compare` b = show a `compare` show b
#endif

1
debian/changelog vendored
View file

@ -13,6 +13,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium
* remotedaemon: When network connection is lost, close all cached ssh
connections.
* Improve handling on monthly/yearly scheduling.
* Avoid depending on shakespeare except for when building the webapp.
-- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 21:33:35 -0400

1
debian/control vendored
View file

@ -35,6 +35,7 @@ Build-Depends:
libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc sparc],
libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],

10
doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
nickname="Matthias"
subject="auto conflict resolution master branch"
date="2014-04-13T17:48:19Z"
content="""
@joeyh: This must be a misunderstanding of what I want. I use version 5.20140320. I can't find a workflow where \"git annex merge\" changes my master branch, it only updates the git-annex branch.
Thinking again of it after some time, I am basically fine with \"git annex sync\". The only thing I am uncomfortable with is that the automatic merge is pushed without review.
"""]]

2
doc/design/assistant/polls/Android_default_directory.mdwn
View file

@ -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 66 "/sdcard/annex" 6 "Whole /sdcard" 6 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
[[!poll open=yes expandable=yes 66 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]

2
doc/devblog/day_152__more_ssh_connection_caching.mdwn
View file

@ -10,7 +10,7 @@ when git invokes git-annex as ssh, it runs ssh with the connection caching
parameters.
Also, improved the network-manager and wicd code, so it detects when a
connection has gone down. That propigates through to the remote-daemon,
connection has gone down. That propagates through to the remote-daemon,
which closes all ssh connections. I need to also find out how to detect
network connections/disconnections on OSX..

8
doc/forum/Big_repository_vs._multiple_small.mdwn Normal file
View file

@ -0,0 +1,8 @@
I am new to git (but extensively used SVN).
In SVN I could have a big fat repository but only check out sub-trees is it.
Is that also common in git(-annex) / recommended?
E.g., should I create a big-fat repos with all data I have (personal data, music, videos, ...) and check out only the appropriate subtress or create a repository for each purpose? E.g., one for Fotos, Music, OnTheGoData, ebooks, ...
What happens if I have a git-annex repository checked out at my laptop (say, d:\Files) and within it, check out another one (e.g. d:\Files\Library)?

8
doc/forum/Big_repository_vs._multiple_small/comment_1_8e21ee3c674ef6e595bdab53dd5c2356._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 1"
date="2014-04-14T15:32:34Z"
content="""
In my setup I have one repository for each category (photos documents videos) it is faster then single giant repository plus it makes sharing with other people easier since you can let people clone one category at a time.
"""]]

9
doc/forum/Starting_assistant_from_CLI.mdwn Normal file
View file

@ -0,0 +1,9 @@
I am unable to start the git-annex assistant/webapp.
I use OpenBox as desktop manager and the assistant/webapp is not available through the menu.
Trying to use the CLI, all my attempts fail with a message saying that it(?) is not a git repository!? Since the video show that on first start the assistant/webapp allows a choice of a directory and then creates it, I am not sure as to what git initialized directory does the assistant/webapp requires in this instance. And I also guess that means invoking the webapp from that directory rather than from the directory that contains the standalone git-annex.
Any help would be appreciated as git-annex really seems to be the app I am looking for. :)
Thanks

12
doc/forum/Starting_assistant_from_CLI/comment_1_afd51ddb0f1bb3cac528e1d96829ef83._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 1"
date="2014-04-14T15:35:17Z"
content="""
running,
git annex webapp
should launch the web app.
"""]]

8
doc/forum/taskwarrior/comment_2_4b3d70501763f6d36c927ae37bbd33c2._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 2"
date="2014-04-14T15:27:48Z"
content="""
Using direct mode would replace symlinks with actual files.
"""]]

2
doc/preferred_content/standard_groups.mdwn
View file

@ -13,7 +13,7 @@ any repository that can will back it up.)
All content is wanted, unless it's for a file in a "archive" directory,
which has reached an archive repository, or is unused.
`(((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) and not unused) or roughlylackingcopies=1`
`(((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) and not unused) or approxlackingcopies=1`
### transfer

4
doc/tips/file_manager_integration.mdwn
View file

@ -91,10 +91,10 @@ Edit this page and add instructions!
If your file manager can run a command on a file, it should be easy to
integrate git-annex with it. A simple script will suffice:
#!/bun/sh
#!/bin/sh
git-annex get --notify-start --notify-finish -- "$@"
The --notify-start and --notify-stop options make git-annex display a
desktop notification. This is useful to give the user an indication that
their action took effect. Desktop notifications are currently only
implenented for Linux.
implemented for Linux.

23
doc/users/tobiastheviking.mdwn
View file

@ -2,19 +2,12 @@ Tobias Ussing
See:
[[https://github.com/TobiasTheViking/flickrannex/]]
[[https://github.com/TobiasTheViking/imapannex]]
[[https://github.com/TobiasTheViking/dropboxannex]]
[[https://github.com/TobiasTheViking/skydriveannex]]
[[https://github.com/TobiasTheViking/googledriveannex]]
[[https://github.com/TobiasTheViking/owncloudannex]]
[[https://github.com/TobiasTheViking/megaannex]]
[[http://git-annex.branchable.com/forum/nntp__47__usenet_special_remote/]]
* [[tips/flickrannex]] - [[https://github.com/TobiasTheViking/flickrannex/]]
* [[tips/imapannex]] - [[https://github.com/TobiasTheViking/imapannex]]
* [[tips/dropboxannex]] - [[https://github.com/TobiasTheViking/dropboxannex]]
* [[tips/skydriveannex]] - [[https://github.com/TobiasTheViking/skydriveannex]]
* [[tips/googledriveannex]] - [[https://github.com/TobiasTheViking/googledriveannex]]
* [[tips/owncloudannex]] - [[https://github.com/TobiasTheViking/owncloudannex]]
* [[tips/megaannex]] - [[https://github.com/TobiasTheViking/megaannex]]
* [[forum/nntp__47__usenet_special_remote/]]

5
git-annex.cabal
View file

@ -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, shakespeare
data-default, case-insensitive
CC-Options: -Wall
GHC-Options: -Wall
Extensions: PackageImports
@ -191,7 +191,8 @@ Executable git-annex
yesod, yesod-default, yesod-static, yesod-form, yesod-core,
http-types, transformers, wai, wai-logger, warp, warp-tls,
blaze-builder, crypto-api, hamlet, clientsession,
template-haskell, data-default, aeson, network-conduit
template-haskell, data-default, aeson, network-conduit,
shakespeare
CPP-Options: -DWITH_WEBAPP
if flag(Webapp) && flag (Webapp-secure)
Build-Depends: warp-tls (>= 1.4), securemem, byteable