aboutsummaryrefslogtreecommitdiff
path: root/Command/Unannex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-06-01 13:52:23 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-06-01 13:52:23 -0400
commit39c13f91004b41166b786785083e78b34df0c48f (patch)
treebf5ea0acf27c9075a63d3b23b970c3ea44ecee64 /Command/Unannex.hs
parent3a9ca30fa8740a57ea477243498339f9738102d6 (diff)
remove Params constructor from Utility.SafeCommand
This removes a bit of complexity, and should make things faster (avoids tokenizing Params string), and probably involve less garbage collection. In a few places, it was useful to use Params to avoid needing a list, but that is easily avoided. Problems noticed while doing this conversion: * Some uses of Params "oneword" which was entirely unnecessary overhead. * A few places that built up a list of parameters with ++ and then used Params to split it! Test suite passes.
Diffstat (limited to 'Command/Unannex.hs')
-rw-r--r--Command/Unannex.hs18
1 files changed, 16 insertions, 2 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 4b803401e..0d88148c8 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -72,7 +72,14 @@ start file key = stopUnless (inAnnex key) $ do
performIndirect :: FilePath -> Key -> CommandPerform
performIndirect file key = do
liftIO $ removeFile file
- inRepo $ Git.Command.run [Params "rm --cached --force --quiet --", File file]
+ inRepo $ Git.Command.run
+ [ Param "rm"
+ , Param "--cached"
+ , Param "--force"
+ , Param "--quiet"
+ , Param "--"
+ , File file
+ ]
next $ cleanupIndirect file key
cleanupIndirect :: FilePath -> Key -> CommandCleanup
@@ -108,7 +115,14 @@ cleanupIndirect file key = do
performDirect :: FilePath -> Key -> CommandPerform
performDirect file key = do
-- --force is needed when the file is not committed
- inRepo $ Git.Command.run [Params "rm --cached --force --quiet --", File file]
+ inRepo $ Git.Command.run
+ [ Param "rm"
+ , Param "--cached"
+ , Param "--force"
+ , Param "--quiet"
+ , Param "--"
+ , File file
+ ]
next $ cleanupDirect file key
{- The direct mode file is not touched during unannex, so the content