diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-07 17:31:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-07 17:36:30 -0400 |
| commit | b68b110dda6db2917a418b24ce7372aca6307fd1 (patch) | |
| tree | 1c210a9738a23bff3b25a72fd8a7c738215446a8 | |
| parent | 1acc9824905411220c0fa1921ab2456a52e6b491 (diff) | |
Only look at reflogs for relevant branches, not for git-annex branches
This speeds it up quite a bit.. May still be too slow in large repos.
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | Command/Unused.hs | 3 | ||||
| -rw-r--r-- | Git/RefLog.hs | 13 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index df1412af5..5436132d8 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -210,7 +210,7 @@ getHistorical :: RefDate -> FilePath -> Annex String getHistorical date file = -- This check avoids some ugly error messages when the reflog -- is empty. - ifM (null <$> inRepo (Git.RefLog.get' [Param "-n1"] (Just fullname))) + ifM (null <$> inRepo (Git.RefLog.get' [Param (fromRef fullname), Param "-n1"])) ( error ("No reflog for " ++ fromRef fullname) , getRef (Git.Ref.dateRef fullname date) file ) diff --git a/Command/Unused.hs b/Command/Unused.hs index 647fd6762..77a9a92c3 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -219,7 +219,7 @@ withKeysReferencedInGit refspec a = do shaHead <- maybe (return Nothing) (inRepo . Git.Ref.sha) current rs <- relevantrefs (shaHead, current) <$> inRepo (Git.Command.pipeReadStrict [Param "show-ref"]) - usedrefs <- applyRefSpec refspec rs (inRepo Git.RefLog.getAll) + usedrefs <- applyRefSpec refspec rs (getreflog rs) forM_ usedrefs $ withKeysReferencedInGitRef a where @@ -242,6 +242,7 @@ withKeysReferencedInGit refspec a = do Git.Ref.headRef : nubRefs (filter ((/= x) . fst) refs) _ -> nubRefs refs + getreflog rs = inRepo $ Git.RefLog.getMulti rs {- Runs an action on keys referenced in the given Git reference which - differ from those referenced in the work tree. -} diff --git a/Git/RefLog.hs b/Git/RefLog.hs index 940bb10a1..57f35e918 100644 --- a/Git/RefLog.hs +++ b/Git/RefLog.hs @@ -14,18 +14,17 @@ import Git.Sha {- Gets the reflog for a given branch. -} get :: Branch -> Repo -> IO [Sha] -get b = get' [] (Just b) +get b = getMulti [b] -{- Gets all reflogs for all branches. -} -getAll :: Repo -> IO [Sha] -getAll = get' [Param "--all"] Nothing +{- Gets reflogs for multiple branches. -} +getMulti :: [Branch] -> Repo -> IO [Sha] +getMulti bs = get' (map (Param . fromRef) bs) -get' :: [CommandParam] -> Maybe Branch -> Repo -> IO [Sha] -get' ps b = mapMaybe extractSha . lines <$$> pipeReadStrict ps' +get' :: [CommandParam] -> Repo -> IO [Sha] +get' ps = mapMaybe extractSha . lines <$$> pipeReadStrict ps' where ps' = catMaybes [ Just $ Param "log" , Just $ Param "-g" , Just $ Param "--format=%H" - , Param . fromRef <$> b ] ++ ps |