From 258a3356e6461e0164441bb3a3e202cb9ef889e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Jul 2016 15:22:55 -0400 Subject: --branch, stage 2 Show branch:file that is being operated on. I had to make ActionItem a type and not a type class because withKeyOptions' passed two different types of values when using the type class, and I could not get the type checker to accept that. --- Command/Sync.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Command/Sync.hs') diff --git a/Command/Sync.hs b/Command/Sync.hs index 4d8cdf2d1..0626d14aa 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -449,8 +449,7 @@ seekSyncContent o rs = do where seekworktree mvar l bloomfeeder = seekHelper LsFiles.inRepo l >>= mapM_ (\f -> ifAnnexed f (go (Right bloomfeeder) mvar (Just f)) noop) - seekkeys mvar bloom getkeys = - mapM_ (go (Left bloom) mvar Nothing) =<< getkeys + seekkeys mvar bloom k _ = go (Left bloom) mvar Nothing k go ebloom mvar af k = commandAction $ do whenM (syncFile ebloom rs af k) $ void $ liftIO $ tryPutMVar mvar () @@ -512,7 +511,7 @@ syncFile ebloom rs af k = do , return [] ) get have = includeCommandAction $ do - showStart' "get" k af + showStart' "get" k (mkActionItem af) next $ next $ getKey' k af have wantput r @@ -527,4 +526,4 @@ syncFile ebloom rs af k = do , return [] ) put dest = includeCommandAction $ - Command.Move.toStart' dest False af k + Command.Move.toStart' dest False af k (mkActionItem af) -- cgit v1.2.3