diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-26 16:25:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-26 16:25:55 -0400 |
| commit | 4f050ca9b80d0565e408137f2422e808b82cfd11 (patch) | |
| tree | 5aca9688e49dee8915a962de4baf4c305ccbfa9e /Command/Import.hs | |
| parent | 541178b499d084e4041ae4b9d62bf86f5a97c3ff (diff) | |
reorganize some files and imports
Diffstat (limited to 'Command/Import.hs')
| -rw-r--r-- | Command/Import.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Command/Import.hs b/Command/Import.hs index dda2f3bc4..db0f8d3f5 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -13,7 +13,6 @@ import Common.Annex import Command import qualified Annex import qualified Command.Add -import qualified Option import Utility.CopyFile import Backend import Remote @@ -32,16 +31,16 @@ opts = ] duplicateOption :: Option -duplicateOption = Option.flag [] "duplicate" "do not delete source files" +duplicateOption = flagOption [] "duplicate" "do not delete source files" deduplicateOption :: Option -deduplicateOption = Option.flag [] "deduplicate" "delete source files whose content was imported before" +deduplicateOption = flagOption [] "deduplicate" "delete source files whose content was imported before" cleanDuplicatesOption :: Option -cleanDuplicatesOption = Option.flag [] "clean-duplicates" "delete duplicate source files (import nothing)" +cleanDuplicatesOption = flagOption [] "clean-duplicates" "delete duplicate source files (import nothing)" skipDuplicatesOption :: Option -skipDuplicatesOption = Option.flag [] "skip-duplicates" "import only new files" +skipDuplicatesOption = flagOption [] "skip-duplicates" "import only new files" data DuplicateMode = Default | Duplicate | DeDuplicate | CleanDuplicates | SkipDuplicates deriving (Eq) @@ -53,7 +52,7 @@ getDuplicateMode = gen <*> getflag cleanDuplicatesOption <*> getflag skipDuplicatesOption where - getflag = Annex.getFlag . Option.name + getflag = Annex.getFlag . optionName gen False False False False = Default gen True False False False = Duplicate gen False True False False = DeDuplicate |