From 7989943d6a58d14ef1fa02f46067743468137eb5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Apr 2015 00:30:36 -0400 Subject: make segmentXargs preserve order --- Assistant/Threads/Committer.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant') diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 2951a8018..717a99c96 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -290,7 +290,7 @@ handleAdds havelsof delayadd cs = returnWhen (null incomplete) $ do -- files. The ls-files is run on a batch of files. findnew [] = return ([], noop) findnew pending@(exemplar:_) = do - let segments = segmentXargs $ map changeFile pending + let segments = segmentXargsUnordered $ map changeFile pending rs <- liftAnnex $ forM segments $ \fs -> inRepo (Git.LsFiles.notInRepo False fs) let (newfiles, cleanup) = foldl' @@ -457,7 +457,7 @@ safeToAdd havelsof delayadd pending inprocess = do -} findopenfiles keysources = ifM crippledFileSystem ( liftIO $ do - let segments = segmentXargs $ map keyFilename keysources + let segments = segmentXargsUnordered $ map keyFilename keysources concat <$> forM segments (\fs -> Lsof.query $ "--" : fs) , do tmpdir <- fromRepo gitAnnexTmpMiscDir -- cgit v1.2.3