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

169 lines
3.9 KiB
Haskell
Raw Normal View History

make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
{- git-annex main program
-
- Copyright 2010 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
{-# LANGUAGE CPP #-}
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
module GitAnnex where
Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR. The environment needs to override git-config. Changed when git config is read, and avoid rereading it once it's been read. chdir for both worktree settings.
2012-05-18 22:20:53 +00:00
import qualified Git.CurrentRepo
simplify
2011-01-07 06:15:10 +00:00
import CmdLine
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import Command
Per-command usage messages.
2013-03-27 17:51:24 +00:00
import GitAnnex.Options
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import qualified Command.Add
import qualified Command.Unannex
import qualified Command.Drop
import qualified Command.Move
import qualified Command.Copy
import qualified Command.Get
import qualified Command.FromKey
import qualified Command.DropKey
add transferkey command Used by the assistant, rather than copy, this is faster because it avoids using git ls-files, avoids checking the location log redundantly, and runs in oneshot mode, avoiding making a commit to the git-annex branch for every file transferred.
2012-08-24 21:23:58 +00:00
import qualified Command.TransferKey
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
implement transferkeys plumbing command
2013-03-19 20:58:36 +00:00
import qualified Command.TransferKeys
git-annex now builds on Windows (doesn't work)
2013-05-11 20:03:00 +00:00
#endif
rekey: New plumbing level command, can be used to change the keys used for files en masse.
2012-02-16 20:36:35 +00:00
import qualified Command.ReKey
better command name
2011-10-31 19:18:41 +00:00
import qualified Command.Reinject
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import qualified Command.Fix
import qualified Command.Init
add describe subcommand
2011-03-03 21:21:00 +00:00
import qualified Command.Describe
started on initremote
2011-03-29 03:22:31 +00:00
import qualified Command.InitRemote
To enable an existing special remote, the new enableremote command must be used. The initremote command now is used only to create new special remotes.
2013-04-26 22:22:44 +00:00
import qualified Command.EnableRemote
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import qualified Command.Fsck
import qualified Command.Unused
import qualified Command.DropUnused
addunused: New command, the opposite of dropunused, it relinks unused content into the git repository.
2012-05-02 18:59:05 +00:00
import qualified Command.AddUnused
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import qualified Command.Unlock
import qualified Command.Lock
import qualified Command.PreCommit
import qualified Command.Find
whereis: New subcommand to show where a file's content has gotten to.
2011-03-05 21:23:55 +00:00
import qualified Command.Whereis
rename remotes to list
2013-09-19 18:16:28 +00:00
import qualified Command.List
log: New command that displays the location log for file, showing each repository they were added to and removed from. This needs to run git log on the location log files to get at all past versions of the file, which tends to be a bit slow. It would be possible to make a version optimised for showing the location logs for every key. That would only need to run git log once, so would be faster, but it would need to process an enormous amount of data, so would not speed up the individual file case. In the future it would be nice to support log --format. log --json also doesn't work right yet.
2012-01-06 19:40:04 +00:00
import qualified Command.Log
add merge subcommand
2011-06-22 22:46:45 +00:00
import qualified Command.Merge
status: New subcommand to show info about an annex, including its size.
2011-05-17 01:18:34 +00:00
import qualified Command.Status
New migrate subcommand can be used to switch files to using a different backend, safely and with no duplication of content.
2011-01-08 19:54:14 +00:00
import qualified Command.Migrate
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
import qualified Command.Uninit
import qualified Command.Trust
import qualified Command.Untrust
implement 3 level trust storage in trust.log
2011-01-26 19:37:16 +00:00
import qualified Command.Semitrust
dead: A command which says that a repository is gone for good and you don't want git-annex to mention it again.
2011-12-02 20:59:55 +00:00
import qualified Command.Dead
group, ungroup: New commands to indicate groups of repositories.
2012-10-01 19:12:04 +00:00
import qualified Command.Group
content: New command line way to view and configure a repository's preferred content settings.
2013-05-25 16:44:58 +00:00
import qualified Command.Content
group, ungroup: New commands to indicate groups of repositories.
2012-10-01 19:12:04 +00:00
import qualified Command.Ungroup
vicfg: New command, allows editing (or simply viewing) most of the repository configuration settings stored in the git-annex branch. Incomplete; I need to finish parsing and saving. This will also be used for editing transfer control expresssions. Removed the group display from the status output, I didn't really like that format, and vicfg can be used to see as well as edit rempository group membership.
2012-10-03 21:04:52 +00:00
import qualified Command.Vicfg
sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you.
2011-12-10 00:27:22 +00:00
import qualified Command.Sync
mirror: New command, makes two repositories contain the same set of files. This is a simple approach for setting up a mirroring repository. It will work with any type of remotes. Mirror --from is more expensive than mirror --to in general. OTOH, mirror --from will get the file from any remote that has it, not only the named mirror remote. And if the named mirror remote is not the fastest available remote with a file, that can speed things up. It would be possible to make the assistant or watch command do a more dynamic mirroring, that didn't need to scan every time.
2013-08-20 19:46:35 +00:00
import qualified Command.Mirror
add the addurl command
2011-07-01 21:15:46 +00:00
import qualified Command.AddUrl
importfeed: git-annex becomes a podcatcher in 150 LOC
2013-07-28 19:27:36 +00:00
#ifdef WITH_FEED
import qualified Command.ImportFeed
#endif
rmurl: New command, removes one of the recorded urls for a file.
2013-04-22 21:18:53 +00:00
import qualified Command.RmUrl
import: New subcommand, pulls files from a directory outside the annex and adds them Use case for this was developed somewhere on the Transiberian Railroad.
2012-05-31 23:47:18 +00:00
import qualified Command.Import
new map subcommand, basically working Still todo: - add repos from uuid.log that were not directly found - group repos into their respective hosts - display inaccessible repos and broken remote connections in red - anonymize the url display somewhat, so the maps can be shared - use uuid info to tell when two apparently different repos are actually the same repo accessed in different ways
2011-02-03 22:55:12 +00:00
import qualified Command.Map
added direct and indirect commands
2012-12-13 19:44:56 +00:00
import qualified Command.Direct
import qualified Command.Indirect
add explicit upgrade command
2011-03-16 19:48:26 +00:00
import qualified Command.Upgrade
add forget command Works, more or less. --dead is not implemented, and so far a new branch is made, but keys no longer present anywhere are not scrubbed. git annex sync fails to push the synced/git-annex branch after a forget, because it's not a fast-forward of the existing synced branch. Could be fixed by making git-annex sync use assistant-style sync branches.
2013-08-28 20:38:03 +00:00
import qualified Command.Forget
Add version command to show git-annex version as well as repository version information.
2011-03-19 18:33:24 +00:00
import qualified Command.Version
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
import qualified Command.Help
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#ifdef WITH_ASSISTANT
watch subcommand So far this only handles auto-annexing new files that are created inside the repository while it's running. To make this really useful, it needs to at least: - notice deleted files and stage the deletion (tricky; there's a race with add..) - notice renamed files, auto-fix the symlink, and stage the new file location - periodically auto-commit staged changes - honor .gitignore, not adding files it excludes Also nice to have would be: - Somehow sync remotes, possibly using a push sync like dvcs-autosync does, so they are immediately updated. - Somehow get content that is unavilable. This is problimatic with inotify, since we only get an event once the user has tried (and failed) to read from the file. Perhaps instead, automatically copy content that is added out to remotes, with the goal of all repos eventually getting a copy, if df allows. - Drop files that have not been used lately, or meet some other criteria (as long as there's a copy elsewhere). - Perhaps automatically dropunused files that have been deleted, although I cannot see a way to do that, since by the time the inotify deletion event arrives, the file is deleted, and we cannot see what its symlink pointed to! Alternatievely, perhaps automatically do an expensive unused/dropunused cleanup process. Some of this probably needs the currently stateless threads to maintain a common state.
2012-04-12 21:29:43 +00:00
import qualified Command.Watch
add assistant command like watch, but more magic
2012-06-22 17:04:03 +00:00
import qualified Command.Assistant
git annex webapp now opens a browser to the webapp Also, starts the assistant if it wasn't already running.
2012-07-26 03:13:01 +00:00
#ifdef WITH_WEBAPP
import qualified Command.WebApp
#endif
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
#ifdef WITH_XMPP
import qualified Command.XMPPGit
#endif
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#endif
typo
2013-02-27 20:33:20 +00:00
#ifdef WITH_TESTSUITE
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
import qualified Command.Test
fuzz tester
2013-05-23 23:00:46 +00:00
import qualified Command.FuzzTest
disable test suite on Android Cannot get QuickCheck to install just now.
2013-02-27 19:59:31 +00:00
#endif
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
cmds :: [Command]
cmds = concat
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
[ Command.Add.def
, Command.Get.def
, Command.Drop.def
, Command.Move.def
, Command.Copy.def
, Command.Unlock.def
, Command.Lock.def
sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you.
2011-12-10 00:27:22 +00:00
, Command.Sync.def
mirror: New command, makes two repositories contain the same set of files. This is a simple approach for setting up a mirroring repository. It will work with any type of remotes. Mirror --from is more expensive than mirror --to in general. OTOH, mirror --from will get the file from any remote that has it, not only the named mirror remote. And if the named mirror remote is not the fastest available remote with a file, that can speed things up. It would be possible to make the assistant or watch command do a more dynamic mirroring, that didn't need to scan every time.
2013-08-20 19:46:35 +00:00
, Command.Mirror.def
sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you.
2011-12-10 00:27:22 +00:00
, Command.AddUrl.def
importfeed: git-annex becomes a podcatcher in 150 LOC
2013-07-28 19:27:36 +00:00
#ifdef WITH_FEED
, Command.ImportFeed.def
#endif
rmurl: New command, removes one of the recorded urls for a file.
2013-04-22 21:18:53 +00:00
, Command.RmUrl.def
import: New subcommand, pulls files from a directory outside the annex and adds them Use case for this was developed somewhere on the Transiberian Railroad.
2012-05-31 23:47:18 +00:00
, Command.Import.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Init.def
, Command.Describe.def
, Command.InitRemote.def
To enable an existing special remote, the new enableremote command must be used. The initremote command now is used only to create new special remotes.
2013-04-26 22:22:44 +00:00
, Command.EnableRemote.def
better command name
2011-10-31 19:18:41 +00:00
, Command.Reinject.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Unannex.def
, Command.Uninit.def
, Command.PreCommit.def
, Command.Trust.def
, Command.Untrust.def
, Command.Semitrust.def
dead: A command which says that a repository is gone for good and you don't want git-annex to mention it again.
2011-12-02 20:59:55 +00:00
, Command.Dead.def
group, ungroup: New commands to indicate groups of repositories.
2012-10-01 19:12:04 +00:00
, Command.Group.def
content: New command line way to view and configure a repository's preferred content settings.
2013-05-25 16:44:58 +00:00
, Command.Content.def
group, ungroup: New commands to indicate groups of repositories.
2012-10-01 19:12:04 +00:00
, Command.Ungroup.def
vicfg: New command, allows editing (or simply viewing) most of the repository configuration settings stored in the git-annex branch. Incomplete; I need to finish parsing and saving. This will also be used for editing transfer control expresssions. Removed the group display from the status output, I didn't really like that format, and vicfg can be used to see as well as edit rempository group membership.
2012-10-03 21:04:52 +00:00
, Command.Vicfg.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.FromKey.def
, Command.DropKey.def
add transferkey command Used by the assistant, rather than copy, this is faster because it avoids using git ls-files, avoids checking the location log redundantly, and runs in oneshot mode, avoiding making a commit to the git-annex branch for every file transferred.
2012-08-24 21:23:58 +00:00
, Command.TransferKey.def
missed some __WINDOWS__ defines
2013-08-04 17:07:55 +00:00
#ifndef mingw32_HOST_OS
implement transferkeys plumbing command
2013-03-19 20:58:36 +00:00
, Command.TransferKeys.def
git-annex now builds on Windows (doesn't work)
2013-05-11 20:03:00 +00:00
#endif
rekey: New plumbing level command, can be used to change the keys used for files en masse.
2012-02-16 20:36:35 +00:00
, Command.ReKey.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Fix.def
, Command.Fsck.def
, Command.Unused.def
, Command.DropUnused.def
addunused: New command, the opposite of dropunused, it relinks unused content into the git repository.
2012-05-02 18:59:05 +00:00
, Command.AddUnused.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Find.def
, Command.Whereis.def
rename remotes to list
2013-09-19 18:16:28 +00:00
, Command.List.def
log: New command that displays the location log for file, showing each repository they were added to and removed from. This needs to run git log on the location log files to get at all past versions of the file, which tends to be a bit slow. It would be possible to make a version optimised for showing the location logs for every key. That would only need to run git log once, so would be faster, but it would need to process an enormous amount of data, so would not speed up the individual file case. In the future it would be nice to support log --format. log --json also doesn't work right yet.
2012-01-06 19:40:04 +00:00
, Command.Log.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Merge.def
, Command.Status.def
, Command.Migrate.def
, Command.Map.def
added direct and indirect commands
2012-12-13 19:44:56 +00:00
, Command.Direct.def
, Command.Indirect.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Upgrade.def
add forget command Works, more or less. --dead is not implemented, and so far a new branch is made, but keys no longer present anywhere are not scrubbed. git annex sync fails to push the synced/git-annex branch after a forget, because it's not a fast-forward of the existing synced branch. Could be fixed by making git-annex sync use assistant-style sync branches.
2013-08-28 20:38:03 +00:00
, Command.Forget.def
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
2011-10-29 19:19:05 +00:00
, Command.Version.def
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
, Command.Help.def
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#ifdef WITH_ASSISTANT
watch subcommand So far this only handles auto-annexing new files that are created inside the repository while it's running. To make this really useful, it needs to at least: - notice deleted files and stage the deletion (tricky; there's a race with add..) - notice renamed files, auto-fix the symlink, and stage the new file location - periodically auto-commit staged changes - honor .gitignore, not adding files it excludes Also nice to have would be: - Somehow sync remotes, possibly using a push sync like dvcs-autosync does, so they are immediately updated. - Somehow get content that is unavilable. This is problimatic with inotify, since we only get an event once the user has tried (and failed) to read from the file. Perhaps instead, automatically copy content that is added out to remotes, with the goal of all repos eventually getting a copy, if df allows. - Drop files that have not been used lately, or meet some other criteria (as long as there's a copy elsewhere). - Perhaps automatically dropunused files that have been deleted, although I cannot see a way to do that, since by the time the inotify deletion event arrives, the file is deleted, and we cannot see what its symlink pointed to! Alternatievely, perhaps automatically do an expensive unused/dropunused cleanup process. Some of this probably needs the currently stateless threads to maintain a common state.
2012-04-12 21:29:43 +00:00
, Command.Watch.def
add assistant command like watch, but more magic
2012-06-22 17:04:03 +00:00
, Command.Assistant.def
git annex webapp now opens a browser to the webapp Also, starts the assistant if it wasn't already running.
2012-07-26 03:13:01 +00:00
#ifdef WITH_WEBAPP
, Command.WebApp.def
#endif
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
#ifdef WITH_XMPP
, Command.XMPPGit.def
#endif
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#endif
typo
2013-02-27 20:33:20 +00:00
#ifdef WITH_TESTSUITE
embed test suite into git annex; available by running: git annex test I have seen some other programs do this, and think it's pretty cool. Means you can test wherever it's deployed, as well as at build time. My other reason for doing it is less happy. Cabal's handling of test suites sucks, requiring duplicated info, and even when that's done, it fails to preprocess hsc files here. Building it in avoids that and avoids having to explicitly tell cabal to enable test suites, which would then make it link the test executable every time, which is unnecessarily slow. This also has the benefit that now "make fast test" does a max speed build and tests it.
2013-02-27 19:35:07 +00:00
, Command.Test.def
fuzz tester
2013-05-23 23:00:46 +00:00
, Command.FuzzTest.def
disable test suite on Android Cannot get QuickCheck to install just now.
2013-02-27 19:59:31 +00:00
#endif
make test suite link in git-annex's commands and run directly this way, test coverage works
2011-01-07 00:26:57 +00:00
]
header :: String
Per-command usage messages.
2013-03-27 17:51:24 +00:00
header = "git-annex command [option ...]"
simplify
2011-01-07 06:15:10 +00:00
run :: [String] -> IO ()
add fields to git-annex-shell
2012-07-02 04:53:00 +00:00
run args = dispatch True args cmds options [] header Git.CurrentRepo.get
Reference in a new issue Copy permalink