add a message in potenatially confusing copy --fast failure situation
This commit is contained in:
parent
0a7bcd47ae
commit
d006586cd0
2 changed files with 10 additions and 2 deletions
|
@ -7,6 +7,8 @@
|
||||||
|
|
||||||
module Command.Move where
|
module Command.Move where
|
||||||
|
|
||||||
|
import Control.Monad (when)
|
||||||
|
|
||||||
import Command
|
import Command
|
||||||
import qualified Command.Drop
|
import qualified Command.Drop
|
||||||
import qualified Annex
|
import qualified Annex
|
||||||
|
@ -84,7 +86,8 @@ toPerform dest move key = do
|
||||||
-- and an explicit check is not done, when copying. When moving,
|
-- and an explicit check is not done, when copying. When moving,
|
||||||
-- it has to be done, to avoid inaverdent data loss.
|
-- it has to be done, to avoid inaverdent data loss.
|
||||||
fast <- Annex.getState Annex.fast
|
fast <- Annex.getState Annex.fast
|
||||||
isthere <- if fast && not move && not (Remote.hasKeyCheap dest)
|
let fastcheck = fast && not move && not (Remote.hasKeyCheap dest)
|
||||||
|
isthere <- if fastcheck
|
||||||
then do
|
then do
|
||||||
(remotes, _) <- Remote.keyPossibilities key
|
(remotes, _) <- Remote.keyPossibilities key
|
||||||
return $ Right $ dest `elem` remotes
|
return $ Right $ dest `elem` remotes
|
||||||
|
@ -98,7 +101,10 @@ toPerform dest move key = do
|
||||||
ok <- Remote.storeKey dest key
|
ok <- Remote.storeKey dest key
|
||||||
if ok
|
if ok
|
||||||
then next $ toCleanup dest move key
|
then next $ toCleanup dest move key
|
||||||
else stop -- failed
|
else do
|
||||||
|
when fastcheck $
|
||||||
|
warning "This could have failed because --fast is enabled."
|
||||||
|
stop
|
||||||
Right True -> next $ toCleanup dest move key
|
Right True -> next $ toCleanup dest move key
|
||||||
toCleanup :: Remote.Remote Annex -> Bool -> Key -> CommandCleanup
|
toCleanup :: Remote.Remote Annex -> Bool -> Key -> CommandCleanup
|
||||||
toCleanup dest move key = do
|
toCleanup dest move key = do
|
||||||
|
|
|
@ -2,3 +2,5 @@ Conversation moved from [[walkthrough/recover_data_from_lost+found]]
|
||||||
to a proper bug. --[[Joey]]
|
to a proper bug. --[[Joey]]
|
||||||
|
|
||||||
(Unfortunatly that scrambled the comment creation times and thus order.)
|
(Unfortunatly that scrambled the comment creation times and thus order.)
|
||||||
|
|
||||||
|
> Added a message [[done]] --[[Joey]]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue