diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-31 12:33:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-31 12:33:41 -0400 |
| commit | cc1ea8f84463c7e333bfa17a815f250d8d088841 (patch) | |
| tree | aa4868f5b59edf4cbb3b34d5ae16f19d06804efa /GitAnnex.hs | |
| parent | e09dd6f306b3f69718c77a03364ee9e51a51bb3b (diff) | |
Removed the setkey command, and added a setcontent command with a more useful interface.
Diffstat (limited to 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index 89fb4e591..09f0a118c 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -26,7 +26,7 @@ import qualified Command.Copy import qualified Command.Get import qualified Command.FromKey import qualified Command.DropKey -import qualified Command.SetKey +import qualified Command.SetContent import qualified Command.Fix import qualified Command.Init import qualified Command.Describe @@ -63,6 +63,7 @@ cmds = concat , Command.Init.def , Command.Describe.def , Command.InitRemote.def + , Command.SetContent.def , Command.Unannex.def , Command.Uninit.def , Command.PreCommit.def @@ -72,7 +73,6 @@ cmds = concat , Command.AddUrl.def , Command.FromKey.def , Command.DropKey.def - , Command.SetKey.def , Command.Fix.def , Command.Fsck.def , Command.Unused.def @@ -89,9 +89,7 @@ cmds = concat options :: [Option] options = commonOptions ++ - [ Option ['k'] ["key"] (ReqArg setkey paramKey) - "specify a key to use" - , Option ['t'] ["to"] (ReqArg setto paramRemote) + [ Option ['t'] ["to"] (ReqArg setto paramRemote) "specify to where to transfer content" , Option ['f'] ["from"] (ReqArg setfrom paramRemote) "specify from where to transfer content" @@ -116,7 +114,6 @@ options = commonOptions ++ setto v = Annex.changeState $ \s -> s { Annex.toremote = Just v } setfrom v = Annex.changeState $ \s -> s { Annex.fromremote = Just v } setnumcopies v = Annex.changeState $ \s -> s {Annex.forcenumcopies = readMaybe v } - setkey v = Annex.changeState $ \s -> s { Annex.defaultkey = Just v } setgitconfig :: String -> Annex () setgitconfig v = do g <- gitRepo |