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

149 lines
4.1 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
import System.Console.GetOpt
rename
2011-10-05 20:02:51 +00:00
import Common.Annex
split out three modules from Git Constructors and configuration make sense in separate modules. A separate Git.Types is needed to avoid cycles.
2011-12-13 19:05:07 +00:00
import qualified Git.Config
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
cache the trustmap Doubles the speed of fsck, and speeds up drop as well.
2011-06-24 01:25:39 +00:00
import Types.TrustLevel
rework config storage Moved away from a map of flags to storing config directly in the AnnexState structure. Got rid of most accessor functions in Annex. This allowed supporting multiple --exclude flags.
2011-01-26 04:17:38 +00:00
import qualified Annex
better types allowed breaking module dep loop
2011-06-01 23:10:38 +00:00
import qualified Remote
refactor --exclude to use Utility.Matcher This should change no behavior, but opens the poissibility to use the matcher for other sorts of limits on which files git-annex processes.
2011-09-18 21:47:49 +00:00
import qualified Limit
tweak
2012-01-06 14:14:37 +00:00
import qualified Option
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
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
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
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
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
add the addurl command
2011-07-01 21:15:46 +00:00
import qualified Command.AddUrl
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
add explicit upgrade command
2011-03-16 19:48:26 +00:00
import qualified Command.Upgrade
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
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
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +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
, Command.AddUrl.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
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
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
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
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
, Command.Upgrade.def
, Command.Version.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
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +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
]
options :: [Option]
tweak
2012-01-06 14:14:37 +00:00
options = Option.common ++
more command-specific options Made --from and --to command-specific options. Added generic storage for values of command-specific options, which allows removing some of the special case fields in AnnexState. (Also added generic storage for command-specific flags, although there are not yet any.) Note that this storage uses a Map, so repeatedly looking up the same value is slightly more expensive than looking up an AnnexState field. But, the value can be looked up once in the seek stage, transformed as necessary, and passed in a closure to the start stage, and this avoids that overhead. Still, I'm hesitant to use this for things like force or fast flags. It's probably best to reserve it for flags that are only used by a few commands, or options like --from and --to that it's important only be allowed to be used with commands that implement them, to avoid user confusion.
2012-01-06 07:06:25 +00:00
[ Option ['N'] ["numcopies"] (ReqArg setnumcopies paramNumber)
Add --numcopies option.
2011-06-01 20:49:17 +00:00
"override default number of copies"
refactor
2011-06-02 06:33:31 +00:00
, Option [] ["trust"] (ReqArg (Remote.forceTrust Trusted) paramRemote)
Add --trust, --untrust, and --semitrust options.
2011-06-01 21:49:37 +00:00
"override trust setting"
refactor
2011-06-02 06:33:31 +00:00
, Option [] ["semitrust"] (ReqArg (Remote.forceTrust SemiTrusted) paramRemote)
Support the standard git -c name=value This allows eg, `git-annex -c annex.rsync-options=-6 get file` The overridden git configs are not passed on to git plumbing commands that are run. Perhaps someone will find a need to do that, but I don't yet and it would require storing more state to know what config settings have been overridden and need to be passed on.
2011-07-14 20:44:23 +00:00
"override trust setting back to default"
refactor
2011-06-02 06:33:31 +00:00
, Option [] ["untrust"] (ReqArg (Remote.forceTrust UnTrusted) paramRemote)
Add --trust, --untrust, and --semitrust options.
2011-06-01 21:49:37 +00:00
"override trust setting to untrusted"
Support the standard git -c name=value This allows eg, `git-annex -c annex.rsync-options=-6 get file` The overridden git configs are not passed on to git plumbing commands that are run. Perhaps someone will find a need to do that, but I don't yet and it would require storing more state to know what config settings have been overridden and need to be passed on.
2011-07-14 20:44:23 +00:00
, Option ['c'] ["config"] (ReqArg setgitconfig "NAME=VALUE")
"override git configuration setting"
go go gadget hlint
2011-09-21 03:24:48 +00:00
, Option ['x'] ["exclude"] (ReqArg Limit.addExclude paramGlob)
add --and --or --not -( and -) I dislike -( and -), but without using a different option parser, can't easily use bare parens. --and and --or will become more useful once there are more interesting limits than --exclude
2011-09-18 22:21:42 +00:00
"skip files matching the glob pattern"
Add --include, which is the same as --not --exclude.
2011-12-22 17:53:06 +00:00
, Option ['I'] ["include"] (ReqArg Limit.addInclude paramGlob)
"don't skip files matching the glob pattern"
go go gadget hlint
2011-09-21 03:24:48 +00:00
, Option ['i'] ["in"] (ReqArg Limit.addIn paramRemote)
add --in limit
2011-09-19 00:14:18 +00:00
"skip files not present in a remote"
go go gadget hlint
2011-09-21 03:24:48 +00:00
, Option ['C'] ["copies"] (ReqArg Limit.addCopies paramNumber)
--copies=N can be used to make git-annex only operate on files with the specified number of copies. (And --not --copies=N for the inverse.)
2011-09-19 00:23:08 +00:00
"skip files with fewer copies"
--inbackend can be used to make git-annex only operate on files whose content is stored using a specified key-value backend.
2011-11-28 21:37:15 +00:00
, Option ['B'] ["inbackend"] (ReqArg Limit.addInBackend paramName)
"skip files not using a key-value backend"
tweak
2012-01-06 14:14:37 +00:00
] ++ Option.matcher
rework config storage Moved away from a map of flags to storing config directly in the AnnexState structure. Got rid of most accessor functions in Annex. This allowed supporting multiple --exclude flags.
2011-01-26 04:17:38 +00:00
where
rename readMaybe to readish a stricter (but also partial) readMaybe is getting added to base
2012-01-23 21:00:10 +00:00
setnumcopies v = Annex.changeState $ \s -> s {Annex.forcenumcopies = readish v }
Support the standard git -c name=value This allows eg, `git-annex -c annex.rsync-options=-6 get file` The overridden git configs are not passed on to git plumbing commands that are run. Perhaps someone will find a need to do that, but I don't yet and it would require storing more state to know what config settings have been overridden and need to be passed on.
2011-07-14 20:44:23 +00:00
setgitconfig :: String -> Annex ()
setgitconfig v = do
split out three modules from Git Constructors and configuration make sense in separate modules. A separate Git.Types is needed to avoid cycles.
2011-12-13 19:05:07 +00:00
newg <- inRepo $ Git.Config.store v
reorder repo parameters last Many functions took the repo as their first parameter. Changing it consistently to be the last parameter allows doing some useful things with currying, that reduce boilerplate. In particular, g <- gitRepo is almost never needed now, instead use inRepo to run an IO action in the repo, and fromRepo to get a value from the repo. This also provides more opportunities to use monadic and applicative combinators.
2011-11-08 19:34:10 +00:00
Annex.changeState $ \s -> s { Annex.repo = newg }
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
header = "Usage: 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