-J for add/addurl/import

This commit is contained in:
Joey Hess 2015-11-05 18:24:15 -04:00
parent 31472161e4
commit 5db7d435e7
Failed to extract signature
7 changed files with 28 additions and 11 deletions

View file

@ -21,7 +21,7 @@ import Annex.CheckIgnore
import Annex.NumCopies
cmd :: Command
cmd = withGlobalOptions fileMatchingOptions $ notBareRepo $
cmd = withGlobalOptions (jobsOption : fileMatchingOptions) $ notBareRepo $
command "import" SectionCommon
"move and add files from outside git working copy"
paramPaths (seek <$$> optParser)
@ -59,7 +59,7 @@ duplicateModeParser =
)
seek :: ImportOptions -> CommandSeek
seek o = do
seek o = allowConcurrentOutput $ do
repopath <- liftIO . absPath =<< fromRepo Git.repoPath
inrepops <- liftIO $ filter (dirContains repopath) <$> mapM absPath (importFiles o)
unless (null inrepops) $ do