summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-09 14:53:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-09 15:09:11 -0400
commita26b7127d4cc8b2a5e15ef662ab2793dbf9e7919 (patch)
tree95fb3ff9231bffe68f99b02d872ee308b40d0bc8 /Remote
parentbe9989b76db21772118f8893ea00d22b6365d301 (diff)
fix some mixed space+tab indentation
This fixes all instances of " \t" in the code base. Most common case seems to be after a "where" line; probably vim copied the two space layout of that line. Done as a background task while listening to episode 2 of the Type Theory podcast.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/External.hs2
-rw-r--r--Remote/GCrypt.hs10
-rw-r--r--Remote/Git.hs2
-rw-r--r--Remote/Helper/Chunked.hs6
-rw-r--r--Remote/Helper/Special.hs4
-rw-r--r--Remote/Hook.hs2
-rw-r--r--Remote/Rsync.hs2
-rw-r--r--Remote/Tahoe.hs4
-rw-r--r--Remote/Web.hs2
9 files changed, 17 insertions, 17 deletions
diff --git a/Remote/External.hs b/Remote/External.hs
index c3ea7e1db..d40972412 100644
--- a/Remote/External.hs
+++ b/Remote/External.hs
@@ -169,7 +169,7 @@ handleRequest' lck external req mp responsehandler
go
| otherwise = go
where
- go = do
+ go = do
sendMessage lck external req
loop
loop = receiveMessage lck external responsehandler
diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs
index f1d561d23..fc7718a2a 100644
--- a/Remote/GCrypt.hs
+++ b/Remote/GCrypt.hs
@@ -147,7 +147,7 @@ rsyncTransport r
| ":" `isInfixOf` loc = sshtransport $ separate (== ':') loc
| otherwise = othertransport
where
- loc = Git.repoLocation r
+ loc = Git.repoLocation r
sshtransport (host, path) = do
let rsyncpath = if "/~/" `isPrefixOf` path
then drop 3 path
@@ -166,7 +166,7 @@ gCryptSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConf
gCryptSetup mu _ c = go $ M.lookup "gitrepo" c
where
remotename = fromJust (M.lookup "name" c)
- go Nothing = error "Specify gitrepo="
+ go Nothing = error "Specify gitrepo="
go (Just gitrepo) = do
(c', _encsetup) <- encryptionSetup c
inRepo $ Git.Command.run
@@ -234,7 +234,7 @@ setupRepo gcryptid r
- create the objectDir on the remote,
- which is needed for direct rsync of objects to work.
-}
- rsyncsetup = Remote.Rsync.withRsyncScratchDir $ \tmp -> do
+ rsyncsetup = Remote.Rsync.withRsyncScratchDir $ \tmp -> do
liftIO $ createDirectoryIfMissing True $ tmp </> objectDir
(rsynctransport, rsyncurl, _) <- rsyncTransport r
let tmpconfig = tmp </> "config"
@@ -266,7 +266,7 @@ isShell r = case method of
AccessShell -> True
_ -> False
where
- method = toAccessMethod $ fromMaybe "" $
+ method = toAccessMethod $ fromMaybe "" $
remoteAnnexGCrypt $ gitconfig r
shellOrRsync :: Remote -> Annex a -> Annex a -> Annex a
@@ -352,7 +352,7 @@ checkKey r rsyncopts k
| Git.repoIsSsh (repo r) = shellOrRsync r checkshell checkrsync
| otherwise = unsupportedUrl
where
- checkrsync = Remote.Rsync.checkKey (repo r) rsyncopts k
+ checkrsync = Remote.Rsync.checkKey (repo r) rsyncopts k
checkshell = Ssh.inAnnex (repo r) k
{- Annexed objects are hashed using lower-case directories for max
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 6397c1a2e..a249f43b2 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -305,7 +305,7 @@ inAnnex rmt key
| Git.repoIsUrl r = checkremote
| otherwise = checklocal
where
- r = repo rmt
+ r = repo rmt
checkhttp = do
showChecking r
ifM (Url.withUrlOptions $ \uo -> anyM (\u -> Url.checkBoth u (keySize key) uo) (keyUrls rmt key))
diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs
index 271978658..eb5dbc793 100644
--- a/Remote/Helper/Chunked.hs
+++ b/Remote/Helper/Chunked.hs
@@ -123,7 +123,7 @@ storeChunks u chunkconfig k f p storer checker =
loop bytesprocessed (chunk, bs) chunkkeys
| L.null chunk && numchunks > 0 = do
- -- Once all chunks are successfully
+ -- Once all chunks are successfully
-- stored, update the chunk log.
chunksStored u k (FixedSizeChunks chunksize) numchunks
return True
@@ -138,7 +138,7 @@ storeChunks u chunkconfig k f p storer checker =
)
where
numchunks = numChunks chunkkeys
- {- The MeterUpdate that is passed to the action
+ {- The MeterUpdate that is passed to the action
- storing a chunk is offset, so that it reflects
- the total bytes that have already been stored
- in previous chunks. -}
@@ -290,7 +290,7 @@ retrieveChunks retriever u chunkconfig encryptor basek dest basep sink
hSeek h AbsoluteSeek startpoint
return h
- {- Progress meter updating is a bit tricky: If the Retriever
+ {- Progress meter updating is a bit tricky: If the Retriever
- populates a file, it is responsible for updating progress
- as the file is being retrieved.
-
diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs
index ba9ff4fb4..5b9db9b08 100644
--- a/Remote/Helper/Special.hs
+++ b/Remote/Helper/Special.hs
@@ -196,7 +196,7 @@ specialRemote' cfg c preparestorer prepareretriever prepareremover preparecheckp
retrieveKeyFileGen k dest p enc =
safely $ prepareretriever k $ safely . go
where
- go (Just retriever) = displayprogress p k $ \p' ->
+ go (Just retriever) = displayprogress p k $ \p' ->
retrieveChunks retriever (uuid baser) chunkconfig
enck k dest p' (sink dest enc)
go Nothing = return False
@@ -210,7 +210,7 @@ specialRemote' cfg c preparestorer prepareretriever prepareremover preparecheckp
checkPresentGen k enc = preparecheckpresent k go
where
- go (Just checker) = checkPresentChunks checker (uuid baser) chunkconfig enck k
+ go (Just checker) = checkPresentChunks checker (uuid baser) chunkconfig enck k
go Nothing = cantCheck baser
enck = maybe id snd enc
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index 45a0ae742..707e2cb75 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -138,7 +138,7 @@ checkKey r h k = do
v <- lookupHook h action
liftIO $ check v
where
- action = "checkpresent"
+ action = "checkpresent"
findkey s = key2file k `elem` lines s
check Nothing = error $ action ++ " hook misconfigured"
check (Just hook) = do
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 643411149..7a965aa9d 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -175,7 +175,7 @@ store o k src meterupdate = withRsyncScratchDir $ \tmp -> do
]
else return False
where
- {- If the key being sent is encrypted or chunked, the file
+ {- If the key being sent is encrypted or chunked, the file
- containing its content is a temp file, and so can be
- renamed into place. Otherwise, the file is the annexed
- object file, and has to be copied or hard linked into place. -}
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs
index bde8ee9d7..5c1729448 100644
--- a/Remote/Tahoe.hs
+++ b/Remote/Tahoe.hs
@@ -167,7 +167,7 @@ writeSharedConvergenceSecret configdir scs =
getSharedConvergenceSecret :: TahoeConfigDir -> IO SharedConvergenceSecret
getSharedConvergenceSecret configdir = go (60 :: Int)
where
- f = convergenceFile configdir
+ f = convergenceFile configdir
go n
| n == 0 = error $ "tahoe did not write " ++ f ++ " after 1 minute. Perhaps the daemon failed to start?"
| otherwise = do
@@ -190,7 +190,7 @@ startTahoeDaemon configdir = void $ boolTahoe configdir "start" []
withTahoeConfigDir :: TahoeHandle -> (TahoeConfigDir -> IO a) -> IO a
withTahoeConfigDir (TahoeHandle configdir v) a = go =<< atomically needsstart
where
- go True = do
+ go True = do
startTahoeDaemon configdir
a configdir
go False = a configdir
diff --git a/Remote/Web.hs b/Remote/Web.hs
index 04b453277..ef7d2b39a 100644
--- a/Remote/Web.hs
+++ b/Remote/Web.hs
@@ -120,7 +120,7 @@ checkKey' key us = firsthit us (Right False) $ \u -> do
Url.withUrlOptions $ catchMsgIO .
Url.checkBoth u' (keySize key)
where
- firsthit [] miss _ = return miss
+ firsthit [] miss _ = return miss
firsthit (u:rest) _ a = do
r <- a u
case r of