mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

import: Check for gitignored files before moving them into the tree. (Needs git 1.8.4 or newer.)

Browse source
This commit is contained in:
Joey Hess 2015-04-29 13:46:12 -04:00
parent d8ffa498ef
commit 2e54251c18
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Command/Import.hs
View file

@ -16,6 +16,7 @@ import Backend
import Remote
import Types.KeySource
import Types.Key
import Annex.CheckIgnore
cmd :: [Command]
cmd = [withOptions opts $ notBareRepo $ command "import" paramPaths seek
@ -79,11 +80,15 @@ start mode (srcfile, destfile) =
next $ return True
importfile = do
handleexisting =<< liftIO (catchMaybeIO $ getSymbolicLinkStatus destfile)
liftIO $ createDirectoryIfMissing True (parentDir destfile)
liftIO $ if mode == Duplicate || mode == SkipDuplicates
then void $ copyFileExternal CopyAllMetaData srcfile destfile
else moveFile srcfile destfile
Command.Add.perform destfile
ignored <- not <$> Annex.getState Annex.force <&&> checkIgnored destfile
if ignored
then error $ "not importing " ++ destfile ++ " which is .gitignored (use --force to override)"
else do
liftIO $ createDirectoryIfMissing True (parentDir destfile)
liftIO $ if mode == Duplicate || mode == SkipDuplicates
then void $ copyFileExternal CopyAllMetaData srcfile destfile
else moveFile srcfile destfile
Command.Add.perform destfile
handleexisting Nothing = noop
handleexisting (Just s)
| isDirectory s = notoverwriting "(is a directory)"