2010-11-02 23:04:24 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2015-10-09 20:16:03 +00:00
|
|
|
- Copyright 2010-2015 Joey Hess <id@joeyh.name>
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Command.Move where
|
|
|
|
|
|
|
|
import Command
|
2010-11-11 22:54:52 +00:00
|
|
|
import qualified Command.Drop
|
2010-11-02 23:04:24 +00:00
|
|
|
import qualified Annex
|
2011-10-04 04:40:47 +00:00
|
|
|
import Annex.Content
|
2011-03-27 21:24:20 +00:00
|
|
|
import qualified Remote
|
2011-10-15 21:47:03 +00:00
|
|
|
import Annex.UUID
|
2014-03-22 14:42:38 +00:00
|
|
|
import Annex.Transfer
|
2012-01-19 19:24:05 +00:00
|
|
|
import Logs.Presence
|
2015-10-09 20:16:03 +00:00
|
|
|
import Annex.NumCopies
|
|
|
|
|
|
|
|
import System.Log.Logger (debugM)
|
2011-03-16 01:34:13 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2015-07-10 17:18:46 +00:00
|
|
|
cmd = withGlobalOptions (jobsOption : annexedMatchingOptions) $
|
|
|
|
command "move" SectionCommon
|
|
|
|
"move content of files to/from another repository"
|
|
|
|
paramPaths (seek <--< optParser)
|
2015-07-09 19:23:14 +00:00
|
|
|
|
|
|
|
data MoveOptions = MoveOptions
|
|
|
|
{ moveFiles :: CmdParams
|
|
|
|
, fromToOptions :: FromToOptions
|
|
|
|
, keyOptions :: Maybe KeyOptions
|
|
|
|
}
|
|
|
|
|
|
|
|
optParser :: CmdParamsDesc -> Parser MoveOptions
|
|
|
|
optParser desc = MoveOptions
|
|
|
|
<$> cmdParams desc
|
|
|
|
<*> parseFromToOptions
|
|
|
|
<*> optional (parseKeyOptions False)
|
|
|
|
|
|
|
|
instance DeferredParseClass MoveOptions where
|
|
|
|
finishParse v = MoveOptions
|
|
|
|
<$> pure (moveFiles v)
|
|
|
|
<*> finishParse (fromToOptions v)
|
|
|
|
<*> pure (keyOptions v)
|
|
|
|
|
|
|
|
seek :: MoveOptions -> CommandSeek
|
2015-11-04 20:19:00 +00:00
|
|
|
seek o = allowConcurrentOutput $
|
|
|
|
withKeyOptions (keyOptions o) False
|
|
|
|
(startKey o True)
|
|
|
|
(withFilesInGit $ whenAnnexed $ start o True)
|
|
|
|
(moveFiles o)
|
2015-07-09 19:23:14 +00:00
|
|
|
|
|
|
|
start :: MoveOptions -> Bool -> FilePath -> Key -> CommandStart
|
|
|
|
start o move = start' o move . Just
|
|
|
|
|
|
|
|
startKey :: MoveOptions -> Bool -> Key -> CommandStart
|
|
|
|
startKey o move = start' o move Nothing
|
|
|
|
|
|
|
|
start' :: MoveOptions -> Bool -> AssociatedFile -> Key -> CommandStart
|
|
|
|
start' o move afile key =
|
|
|
|
case fromToOptions o of
|
|
|
|
FromRemote src -> fromStart move afile key =<< getParsed src
|
|
|
|
ToRemote dest -> toStart move afile key =<< getParsed dest
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2013-07-03 17:55:50 +00:00
|
|
|
showMoveAction :: Bool -> Key -> AssociatedFile -> Annex ()
|
2014-01-26 19:53:01 +00:00
|
|
|
showMoveAction move = showStart' (if move then "move" else "copy")
|
2010-11-27 21:02:53 +00:00
|
|
|
|
2011-03-27 21:24:20 +00:00
|
|
|
{- Moves (or copies) the content of an annexed file to a remote.
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
2011-03-27 21:24:20 +00:00
|
|
|
- If the remote already has the content, it is still removed from
|
|
|
|
- the current repository.
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
2014-01-20 20:47:56 +00:00
|
|
|
- Note that unlike drop, this does not honor numcopies.
|
2010-11-02 23:04:24 +00:00
|
|
|
- A file's content can be moved even if there are insufficient copies to
|
|
|
|
- allow it to be dropped.
|
|
|
|
-}
|
2015-07-09 19:23:14 +00:00
|
|
|
toStart :: Bool -> AssociatedFile -> Key -> Remote -> CommandStart
|
|
|
|
toStart move afile key dest = do
|
2011-10-11 18:43:45 +00:00
|
|
|
u <- getUUID
|
2010-11-02 23:04:24 +00:00
|
|
|
ishere <- inAnnex key
|
2011-03-27 21:24:20 +00:00
|
|
|
if not ishere || u == Remote.uuid dest
|
2011-05-15 06:02:46 +00:00
|
|
|
then stop -- not here, so nothing to do
|
2014-03-13 18:51:22 +00:00
|
|
|
else toStart' dest move afile key
|
|
|
|
|
|
|
|
toStart' :: Remote -> Bool -> AssociatedFile -> Key -> CommandStart
|
|
|
|
toStart' dest move afile key = do
|
2011-03-27 22:34:30 +00:00
|
|
|
fast <- Annex.getState Annex.fast
|
2014-03-13 18:51:22 +00:00
|
|
|
if fast && not move && not (Remote.hasKeyCheap dest)
|
|
|
|
then ifM (expectedPresent dest key)
|
|
|
|
( stop
|
|
|
|
, go True (pure $ Right False)
|
|
|
|
)
|
|
|
|
else go False (Remote.hasKey dest key)
|
|
|
|
where
|
|
|
|
go fastcheck isthere = do
|
|
|
|
showMoveAction move key afile
|
|
|
|
next $ toPerform dest move key afile fastcheck =<< isthere
|
|
|
|
|
|
|
|
expectedPresent :: Remote -> Key -> Annex Bool
|
|
|
|
expectedPresent dest key = do
|
|
|
|
remotes <- Remote.keyPossibilities key
|
|
|
|
return $ dest `elem` remotes
|
|
|
|
|
|
|
|
toPerform :: Remote -> Bool -> Key -> AssociatedFile -> Bool -> Either String Bool -> CommandPerform
|
2014-10-09 19:35:19 +00:00
|
|
|
toPerform dest move key afile fastcheck isthere =
|
2010-11-02 23:04:24 +00:00
|
|
|
case isthere of
|
|
|
|
Left err -> do
|
2011-11-11 05:52:58 +00:00
|
|
|
showNote err
|
2011-05-15 06:02:46 +00:00
|
|
|
stop
|
2010-11-02 23:04:24 +00:00
|
|
|
Right False -> do
|
2011-07-19 18:07:23 +00:00
|
|
|
showAction $ "to " ++ Remote.name dest
|
2014-03-22 14:42:38 +00:00
|
|
|
ok <- notifyTransfer Upload afile $
|
2015-05-12 19:50:03 +00:00
|
|
|
upload (Remote.uuid dest) key afile noRetry noObserver $
|
2014-03-22 14:42:38 +00:00
|
|
|
Remote.storeKey dest key afile
|
2010-11-22 21:51:55 +00:00
|
|
|
if ok
|
2013-02-26 18:39:37 +00:00
|
|
|
then do
|
|
|
|
Remote.logStatus dest key InfoPresent
|
|
|
|
finish
|
2011-05-16 17:27:19 +00:00
|
|
|
else do
|
|
|
|
when fastcheck $
|
|
|
|
warning "This could have failed because --fast is enabled."
|
|
|
|
stop
|
2013-02-26 18:39:37 +00:00
|
|
|
Right True -> do
|
2014-03-13 18:51:22 +00:00
|
|
|
unlessM (expectedPresent dest key) $
|
2013-02-26 18:39:37 +00:00
|
|
|
Remote.logStatus dest key InfoPresent
|
|
|
|
finish
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
2013-02-26 18:39:37 +00:00
|
|
|
finish
|
2015-10-09 19:48:02 +00:00
|
|
|
| move = lockContentForRemoval key $ \contentlock -> do
|
2014-08-21 00:08:45 +00:00
|
|
|
removeAnnex contentlock
|
2013-02-26 18:39:37 +00:00
|
|
|
next $ Command.Drop.cleanupLocal key
|
|
|
|
| otherwise = next $ return True
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2011-03-27 21:24:20 +00:00
|
|
|
{- Moves (or copies) the content of an annexed file from a remote
|
|
|
|
- to the current repository.
|
2010-11-02 23:04:24 +00:00
|
|
|
-
|
|
|
|
- If the current repository already has the content, it is still removed
|
2011-03-27 21:24:20 +00:00
|
|
|
- from the remote.
|
2010-11-02 23:04:24 +00:00
|
|
|
-}
|
2015-07-09 19:23:14 +00:00
|
|
|
fromStart :: Bool -> AssociatedFile -> Key -> Remote -> CommandStart
|
|
|
|
fromStart move afile key src
|
2011-11-11 05:52:58 +00:00
|
|
|
| move = go
|
2011-12-09 17:32:09 +00:00
|
|
|
| otherwise = stopUnless (not <$> inAnnex key) go
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
|
|
|
go = stopUnless (fromOk src key) $ do
|
2013-07-03 17:55:50 +00:00
|
|
|
showMoveAction move key afile
|
|
|
|
next $ fromPerform src move key afile
|
2012-11-12 05:05:04 +00:00
|
|
|
|
2011-12-31 08:11:39 +00:00
|
|
|
fromOk :: Remote -> Key -> Annex Bool
|
2013-12-02 19:41:20 +00:00
|
|
|
fromOk src key = go =<< Annex.getState Annex.force
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
2013-12-02 19:41:20 +00:00
|
|
|
go True = either (const $ return True) return =<< haskey
|
|
|
|
go False
|
|
|
|
| Remote.hasKeyCheap src =
|
|
|
|
either (const expensive) return =<< haskey
|
|
|
|
| otherwise = expensive
|
|
|
|
haskey = Remote.hasKey src key
|
2012-11-12 05:05:04 +00:00
|
|
|
expensive = do
|
|
|
|
u <- getUUID
|
|
|
|
remotes <- Remote.keyPossibilities key
|
|
|
|
return $ u /= Remote.uuid src && elem src remotes
|
|
|
|
|
2013-07-03 17:55:50 +00:00
|
|
|
fromPerform :: Remote -> Bool -> Key -> AssociatedFile -> CommandPerform
|
avoid trying to create a content file in order to lock it
The nice refactoring in ec7dd0446aa8f73886ecf9304b3affe14549b940
highlighted a bug in lockContent -- when the content is not present,
this incorrectly created an empty lock file, using the same filename
as the content file.
This seems like it could result in empty objects, which fsck would detect
and complain about. Both drop and move --to call lockContent, as does
Remote.Git.dropKey -- I think we got lucky and this bug didn't show up
because both all of those only operate on files that are present. So
this bug could only manifest if there was a race, and a file's content
was dropped at just the wrong time, just as another process was about to
drop it. (And then only if the other process's dropping failed, otherwise
it'd delete the empty object file.)
Hmm, move --from also called lockContent. Unnecessarily, since the content
is not being removed from the local annex. In this case, the combination of
the 2 bugs could result in an empty lock file being written, and then if
the download of the content failed, left in the object directory as the
content.
This commit also optimises lockContent, avoiding an unncessary
doesFileExist test and instead just catching the exception that's thrown
when the file doesn't exist.
This commit was sponsored by Justine Lam.
2014-08-20 21:06:51 +00:00
|
|
|
fromPerform src move key afile = ifM (inAnnex key)
|
|
|
|
( dispatch move True
|
|
|
|
, dispatch move =<< go
|
|
|
|
)
|
2012-11-12 05:05:04 +00:00
|
|
|
where
|
2014-03-22 14:42:38 +00:00
|
|
|
go = notifyTransfer Download afile $
|
2015-05-12 19:50:03 +00:00
|
|
|
download (Remote.uuid src) key afile noRetry noObserver $ \p -> do
|
2014-03-22 14:42:38 +00:00
|
|
|
showAction $ "from " ++ Remote.name src
|
Do verification of checksums of annex objects downloaded from remotes.
* When annex objects are received into git repositories, their checksums are
verified then too.
* To get the old, faster, behavior of not verifying checksums, set
annex.verify=false, or remote.<name>.annex-verify=false.
* setkey, rekey: These commands also now verify that the provided file
matches the key, unless annex.verify=false.
* reinject: Already verified content; this can now be disabled by
setting annex.verify=false.
recvkey and reinject already did verification, so removed now duplicate
code from them. fsck still does its own verification, which is ok since it
does not use getViaTmp, so verification doesn't happen twice when using fsck
--from.
2015-10-01 19:54:37 +00:00
|
|
|
getViaTmp (RemoteVerify src) key $ \t ->
|
|
|
|
Remote.retrieveKeyFile src key afile t p
|
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
|
|
|
dispatch _ False = stop -- failed
|
|
|
|
dispatch False True = next $ return True -- copy complete
|
2015-10-09 20:16:03 +00:00
|
|
|
-- Finish by dropping from remote, taking care to verify that
|
|
|
|
-- the copy here has not been lost somehow.
|
|
|
|
-- (NumCopies is 1 since we're moving.)
|
|
|
|
dispatch True True = verifyEnoughCopiesToDrop "" key Nothing
|
|
|
|
(NumCopies 1) [] [] [UnVerifiedHere] dropremote faileddropremote
|
|
|
|
dropremote proof = do
|
|
|
|
liftIO $ debugM "drop" $ unwords
|
|
|
|
[ "Dropping from remote"
|
|
|
|
, show src
|
|
|
|
, "proof:"
|
|
|
|
, show proof
|
|
|
|
]
|
2012-11-12 05:05:04 +00:00
|
|
|
ok <- Remote.removeKey src key
|
|
|
|
next $ Command.Drop.cleanupRemote key src ok
|
2015-10-09 20:16:03 +00:00
|
|
|
faileddropremote = error "Unable to drop from remote."
|