diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-06-01 13:52:23 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-01 13:52:23 -0400 |
| commit | 39c13f91004b41166b786785083e78b34df0c48f (patch) | |
| tree | bf5ea0acf27c9075a63d3b23b970c3ea44ecee64 /Annex/AutoMerge.hs | |
| parent | 3a9ca30fa8740a57ea477243498339f9738102d6 (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 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 5ffa7b073..825dde443 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -89,7 +89,9 @@ resolveMerge us them = do unlessM isDirect $ do (deleted, cleanup2) <- inRepo (LsFiles.deleted [top]) unless (null deleted) $ - Annex.Queue.addCommand "rm" [Params "--quiet -f --"] deleted + Annex.Queue.addCommand "rm" + [Param "--quiet", Param "-f", Param "--"] + deleted void $ liftIO cleanup2 when merged $ do @@ -173,7 +175,8 @@ resolveMerge' (Just us) them u = do resolveby a = do {- Remove conflicted file from index so merge can be resolved. -} - Annex.Queue.addCommand "rm" [Params "--quiet -f --cached --"] [file] + Annex.Queue.addCommand "rm" + [Param "--quiet", Param "-f", Param "--cached", Param "--"] [file] void a return (Just file) |