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

244 lines
6.3 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
-
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
- Copyright 2010-2015 Joey Hess <id@joeyh.name>
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
-
- Licensed under the GNU GPL version 3 or higher.
-}
Allow optionally configuring git-annex with -fEKG to enable awesome remote monitoring interfaceat http://localhost:4242/
2013-11-06 20:33:45 +00:00
{-# LANGUAGE CPP, OverloadedStrings #-}
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
reorganize some files and imports
2014-01-26 20:25:55 +00:00
module CmdLine.GitAnnex where
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
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
sync, assistant, remotedaemon: Use ssh connection caching for git pushes and pulls. For sync, saves 1 ssh connection per remote. For remotedaemon, the same ssh connection that is already open to run git-annex-shell notifychanges is reused to pull from the remote. Only potential problem is that this also enables connection caching when the assistant syncs with a ssh remote. Including the sync it does when a network connection has just come up. In that case, cached ssh connections are likely to be stale, and so using them would hang. Until I'm sure such problems have been dealt with, this commit needs to stay on the remotecontrol branch, and not be merged to master. This commit was sponsored by Alexandre Dupas.
2014-04-12 19:59:34 +00:00
import Utility.Env
import Annex.Ssh
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
import Types.Test
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
convert Whereis
2015-07-10 20:32:33 +00:00
import qualified Command.Help
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
converted copy and move Got a little tricky..
2015-07-09 19:23:14 +00:00
import qualified Command.Fsck
converted ContentLocation, ExampleKey, LookupKey
2015-07-12 00:43:45 +00:00
import qualified Command.LookupKey
calckey: New plumbing command, calculates the key that would be used to refer to a file
2016-04-20 17:49:42 +00:00
import qualified Command.CalcKey
converted ContentLocation, ExampleKey, LookupKey
2015-07-12 00:43:45 +00:00
import qualified Command.ContentLocation
import qualified Command.ExamineKey
matchexpression: New plumbing command to check if a preferred content expression matches some data.
2016-01-25 20:16:18 +00:00
import qualified Command.MatchExpression
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.FromKey
registerurl: New plumbing command for mass-adding urls to keys.
2015-03-15 18:37:33 +00:00
import qualified Command.RegisterUrl
Brought back the setkey plumbing command that was removed in 2011, since we found a use case for it. Note that the command's syntax was changed for consistency.
2015-07-02 21:44:25 +00:00
import qualified Command.SetKey
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.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
implement transferkeys plumbing command
2013-03-19 20:58:36 +00:00
import qualified Command.TransferKeys
setpresentkey: A new plumbing-level command.
2014-12-29 19:16:40 +00:00
import qualified Command.SetPresentKey
readpresentkey: New plumbing command for checking location log.
2015-03-20 15:22:27 +00:00
import qualified Command.ReadPresentKey
checkpresentkey: New plumbing command to check if a key can be verified to be present on a remote.
2015-03-20 15:44:46 +00:00
import qualified Command.CheckPresentKey
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
adjusted branches, proof of concept "git annex adjust" may be a temporary interface, but works for a proof of concept. It is pretty fast at creating the adjusted branch. The main overhead is injecting pointer files. It might be worth optimising that by reusing the symlink target as the pointer file content. When I tried to do that, the problem was that the clean filter doesn't use that same format, and so git thought files had changed. Could be dealt with, perhaps make the clean filter use symlink format for pointer files when on an adjusted branch? But the real overhead is in checking out the branch, when git runs the smudge filter once per file. That is perhaps too slow to be usable, although it may only affect initial checkout of the branch, and not updates. TBD.
2016-02-25 20:11:13 +00:00
import qualified Command.Adjust
converted MetaData, eliminating a global value from Annex state .. beautiful
2015-07-12 13:25:43 +00:00
import qualified Command.MetaData
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
import qualified Command.View
add vadd command
2014-02-19 00:01:56 +00:00
import qualified Command.VAdd
add tip about metadata driven views (and more flexible view filtering) While writing this documentation, I realized that there needed to be a way to stay in a view like tag=* while adding a filter like tag=work that applies to the same field. So, there are really two ways a view can be refined. It can have a new "field=explicitvalue" filter added to it, which does not change the "shape" of the view, but narrows the files it shows. Or, it can have a new view added, which adds another level of subdirectories. So, added a vfilter command, which takes explicit values to add to the filter, and rejects changes that would change the shape of the view. And, made vadd only accept changes that change the shape of the view. And, changed the View data type slightly; now components that can match multiple metadata values can be visible, or not visible. This commit was sponsored by Stelian Iancu.
2014-02-19 19:10:18 +00:00
import qualified Command.VFilter
add git annex view command (And a vpop command, which is still a bit buggy.) Still need to do vadd and vrm, though this also adds their documentation. Currently not very happy with the view log data serialization. I had to lose the TDFA regexps temporarily, so I can have Read/Show instances of View. I expect the view log format will change in some incompatable way later, probably adding last known refs for the parent branch to View or something like that. Anyway, it basically works, although it's a bit slow looking up the metadata. The actual git branch construction is about as fast as it can be using the current git plumbing. This commit was sponsored by Peter Hogg.
2014-02-18 21:38:23 +00:00
import qualified Command.VPop
add vcycle command
2014-02-19 00:16:28 +00:00
import qualified Command.VCycle
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
convert Expire
2015-07-10 20:26:23 +00:00
import qualified Command.Expire
add repair command
2013-10-23 16:21:59 +00:00
import qualified Command.Repair
convert Unused, and remove some dead code for old style option parsing
2015-07-10 20:05:56 +00:00
import qualified Command.Unused
convert DropUnused
2015-07-10 20:15:31 +00:00
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
implement withGlobalOptions, and convert Find
2015-07-10 16:47:35 +00:00
import qualified Command.Find
convert FindRef
2015-07-11 00:38:11 +00:00
import qualified Command.FindRef
convert Whereis
2015-07-10 20:32:33 +00:00
import qualified Command.Whereis
convert List
2015-07-11 00:46:48 +00:00
import qualified Command.List
converted Log
2015-07-13 14:44:51 +00:00
import qualified Command.Log
add merge subcommand
2011-06-22 22:46:45 +00:00
import qualified Command.Merge
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
2014-07-11 20:45:18 +00:00
import qualified Command.ResolveMerge
converted Info
2015-07-11 14:41:52 +00:00
import qualified Command.Info
converted Status
2015-07-11 14:42:46 +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
reinit: New command that can initialize a new reposotory using the configuration of a previously known repository. Useful if a repository got deleted and you want to clone it back the way it was.
2014-04-16 00:13:35 +00:00
import qualified Command.Reinit
global numcopies setting * numcopies: New command, sets global numcopies value that is seen by all clones of a repository. * The annex.numcopies git config setting is deprecated. Once the numcopies command is used to set the global number of copies, any annex.numcopies git configs will be ignored. * assistant: Make the prefs page set the global numcopies. This global numcopies setting is needed to let preferred content expressions operate on numcopies. It's also convenient, because typically if you want git-annex to preserve N copies of files in a repo, you want it to do that no matter which repo it's running in. Making it global avoids needing to warn the user about gotchas involving inconsistent annex.numcopies settings. (See changes to doc/numcopies.mdwn.) Added a new variety of git-annex branch log file, that holds only 1 value. Will probably be useful for other stuff later. This commit was sponsored by Nicolas Pouillard.
2014-01-20 20:47:56 +00:00
import qualified Command.NumCopies
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.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
convert Dead, and allow multiple --key options
2015-07-13 14:26:54 +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
The "git annex content" command is renamed to "git annex wanted".
2013-10-28 18:08:38 +00:00
import qualified Command.Wanted
groupwanted: New command to set the groupwanted preferred content expression.
2015-02-06 19:12:42 +00:00
import qualified Command.GroupWanted
required: New command, like wanted, but for required content. Also refactored some code to reduce duplication.
2015-04-18 20:04:25 +00:00
import qualified Command.Required
add schedule command Mostly because it gives me an excuse and a hook to document the schedule expression format.
2013-10-13 19:40:38 +00:00
import qualified Command.Schedule
group, ungroup: New commands to indicate groups of repositories.
2012-10-01 19:12:04 +00:00
import qualified Command.Ungroup
converted ViCfg (trivially)
2015-07-11 00:40:30 +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
converted Mirror
2015-07-11 01:05:34 +00:00
import qualified Command.Mirror
converted addurl
2015-07-13 14:57:49 +00:00
import qualified Command.AddUrl
converted ImportFeed
2015-07-13 15:06:41 +00:00
import qualified Command.ImportFeed
rmurl: New command, removes one of the recorded urls for a file.
2013-04-22 21:18:53 +00:00
import qualified Command.RmUrl
convert Import
2015-07-13 15:15:21 +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
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
import qualified Command.Forget
proxy: for all your direct mode repository munging needs This allows bypassing the direct mode guard in a safe way to do all sorts of things including git revert, git mv, git checkout ... This commit was sponsored by the WikiMedia Foundation.
2014-11-12 19:41:15 +00:00
import qualified Command.Proxy
diffdriver: New git-annex command, to make git external diff drivers work with annexed files. Closes https://github.com/datalad/datalad/issues/18
2014-11-24 20:14:01 +00:00
import qualified Command.DiffDriver
skeleton smudge/clean filters
2015-12-04 17:02:56 +00:00
import qualified Command.Smudge
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
import qualified Command.Undo
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
converted Assistant and Watch; avoid duplicate arg parsing for no repo mode
2015-07-13 15:42:42 +00:00
import qualified Command.Watch
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
convert WebApp; avoid duplicate arg parsing for no repo mode
2015-07-13 15:53:42 +00:00
import qualified Command.WebApp
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
#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
added git-annex remotedaemon So far, handling connecting to git-annex-shell notifychanges, and pulling immediately when a change is pushed to a remote. A little bit buggy (crashes after the first pull), but it already works! This commit was sponsored by Mark Sheppard.
2014-04-06 23:06:03 +00:00
import qualified Command.RemoteDaemon
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#endif
testremote: New command to test uploads/downloads to a remote. This only performs some basic tests so far; no testing of chunking or resuming. Also, the existing encryption type of the remote is used; it would be good later to derive an encrypted and a non-encrypted version of the remote and test them both. This commit was sponsored by Joseph Liu.
2014-08-01 19:09:49 +00:00
import qualified Command.Test
Fix stub git-annex test support when built without tasty.
2014-08-24 01:46:08 +00:00
#ifdef WITH_TESTSUITE
fuzz tester
2013-05-23 23:00:46 +00:00
import qualified Command.FuzzTest
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
import qualified Command.TestRemote
disable test suite on Android Cannot get QuickCheck to install just now.
2013-02-27 19:59:31 +00:00
#endif
add database benchmark The benchmark shows that the database access is quite fast indeed! And, it scales linearly to the number of keys, with one exception, getAssociatedKey. Based on this benchmark, I don't think I need worry about optimising for cases where all files are locked and the database is mostly empty. In those cases, database access will be misses, and according to this benchmark, should add only 50 milliseconds to runtime. (NB: There may be some overhead to getting the database opened and locking the handle that this benchmark doesn't see.) joey@darkstar:~/src/git-annex>./git-annex benchmark setting up database with 1000 setting up database with 10000 benchmarking keys database/getAssociatedFiles from 1000 (hit) time 62.77 μs (62.70 μs .. 62.85 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 62.81 μs (62.76 μs .. 62.88 μs) std dev 201.6 ns (157.5 ns .. 259.5 ns) benchmarking keys database/getAssociatedFiles from 1000 (miss) time 50.02 μs (49.97 μs .. 50.07 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 50.09 μs (50.04 μs .. 50.17 μs) std dev 206.7 ns (133.8 ns .. 295.3 ns) benchmarking keys database/getAssociatedKey from 1000 (hit) time 211.2 μs (210.5 μs .. 212.3 μs) 1.000 R² (0.999 R² .. 1.000 R²) mean 211.0 μs (210.7 μs .. 212.0 μs) std dev 1.685 μs (334.4 ns .. 3.517 μs) benchmarking keys database/getAssociatedKey from 1000 (miss) time 173.5 μs (172.7 μs .. 174.2 μs) 1.000 R² (0.999 R² .. 1.000 R²) mean 173.7 μs (173.0 μs .. 175.5 μs) std dev 3.833 μs (1.858 μs .. 6.617 μs) variance introduced by outliers: 16% (moderately inflated) benchmarking keys database/getAssociatedFiles from 10000 (hit) time 64.01 μs (63.84 μs .. 64.18 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 64.85 μs (64.34 μs .. 66.02 μs) std dev 2.433 μs (547.6 ns .. 4.652 μs) variance introduced by outliers: 40% (moderately inflated) benchmarking keys database/getAssociatedFiles from 10000 (miss) time 50.33 μs (50.28 μs .. 50.39 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 50.32 μs (50.26 μs .. 50.38 μs) std dev 202.7 ns (167.6 ns .. 252.0 ns) benchmarking keys database/getAssociatedKey from 10000 (hit) time 1.142 ms (1.139 ms .. 1.146 ms) 1.000 R² (1.000 R² .. 1.000 R²) mean 1.142 ms (1.140 ms .. 1.144 ms) std dev 7.142 μs (4.994 μs .. 10.98 μs) benchmarking keys database/getAssociatedKey from 10000 (miss) time 1.094 ms (1.092 ms .. 1.096 ms) 1.000 R² (1.000 R² .. 1.000 R²) mean 1.095 ms (1.095 ms .. 1.097 ms) std dev 4.277 μs (2.591 μs .. 7.228 μs)
2016-01-12 17:01:44 +00:00
#ifdef WITH_BENCHMARK
import qualified Command.Benchmark
#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
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
cmds :: Parser TestOptions -> Maybe TestRunner -> [Command]
cmds testoptparser testrunner =
convert Whereis
2015-07-10 20:32:33 +00:00
[ Command.Help.cmd
, Command.Add.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Get.cmd
, Command.Drop.cmd
, Command.Move.cmd
, Command.Copy.cmd
converted copy and move Got a little tricky..
2015-07-09 19:23:14 +00:00
, Command.Fsck.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Unlock.cmd
started converting to use optparse-applicative This is a work in progress. It compiles and is able to do basic command dispatch, including git autocorrection, while using optparse-applicative for the core commandline parsing. * Many commands are temporarily disabled before conversion. * Options are not wired in yet. * cmdnorepo actions don't work yet. Also, removed the [Command] list, which was only used in one place.
2015-07-08 16:33:27 +00:00
, Command.Unlock.editcmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Lock.cmd
, Command.Sync.cmd
converted Mirror
2015-07-11 01:05:34 +00:00
, Command.Mirror.cmd
converted addurl
2015-07-13 14:57:49 +00:00
, Command.AddUrl.cmd
converted ImportFeed
2015-07-13 15:06:41 +00:00
, Command.ImportFeed.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.RmUrl.cmd
convert Import
2015-07-13 15:15:21 +00:00
, Command.Import.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Init.cmd
, Command.Describe.cmd
, Command.InitRemote.cmd
, Command.EnableRemote.cmd
, Command.Reinject.cmd
, Command.Unannex.cmd
, Command.Uninit.cmd
, Command.Reinit.cmd
, Command.PreCommit.cmd
, Command.NumCopies.cmd
, Command.Trust.cmd
, Command.Untrust.cmd
, Command.Semitrust.cmd
convert Dead, and allow multiple --key options
2015-07-13 14:26:54 +00:00
, Command.Dead.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Group.cmd
, Command.Wanted.cmd
groupwanted: New command to set the groupwanted preferred content expression.
2015-02-06 19:12:42 +00:00
, Command.GroupWanted.cmd
required: New command, like wanted, but for required content. Also refactored some code to reduce duplication.
2015-04-18 20:04:25 +00:00
, Command.Required.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Schedule.cmd
, Command.Ungroup.cmd
converted ViCfg (trivially)
2015-07-11 00:40:30 +00:00
, Command.Vicfg.cmd
converted ContentLocation, ExampleKey, LookupKey
2015-07-12 00:43:45 +00:00
, Command.LookupKey.cmd
calckey: New plumbing command, calculates the key that would be used to refer to a file
2016-04-20 17:49:42 +00:00
, Command.CalcKey.cmd
converted ContentLocation, ExampleKey, LookupKey
2015-07-12 00:43:45 +00:00
, Command.ContentLocation.cmd
, Command.ExamineKey.cmd
matchexpression: New plumbing command to check if a preferred content expression matches some data.
2016-01-25 20:16:18 +00:00
, Command.MatchExpression.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.FromKey.cmd
forgot one thing
2015-03-15 18:55:44 +00:00
, Command.RegisterUrl.cmd
Brought back the setkey plumbing command that was removed in 2011, since we found a use case for it. Note that the command's syntax was changed for consistency.
2015-07-02 21:44:25 +00:00
, Command.SetKey.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.DropKey.cmd
, Command.TransferKey.cmd
, Command.TransferKeys.cmd
setpresentkey: A new plumbing-level command.
2014-12-29 19:16:40 +00:00
, Command.SetPresentKey.cmd
readpresentkey: New plumbing command for checking location log.
2015-03-20 15:22:27 +00:00
, Command.ReadPresentKey.cmd
checkpresentkey: New plumbing command to check if a key can be verified to be present on a remote.
2015-03-20 15:44:46 +00:00
, Command.CheckPresentKey.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.ReKey.cmd
adjusted branches, proof of concept "git annex adjust" may be a temporary interface, but works for a proof of concept. It is pretty fast at creating the adjusted branch. The main overhead is injecting pointer files. It might be worth optimising that by reusing the symlink target as the pointer file content. When I tried to do that, the problem was that the clean filter doesn't use that same format, and so git thought files had changed. Could be dealt with, perhaps make the clean filter use symlink format for pointer files when on an adjusted branch? But the real overhead is in checking out the branch, when git runs the smudge filter once per file. That is perhaps too slow to be usable, although it may only affect initial checkout of the branch, and not updates. TBD.
2016-02-25 20:11:13 +00:00
, Command.Adjust.cmd
converted MetaData, eliminating a global value from Annex state .. beautiful
2015-07-12 13:25:43 +00:00
, Command.MetaData.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.View.cmd
, Command.VAdd.cmd
, Command.VFilter.cmd
, Command.VPop.cmd
, Command.VCycle.cmd
, Command.Fix.cmd
convert Expire
2015-07-10 20:26:23 +00:00
, Command.Expire.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Repair.cmd
convert Unused, and remove some dead code for old style option parsing
2015-07-10 20:05:56 +00:00
, Command.Unused.cmd
convert DropUnused
2015-07-10 20:15:31 +00:00
, Command.DropUnused.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.AddUnused.cmd
implement withGlobalOptions, and convert Find
2015-07-10 16:47:35 +00:00
, Command.Find.cmd
convert FindRef
2015-07-11 00:38:11 +00:00
, Command.FindRef.cmd
convert Whereis
2015-07-10 20:32:33 +00:00
, Command.Whereis.cmd
convert List
2015-07-11 00:46:48 +00:00
, Command.List.cmd
converted Log
2015-07-13 14:44:51 +00:00
, Command.Log.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Merge.cmd
, Command.ResolveMerge.cmd
converted Info
2015-07-11 14:41:52 +00:00
, Command.Info.cmd
converted Status
2015-07-11 14:42:46 +00:00
, Command.Status.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Migrate.cmd
, Command.Map.cmd
, Command.Direct.cmd
, Command.Indirect.cmd
, Command.Upgrade.cmd
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
, Command.Forget.cmd
proxy: for all your direct mode repository munging needs This allows bypassing the direct mode guard in a safe way to do all sorts of things including git revert, git mv, git checkout ... This commit was sponsored by the WikiMedia Foundation.
2014-11-12 19:41:15 +00:00
, Command.Proxy.cmd
diffdriver: New git-annex command, to make git external diff drivers work with annexed files. Closes https://github.com/datalad/datalad/issues/18
2014-11-24 20:14:01 +00:00
, Command.DiffDriver.cmd
skeleton smudge/clean filters
2015-12-04 17:02:56 +00:00
, Command.Smudge.cmd
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
, Command.Undo.cmd
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.Version.cmd
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
converted Assistant and Watch; avoid duplicate arg parsing for no repo mode
2015-07-13 15:42:42 +00:00
, Command.Watch.cmd
, Command.Assistant.cmd
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
convert WebApp; avoid duplicate arg parsing for no repo mode
2015-07-13 15:53:42 +00:00
, Command.WebApp.cmd
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
#endif
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
#ifdef WITH_XMPP
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.XMPPGit.cmd
add xmppgit command; roughed out xmpp push protocol and design
2012-11-06 04:52:35 +00:00
#endif
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.RemoteDaemon.cmd
Version build dependency on STM, and allow building without it, which disables the watch command.
2012-06-26 13:15:47 +00:00
#endif
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
, Command.Test.cmd testoptparser testrunner
Fix stub git-annex test support when built without tasty.
2014-08-24 01:46:08 +00:00
#ifdef WITH_TESTSUITE
doh't use "def" for command definitions, it conflicts with Data.Default.def
2014-10-14 18:20:10 +00:00
, Command.FuzzTest.cmd
converted Forget and TestRemote
2015-07-11 04:42:32 +00:00
, Command.TestRemote.cmd
add database benchmark The benchmark shows that the database access is quite fast indeed! And, it scales linearly to the number of keys, with one exception, getAssociatedKey. Based on this benchmark, I don't think I need worry about optimising for cases where all files are locked and the database is mostly empty. In those cases, database access will be misses, and according to this benchmark, should add only 50 milliseconds to runtime. (NB: There may be some overhead to getting the database opened and locking the handle that this benchmark doesn't see.) joey@darkstar:~/src/git-annex>./git-annex benchmark setting up database with 1000 setting up database with 10000 benchmarking keys database/getAssociatedFiles from 1000 (hit) time 62.77 μs (62.70 μs .. 62.85 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 62.81 μs (62.76 μs .. 62.88 μs) std dev 201.6 ns (157.5 ns .. 259.5 ns) benchmarking keys database/getAssociatedFiles from 1000 (miss) time 50.02 μs (49.97 μs .. 50.07 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 50.09 μs (50.04 μs .. 50.17 μs) std dev 206.7 ns (133.8 ns .. 295.3 ns) benchmarking keys database/getAssociatedKey from 1000 (hit) time 211.2 μs (210.5 μs .. 212.3 μs) 1.000 R² (0.999 R² .. 1.000 R²) mean 211.0 μs (210.7 μs .. 212.0 μs) std dev 1.685 μs (334.4 ns .. 3.517 μs) benchmarking keys database/getAssociatedKey from 1000 (miss) time 173.5 μs (172.7 μs .. 174.2 μs) 1.000 R² (0.999 R² .. 1.000 R²) mean 173.7 μs (173.0 μs .. 175.5 μs) std dev 3.833 μs (1.858 μs .. 6.617 μs) variance introduced by outliers: 16% (moderately inflated) benchmarking keys database/getAssociatedFiles from 10000 (hit) time 64.01 μs (63.84 μs .. 64.18 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 64.85 μs (64.34 μs .. 66.02 μs) std dev 2.433 μs (547.6 ns .. 4.652 μs) variance introduced by outliers: 40% (moderately inflated) benchmarking keys database/getAssociatedFiles from 10000 (miss) time 50.33 μs (50.28 μs .. 50.39 μs) 1.000 R² (1.000 R² .. 1.000 R²) mean 50.32 μs (50.26 μs .. 50.38 μs) std dev 202.7 ns (167.6 ns .. 252.0 ns) benchmarking keys database/getAssociatedKey from 10000 (hit) time 1.142 ms (1.139 ms .. 1.146 ms) 1.000 R² (1.000 R² .. 1.000 R²) mean 1.142 ms (1.140 ms .. 1.144 ms) std dev 7.142 μs (4.994 μs .. 10.98 μs) benchmarking keys database/getAssociatedKey from 10000 (miss) time 1.094 ms (1.092 ms .. 1.096 ms) 1.000 R² (1.000 R² .. 1.000 R²) mean 1.095 ms (1.095 ms .. 1.097 ms) std dev 4.277 μs (2.591 μs .. 7.228 μs)
2016-01-12 17:01:44 +00:00
#endif
#ifdef WITH_BENCHMARK
, Command.Benchmark.cmd
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
]
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
run :: Parser TestOptions -> Maybe TestRunner -> [String] -> IO ()
Remove the EKG build flag, since Gentoo for some reason decided to enable this flag, depsite it not being intended for production use and so enabled by default.
2016-07-06 19:09:56 +00:00
run testoptparser testrunner args = go envmodes
support being run by ssh as ssh-askpass replacement To use, set GIT_ANNEX_SSHASKPASS to point to a fifo or regular file (FIFO is better, avoids touching disk or multiple readers) that contains the password. Then set SSH_ASKPASS=git-annex, and when ssh runs it, it will tell ssh the password. This is not yet used..
2014-04-29 22:08:10 +00:00
where
wire tasty's option parser into the main program option parser This makes bash completion work for git-annex test, and is generally cleaner.
2015-07-13 17:19:20 +00:00
go [] = dispatch True args
(cmds testoptparser testrunner)
gitAnnexGlobalOptions [] Git.CurrentRepo.get
let optparse-applicative handle the usage display when run w/o command or bad command Still generating the list of commands myself, to get it sorted into sections and with short synopses.
2015-07-09 15:49:52 +00:00
"git-annex"
"manage files with git, without checking their contents in"
support being run by ssh as ssh-askpass replacement To use, set GIT_ANNEX_SSHASKPASS to point to a fifo or regular file (FIFO is better, avoids touching disk or multiple readers) that contains the password. Then set SSH_ASKPASS=git-annex, and when ssh runs it, it will tell ssh the password. This is not yet used..
2014-04-29 22:08:10 +00:00
go ((v, a):rest) = maybe (go rest) a =<< getEnv v
envmodes =
propigate ssh-options everywhere ssh caching is used * sync: Use the ssh-options git config when doing git pull and push. * remotedaemon: Use the ssh-options git config. Note that the rename env var means that if a new git-annex calls an old one for git-annex ssh, or a new calls an old, nothing much will go wrong; just ssh caching won't happen.
2015-02-12 20:12:32 +00:00
[ (sshOptionsEnv, runSshOptions args)
support being run by ssh as ssh-askpass replacement To use, set GIT_ANNEX_SSHASKPASS to point to a fifo or regular file (FIFO is better, avoids touching disk or multiple readers) that contains the password. Then set SSH_ASKPASS=git-annex, and when ssh runs it, it will tell ssh the password. This is not yet used..
2014-04-29 22:08:10 +00:00
, (sshAskPassEnv, runSshAskPass)
]
Reference in a new issue Copy permalink