make segmentXargs preserve order

This commit is contained in:
Joey Hess 2015-04-02 00:30:36 -04:00
parent 705112903e
commit 7b32e7acb5
2 changed files with 10 additions and 7 deletions

View file

@ -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