37041b629d
A conflict can be caused by either export or import when the remote supports both.
53 lines
1.3 KiB
Haskell
53 lines
1.3 KiB
Haskell
{- git-annex exports
|
|
-
|
|
- Copyright 2017 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Annex.Export where
|
|
|
|
import Annex
|
|
import Annex.CatFile
|
|
import Types
|
|
import Types.Key
|
|
import qualified Git
|
|
import qualified Types.Remote as Remote
|
|
import Messages
|
|
import Utility.FileSystemEncoding
|
|
|
|
import Control.Applicative
|
|
import Data.Maybe
|
|
import Prelude
|
|
|
|
-- An export includes both annexed files and files stored in git.
|
|
-- For the latter, a SHA1 key is synthesized.
|
|
data ExportKey = AnnexKey Key | GitKey Key
|
|
deriving (Show, Eq, Ord)
|
|
|
|
asKey :: ExportKey -> Key
|
|
asKey (AnnexKey k) = k
|
|
asKey (GitKey k) = k
|
|
|
|
exportKey :: Git.Sha -> Annex ExportKey
|
|
exportKey sha = mk <$> catKey sha
|
|
where
|
|
mk (Just k) = AnnexKey k
|
|
mk Nothing = GitKey $ Key
|
|
{ keyName = encodeBS $ Git.fromRef sha
|
|
, keyVariety = SHA1Key (HasExt False)
|
|
, keySize = Nothing
|
|
, keyMtime = Nothing
|
|
, keyChunkSize = Nothing
|
|
, keyChunkNum = Nothing
|
|
}
|
|
|
|
warnExportImportConflict :: Remote -> Annex ()
|
|
warnExportImportConflict r = do
|
|
ops <- Remote.isImportSupported r >>= return . \case
|
|
True -> "exported to and/or imported from"
|
|
False -> "exported to"
|
|
toplevelWarning True $
|
|
"Conflict detected. Different trees have been " ++ ops ++
|
|
Remote.name r ++
|
|
". Use git-annex export to resolve this conflict."
|