summaryrefslogtreecommitdiff
path: root/Annex
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 /Annex
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 'Annex')
-rw-r--r--Annex/Branch.hs6
-rw-r--r--Annex/CatFile.hs6
-rw-r--r--Annex/CheckIgnore.hs2
-rw-r--r--Annex/Content.hs4
-rw-r--r--Annex/Direct.hs2
-rw-r--r--Annex/Environment.hs4
-rw-r--r--Annex/FileMatcher.hs2
-rw-r--r--Annex/ReplaceFile.hs2
-rw-r--r--Annex/Ssh.hs4
-rw-r--r--Annex/Transfer.hs2
-rw-r--r--Annex/View.hs8
-rw-r--r--Annex/View/ViewedFile.hs2
12 files changed, 22 insertions, 22 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index a03d6ddf3..c567db554 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -454,7 +454,7 @@ handleTransitions jl localts refs = do
ignoreRefs untransitionedrefs
return True
where
- getreftransition ref = do
+ getreftransition ref = do
ts <- parseTransitionsStrictly "remote" . decodeBS
<$> catFile ref transitionsLog
return (ref, ts)
@@ -470,7 +470,7 @@ ignoreRefs rs = do
getIgnoredRefs :: Annex (S.Set Git.Ref)
getIgnoredRefs = S.fromList . mapMaybe Git.Sha.extractSha . lines <$> content
where
- content = do
+ content = do
f <- fromRepo gitAnnexIgnoredRefs
liftIO $ catchDefaultIO "" $ readFile f
@@ -498,7 +498,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
ref <- getBranch
commitIndex jl ref message (nub $ fullname:transitionedrefs)
where
- message
+ message
| neednewlocalbranch && null transitionedrefs = "new branch for transition " ++ tdesc
| otherwise = "continuing transition " ++ tdesc
tdesc = show $ map describeTransition $ transitionList ts
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index 8b4d746e1..8a6f10def 100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
@@ -100,10 +100,10 @@ catKey' modeguaranteed sha mode
catLink :: Bool -> Sha -> Annex String
catLink modeguaranteed sha = fromInternalGitPath . decodeBS <$> get
where
- -- If the mode is not guaranteed to be correct, avoid
+ -- If the mode is not guaranteed to be correct, avoid
-- buffering the whole file content, which might be large.
-- 8192 is enough if it really is a symlink.
- get
+ get
| modeguaranteed = catObject sha
| otherwise = L.take 8192 <$> catObject sha
@@ -120,7 +120,7 @@ catKeyChecked :: Bool -> Ref -> Annex (Maybe Key)
catKeyChecked needhead ref@(Ref r) =
catKey' False ref =<< findmode <$> catTree treeref
where
- pathparts = split "/" r
+ pathparts = split "/" r
dir = intercalate "/" $ take (length pathparts - 1) pathparts
file = fromMaybe "" $ lastMaybe pathparts
treeref = Ref $ if needhead then "HEAD" ++ dir ++ "/" else dir ++ "/"
diff --git a/Annex/CheckIgnore.hs b/Annex/CheckIgnore.hs
index d45e652bc..f2ed93543 100644
--- a/Annex/CheckIgnore.hs
+++ b/Annex/CheckIgnore.hs
@@ -18,7 +18,7 @@ import qualified Annex
checkIgnored :: FilePath -> Annex Bool
checkIgnored file = go =<< checkIgnoreHandle
where
- go Nothing = return False
+ go Nothing = return False
go (Just h) = liftIO $ Git.checkIgnored h file
checkIgnoreHandle :: Annex (Maybe Git.CheckIgnoreHandle)
diff --git a/Annex/Content.hs b/Annex/Content.hs
index c0c79ae56..37090d3bb 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -456,7 +456,7 @@ removeAnnex (ContentLock key) = withObjectLoc key remove removedirect
secureErase :: FilePath -> Annex ()
secureErase file = maybe noop go =<< annexSecureEraseCommand <$> Annex.getGitConfig
where
- go basecmd = void $ liftIO $
+ go basecmd = void $ liftIO $
boolSystem "sh" [Param "-c", Param $ gencmd basecmd]
gencmd = massReplace [ ("%file", shellEscape file) ]
@@ -555,7 +555,7 @@ saveState nocommit = doSideAction $ do
downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool
downloadUrl urls file = go =<< annexWebDownloadCommand <$> Annex.getGitConfig
where
- go Nothing = Url.withUrlOptions $ \uo ->
+ go Nothing = Url.withUrlOptions $ \uo ->
anyM (\u -> Url.download u file uo) urls
go (Just basecmd) = liftIO $ anyM (downloadcmd basecmd) urls
downloadcmd basecmd url =
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 76a6f27dc..9489b74f2 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -347,7 +347,7 @@ toDirectGen k f = do
(dloc:_) -> return $ Just $ fromdirect dloc
)
where
- fromindirect loc = do
+ fromindirect loc = do
{- Move content from annex to direct file. -}
updateInodeCache k loc
void $ addAssociatedFile k f
diff --git a/Annex/Environment.hs b/Annex/Environment.hs
index bc97c17b7..b1b5e96e9 100644
--- a/Annex/Environment.hs
+++ b/Annex/Environment.hs
@@ -45,7 +45,7 @@ checkEnvironmentIO =
ensureEnv "GIT_COMMITTER_NAME" username
where
#ifndef __ANDROID__
- -- existing environment is not overwritten
+ -- existing environment is not overwritten
ensureEnv var val = void $ setEnv var val False
#else
-- Environment setting is broken on Android, so this is dealt with
@@ -59,7 +59,7 @@ checkEnvironmentIO =
ensureCommit :: Annex a -> Annex a
ensureCommit a = either retry return =<< tryNonAsync a
where
- retry _ = do
+ retry _ = do
name <- liftIO myUserName
setConfig (ConfigKey "user.name") name
setConfig (ConfigKey "user.email") name
diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index da6a5e0e9..856c68122 100644
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -106,7 +106,7 @@ tokenizeMatcher = filter (not . null ) . concatMap splitparens . words
largeFilesMatcher :: Annex (FileMatcher Annex)
largeFilesMatcher = go =<< annexLargeFiles <$> Annex.getGitConfig
where
- go Nothing = return matchAll
+ go Nothing = return matchAll
go (Just expr) = do
gm <- groupMap
rc <- readRemoteLog
diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs
index 9700d4b60..0355ddd51 100644
--- a/Annex/ReplaceFile.hs
+++ b/Annex/ReplaceFile.hs
@@ -33,7 +33,7 @@ replaceFileOr file action rollback = do
tmpfile <- liftIO $ setup tmpdir
go tmpfile `catchNonAsync` (const $ rollback tmpfile)
where
- setup tmpdir = do
+ setup tmpdir = do
(tmpfile, h) <- openTempFileWithDefaultPermissions tmpdir "tmp"
hClose h
return tmpfile
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index ad636b4aa..3b7bd7d69 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -78,10 +78,10 @@ bestSocketPath abssocketfile = do
then Just socketfile
else Nothing
where
- -- ssh appends a 16 char extension to the socket when setting it
+ -- ssh appends a 16 char extension to the socket when setting it
-- up, which needs to be taken into account when checking
-- that a valid socket was constructed.
- sshgarbage = replicate (1+16) 'X'
+ sshgarbage = replicate (1+16) 'X'
sshConnectionCachingParams :: FilePath -> [CommandParam]
sshConnectionCachingParams socketfile =
diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index d33d3073b..fb89869f8 100644
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -69,7 +69,7 @@ runTransfer' ignorelock t file shouldretry a = do
return False
else do
ok <- retry info metervar $
- bracketIO (return fd) (cleanup tfile) (const $ a meter)
+ bracketIO (return fd) (cleanup tfile) (const $ a meter)
unless ok $ recordFailedTransfer t info
return ok
where
diff --git a/Annex/View.hs b/Annex/View.hs
index a1d873f50..4cbf274aa 100644
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -102,7 +102,7 @@ refineView origview = checksize . calc Unchanged origview
let (components', viewchanges) = runWriter $
mapM (\c -> updateViewComponent c field vf) (viewComponents view)
viewchange = if field `elem` map viewField (viewComponents origview)
- then maximum viewchanges
+ then maximum viewchanges
else Narrowing
in (view { viewComponents = components' }, viewchange)
| otherwise =
@@ -207,7 +207,7 @@ viewComponentMatcher :: ViewComponent -> (MetaData -> Maybe [MetaValue])
viewComponentMatcher viewcomponent = \metadata ->
matcher (currentMetaDataValues metafield metadata)
where
- metafield = viewField viewcomponent
+ metafield = viewField viewcomponent
matcher = case viewFilter viewcomponent of
FilterValues s -> \values -> setmatches $
S.intersection s values
@@ -236,8 +236,8 @@ toViewPath = concatMap escapeslash . fromMetaValue
fromViewPath :: FilePath -> MetaValue
fromViewPath = toMetaValue . deescapeslash []
where
- deescapeslash s [] = reverse s
- deescapeslash s (c:cs)
+ deescapeslash s [] = reverse s
+ deescapeslash s (c:cs)
| c == pseudoSlash = case cs of
(c':cs')
| c' == pseudoSlash -> deescapeslash (pseudoSlash:s) cs'
diff --git a/Annex/View/ViewedFile.hs b/Annex/View/ViewedFile.hs
index 25ac16a34..ef901f700 100644
--- a/Annex/View/ViewedFile.hs
+++ b/Annex/View/ViewedFile.hs
@@ -58,7 +58,7 @@ viewedFileReuse = takeFileName
dirFromViewedFile :: ViewedFile -> FilePath
dirFromViewedFile = joinPath . drop 1 . sep [] ""
where
- sep l _ [] = reverse l
+ sep l _ [] = reverse l
sep l curr (c:cs)
| c == '%' = sep (reverse curr:l) "" cs
| c == '\\' = case cs of