add inRepoDetails
planned to use for an optimisation most things using stagedDetails were not expecting to get dup files in a conflicted merge and deal with them, so converted them to use inRepoDetails.
This commit is contained in:
parent
7347e50123
commit
9f6bd6cc05
5 changed files with 27 additions and 17 deletions
|
@ -94,12 +94,12 @@ knownUrls = do
|
|||
Annex.Branch.commit =<< Annex.Branch.commitMessage
|
||||
Annex.Branch.withIndex $ do
|
||||
top <- fromRepo Git.repoPath
|
||||
(l, cleanup) <- inRepo $ Git.LsFiles.stagedDetails [top]
|
||||
(l, cleanup) <- inRepo $ Git.LsFiles.inRepoDetails [] [top]
|
||||
r <- mapM getkeyurls l
|
||||
void $ liftIO cleanup
|
||||
return $ concat r
|
||||
where
|
||||
getkeyurls (f, s, _, _) = case urlLogFileKey f of
|
||||
getkeyurls (f, s, _) = case urlLogFileKey f of
|
||||
Just k -> zip (repeat k) <$> geturls s
|
||||
Nothing -> return []
|
||||
geturls logsha =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue