b6d46c212e
* unannex, uninit: Avoid committing after every file is unannexed,
for massive speedup.
* --notify-finish switch will cause desktop notifications after each
file upload/download/drop completes
(using the dbus Desktop Notifications Specification)
* --notify-start switch will show desktop notifications when each
file upload/download starts.
* webapp: Automatically install Nautilus integration scripts
to get and drop files.
* tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
* git-annex-shell: Make configlist automatically initialize
a remote git repository, as long as a git-annex branch has
been pushed to it, to simplify setup of remote git repositories,
including via gitolite.
* add --include-dotfiles: New option, perhaps useful for backups.
* Version 5.20140227 broke creation of glacier repositories,
not including the datacenter and vault in their configuration.
This bug is fixed, but glacier repositories set up with the broken
version of git-annex need to have the datacenter and vault set
in order to be usable. This can be done using git annex enableremote
to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
* Added required content configuration.
* assistant: Improve ssh authorized keys line generated in local pairing
or for a remote ssh server to set environment variables in an
alternative way that works with the non-POSIX fish shell, as well
as POSIX shells.
# imported from the archive
115 lines
3.3 KiB
Haskell
115 lines
3.3 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2012-2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Import where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Annex
|
|
import qualified Command.Add
|
|
import Utility.CopyFile
|
|
import Backend
|
|
import Remote
|
|
import Types.KeySource
|
|
|
|
def :: [Command]
|
|
def = [withOptions opts $ notBareRepo $ command "import" paramPaths seek
|
|
SectionCommon "move and add files from outside git working copy"]
|
|
|
|
opts :: [Option]
|
|
opts =
|
|
[ duplicateOption
|
|
, deduplicateOption
|
|
, cleanDuplicatesOption
|
|
, skipDuplicatesOption
|
|
]
|
|
|
|
duplicateOption :: Option
|
|
duplicateOption = flagOption [] "duplicate" "do not delete source files"
|
|
|
|
deduplicateOption :: Option
|
|
deduplicateOption = flagOption [] "deduplicate" "delete source files whose content was imported before"
|
|
|
|
cleanDuplicatesOption :: Option
|
|
cleanDuplicatesOption = flagOption [] "clean-duplicates" "delete duplicate source files (import nothing)"
|
|
|
|
skipDuplicatesOption :: Option
|
|
skipDuplicatesOption = flagOption [] "skip-duplicates" "import only new files"
|
|
|
|
data DuplicateMode = Default | Duplicate | DeDuplicate | CleanDuplicates | SkipDuplicates
|
|
deriving (Eq)
|
|
|
|
getDuplicateMode :: Annex DuplicateMode
|
|
getDuplicateMode = gen
|
|
<$> getflag duplicateOption
|
|
<*> getflag deduplicateOption
|
|
<*> getflag cleanDuplicatesOption
|
|
<*> getflag skipDuplicatesOption
|
|
where
|
|
getflag = Annex.getFlag . optionName
|
|
gen False False False False = Default
|
|
gen True False False False = Duplicate
|
|
gen False True False False = DeDuplicate
|
|
gen False False True False = CleanDuplicates
|
|
gen False False False True = SkipDuplicates
|
|
gen _ _ _ _ = error "bad combination of --duplicate, --deduplicate, --clean-duplicates, --skip-duplicates"
|
|
|
|
seek :: CommandSeek
|
|
seek ps = do
|
|
mode <- getDuplicateMode
|
|
withPathContents (start mode) ps
|
|
|
|
start :: DuplicateMode -> (FilePath, FilePath) -> CommandStart
|
|
start mode (srcfile, destfile) =
|
|
ifM (liftIO $ isRegularFile <$> getSymbolicLinkStatus srcfile)
|
|
( do
|
|
isdup <- do
|
|
backend <- chooseBackend destfile
|
|
let ks = KeySource srcfile srcfile Nothing
|
|
v <- genKey ks backend
|
|
case v of
|
|
Just (k, _) -> not . null <$> keyLocations k
|
|
_ -> return False
|
|
case pickaction isdup of
|
|
Nothing -> stop
|
|
Just a -> do
|
|
showStart "import" destfile
|
|
next a
|
|
, stop
|
|
)
|
|
where
|
|
deletedup = do
|
|
showNote "duplicate"
|
|
liftIO $ removeFile srcfile
|
|
next $ return True
|
|
importfile = do
|
|
handleexisting =<< liftIO (catchMaybeIO $ getSymbolicLinkStatus destfile)
|
|
liftIO $ createDirectoryIfMissing True (parentDir destfile)
|
|
liftIO $ if mode == Duplicate || mode == SkipDuplicates
|
|
then void $ copyFileExternal srcfile destfile
|
|
else moveFile srcfile destfile
|
|
Command.Add.perform destfile
|
|
handleexisting Nothing = noop
|
|
handleexisting (Just s)
|
|
| isDirectory s = notoverwriting "(is a directory)"
|
|
| otherwise = ifM (Annex.getState Annex.force) $
|
|
( liftIO $ nukeFile destfile
|
|
, notoverwriting "(use --force to override)"
|
|
)
|
|
notoverwriting why = error $ "not overwriting existing " ++ destfile ++ " " ++ why
|
|
pickaction isdup = case mode of
|
|
DeDuplicate
|
|
| isdup -> Just deletedup
|
|
| otherwise -> Just importfile
|
|
CleanDuplicates
|
|
| isdup -> Just deletedup
|
|
| otherwise -> Nothing
|
|
SkipDuplicates
|
|
| isdup -> Nothing
|
|
| otherwise -> Just importfile
|
|
_ -> Just importfile
|
|
|