mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

!! removal

Browse source
This commit is contained in:
Joey Hess 2012-10-21 00:34:48 -04:00
parent 733dd74799
commit 452e6819d0
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/Committer.hs
View file

@ -173,12 +173,12 @@ handleAdds delayadd st changechan transferqueue dstatus cs = returnWhen (null in
(incomplete, otherchanges) = partition (\c -> isPendingAddChange c || isInProcessAddChange c) cs (incomplete, otherchanges) = partition (\c -> isPendingAddChange c || isInProcessAddChange c) cs
findnew [] = return [] findnew [] = return []
findnew pending = do findnew pending@(exemplar:_) = do
(!newfiles, cleanup) <- runThreadState st $ (!newfiles, cleanup) <- runThreadState st $
inRepo (Git.LsFiles.notInRepo False $ map changeFile pending) inRepo (Git.LsFiles.notInRepo False $ map changeFile pending)
void cleanup void cleanup
-- note: timestamp info is lost here -- note: timestamp info is lost here
let ts = changeTime (pending !! 0) let ts = changeTime exemplar
return $ map (PendingAddChange ts) newfiles return $ map (PendingAddChange ts) newfiles
returnWhen c a returnWhen c a

8
Logs/Transfer.hs
View file

@ -296,11 +296,11 @@ readTransferInfo mpid s = TransferInfo
bits = split " " firstline bits = split " " firstline
numbits = length bits numbits = length bits
time = if numbits > 0 time = if numbits > 0
then Just <$> parsePOSIXTime (bits !! 0) then Just <$> parsePOSIXTime =<< headMaybe bits
else pure Nothing else pure Nothing -- not failure
bytes = if numbits > 1 bytes = if numbits > 1
then Just <$> readish (bits !! 1) then Just <$> readish =<< headMaybe (drop 1 bits)
else pure Nothing else pure Nothing -- not failure
parsePOSIXTime :: String -> Maybe POSIXTime parsePOSIXTime :: String -> Maybe POSIXTime
parsePOSIXTime s = utcTimeToPOSIXSeconds parsePOSIXTime s = utcTimeToPOSIXSeconds

8
Remote/Hook.hs
View file

@ -69,10 +69,10 @@ hookEnv k f = Just <$> mergeenv (fileenv f ++ keyenv)
M.union (M.fromList l) M.union (M.fromList l)
<$> M.fromList <$> getEnvironment <$> M.fromList <$> getEnvironment
env s v = ("ANNEX_" ++ s, v) env s v = ("ANNEX_" ++ s, v)
keyenv = keyenv = catMaybes
[ env "KEY" (key2file k) [ Just $ env "KEY" (key2file k)
, env "HASH_1" (hashbits !! 0) , env "HASH_1" <$> headMaybe hashbits
, env "HASH_2" (hashbits !! 1) , env "HASH_2" <$> headMaybe (drop 1 hashbits)
] ]
fileenv Nothing = [] fileenv Nothing = []
fileenv (Just file) = [env "FILE" file] fileenv (Just file) = [env "FILE" file]