2012-12-13 19:44:56 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2012 Joey Hess <id@joeyh.name>
|
2012-12-13 19:44:56 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Command.Direct where
|
|
|
|
|
|
|
|
import Command
|
|
|
|
import qualified Git
|
|
|
|
import qualified Git.LsFiles
|
2014-07-04 15:36:59 +00:00
|
|
|
import qualified Git.Branch
|
2012-12-13 19:44:56 +00:00
|
|
|
import Config
|
2012-12-18 19:04:44 +00:00
|
|
|
import Annex.Direct
|
2015-12-04 20:29:27 +00:00
|
|
|
import Annex.Version
|
2012-12-13 19:44:56 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
|
|
|
cmd = notBareRepo $ noDaemonRunning $
|
2015-07-08 19:08:02 +00:00
|
|
|
command "direct" SectionSetup "switch repository to direct mode"
|
|
|
|
paramNothing (withParams seek)
|
2012-12-13 19:44:56 +00:00
|
|
|
|
2015-07-08 19:08:02 +00:00
|
|
|
seek :: CmdParams -> CommandSeek
|
fix inversion of control in CommandSeek (no behavior changes)
I've been disliking how the command seek actions were written for some
time, with their inversion of control and ugly workarounds.
The last straw to fix it was sync --content, which didn't fit the
Annex [CommandStart] interface well at all. I have not yet made it take
advantage of the changed interface though.
The crucial change, and probably why I didn't do it this way from the
beginning, is to make each CommandStart action be run with exceptions
caught, and if it fails, increment a failure counter in annex state.
So I finally remove the very first code I wrote for git-annex, which
was before I had exception handling in the Annex monad, and so ran outside
that monad, passing state explicitly as it ran each CommandStart action.
This was a real slog from 1 to 5 am.
Test suite passes.
Memory usage is lower than before, sometimes by a couple of megabytes, and
remains constant, even when running in a large repo, and even when
repeatedly failing and incrementing the error counter. So no accidental
laziness space leaks.
Wall clock speed is identical, even in large repos.
This commit was sponsored by an anonymous bitcoiner.
2014-01-20 08:11:42 +00:00
|
|
|
seek = withNothing start
|
2012-12-13 19:44:56 +00:00
|
|
|
|
|
|
|
start :: CommandStart
|
2015-12-04 20:29:27 +00:00
|
|
|
start = ifM versionSupportsDirectMode
|
|
|
|
( ifM isDirect ( stop , next perform )
|
2017-02-11 09:38:49 +00:00
|
|
|
, giveup "Direct mode is not supported by this repository version. Use git-annex unlock instead."
|
2015-12-04 20:29:27 +00:00
|
|
|
)
|
2012-12-13 19:44:56 +00:00
|
|
|
|
|
|
|
perform :: CommandPerform
|
|
|
|
perform = do
|
|
|
|
showStart "commit" ""
|
|
|
|
showOutput
|
2014-07-04 15:36:59 +00:00
|
|
|
_ <- inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit
|
|
|
|
[ Param "-a"
|
2013-03-03 17:39:07 +00:00
|
|
|
, Param "-m"
|
|
|
|
, Param "commit before switching to direct mode"
|
|
|
|
]
|
2012-12-13 20:00:17 +00:00
|
|
|
showEndOk
|
|
|
|
|
2012-12-13 19:44:56 +00:00
|
|
|
top <- fromRepo Git.repoPath
|
|
|
|
(l, clean) <- inRepo $ Git.LsFiles.inRepo [top]
|
|
|
|
forM_ l go
|
|
|
|
void $ liftIO clean
|
|
|
|
next cleanup
|
|
|
|
where
|
2014-04-17 22:03:39 +00:00
|
|
|
go = whenAnnexed $ \f k -> do
|
2012-12-18 21:15:16 +00:00
|
|
|
r <- toDirectGen k f
|
2012-12-18 19:04:44 +00:00
|
|
|
case r of
|
|
|
|
Nothing -> noop
|
|
|
|
Just a -> do
|
2012-12-13 19:44:56 +00:00
|
|
|
showStart "direct" f
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
r' <- tryNonAsync a
|
2013-10-03 16:33:31 +00:00
|
|
|
case r' of
|
2013-09-30 16:48:40 +00:00
|
|
|
Left e -> warnlocked e
|
|
|
|
Right _ -> showEndOk
|
2012-12-13 19:44:56 +00:00
|
|
|
return Nothing
|
|
|
|
|
2013-09-30 16:48:40 +00:00
|
|
|
warnlocked :: SomeException -> Annex ()
|
|
|
|
warnlocked e = do
|
|
|
|
warning $ show e
|
|
|
|
warning "leaving this file as-is; correct this problem and run git annex fsck on it"
|
|
|
|
|
2012-12-13 19:44:56 +00:00
|
|
|
cleanup :: CommandCleanup
|
|
|
|
cleanup = do
|
2012-12-13 20:00:17 +00:00
|
|
|
showStart "direct" ""
|
2012-12-13 19:44:56 +00:00
|
|
|
setDirect True
|
|
|
|
return True
|