finished where indentation changes

Annex/Branch.hs

@@ -175,8 +175,7 @@ get' staleok file = fromjournal =<< getJournalFile file
 		| otherwise = do
 			update
 			frombranch
-		frombranch = withIndex $
+	frombranch = withIndex $ L.unpack <$> catFile fullname file
-			L.unpack <$> catFile fullname file
 
 {- Applies a function to modifiy the content of a file.
  -

Git/Construct.hs

@@ -101,10 +101,12 @@ localToUrl reference r
 	| repoIsUrl r = r
 	| otherwise = r { location = Url $ fromJust $ parseURI absurl }
   where
-		absurl =
+	absurl = concat
-			Url.scheme reference ++ "//" ++
+		[ Url.scheme reference
-			Url.authority reference ++
+		, "//"
-			repoPath r
+		, Url.authority reference
+		, repoPath r
+		]
 
 {- Calculates a list of a repo's configured remotes, by parsing its config. -}
 fromRemotes :: Repo -> IO [Repo]
@@ -127,8 +129,7 @@ remoteNamed n constructor = do
 remoteNamedFromKey :: String -> IO Repo -> IO Repo
 remoteNamedFromKey k = remoteNamed basename
   where
-		basename = join "." $ reverse $ drop 1 $
+	basename = join "." $ reverse $ drop 1 $ reverse $ drop 1 $ split "." k
-				reverse $ drop 1 $ split "." k
 
 {- Constructs a new Repo for one of a Repo's remotes using a given
  - location (ie, an url). -}
@@ -153,8 +154,7 @@ fromRemoteLocation s repo = gen $ calcloc s
 			endswith suffix k &&
 			startswith v l
 		filterconfig f = filter f $
-					concatMap splitconfigs $
+			concatMap splitconfigs $ M.toList $ fullconfig repo
-						M.toList $ fullconfig repo
 		splitconfigs (k, vs) = map (\v -> (k, v)) vs
 		(prefix, suffix) = ("url." , ".insteadof")
 	urlstyle v = isURI v || ":" `isInfixOf` v && "//" `isInfixOf` v

Git/Ref.hs

@@ -52,8 +52,8 @@ matching :: Ref -> Repo -> IO [(Ref, Branch)]
 matching ref repo = map gen . lines <$> 
 	pipeReadStrict [Param "show-ref", Param $ show ref] repo
   where
-		gen l = let (r, b) = separate (== ' ') l in
+	gen l = let (r, b) = separate (== ' ') l
-			(Ref r, Ref b)
+		in (Ref r, Ref b)
 
 {- List of (refs, branches) matching a given ref spec.
  - Duplicate refs are filtered out. -}

Utility/Directory.hs

@@ -73,12 +73,12 @@ moveFile src dest = tryIO (rename src dest) >>= onrename
 	  where
 		rethrow = throw e
 		mv tmp _ = do
-					ok <- boolSystem "mv" [Param "-f",
+			ok <- boolSystem "mv" [Param "-f", Param src, Param tmp]
-						Param src, Param tmp]
 			unless ok $ do
 				-- delete any partial
 				_ <- tryIO $ removeFile tmp
 				rethrow
+
 	isdir f = do
 		r <- tryIO $ getFileStatus f
 		case r of

Utility/Format.hs

@@ -118,9 +118,7 @@ decode_c s = unescape ("", s)
 	handle (x:n1:n2:n3:rest)
 		| isescape x && alloctal = (fromoctal, rest)
 	  where
-					alloctal = isOctDigit n1 &&
+		alloctal = isOctDigit n1 && isOctDigit n2 && isOctDigit n3
-						isOctDigit n2 &&
-						isOctDigit n3
 		fromoctal = [chr $ readoctal [n1, n2, n3]]
 		readoctal o = Prelude.read $ "0o" ++ o :: Int
 	-- \C is used for a few special characters

Utility/FreeDesktop.hs

@@ -117,8 +117,7 @@ userDesktopDir :: IO FilePath
 userDesktopDir = maybe fallback return =<< (parse <$> xdg_user_dir)
   where
 	parse = maybe Nothing (headMaybe . lines)
-		xdg_user_dir = catchMaybeIO $
+	xdg_user_dir = catchMaybeIO $ readProcess "xdg-user-dir" ["DESKTOP"]
-			readProcess "xdg-user-dir" ["DESKTOP"]
 	fallback = xdgEnvHome "DESKTOP_DIR" "Desktop"
 
 xdgEnvHome :: String -> String -> IO String

Utility/Kqueue.hs

@@ -249,11 +249,9 @@ runHooks kq hooks = do
 		withstatus change $ dispatchadd dirmap
 		
 	dispatchadd dirmap change s
-			| Files.isSymbolicLink s =
+		| Files.isSymbolicLink s = callhook addSymlinkHook (Just s) change
-				callhook addSymlinkHook (Just s) change
 		| Files.isDirectory s = recursiveadd dirmap change
-			| Files.isRegularFile s =
+		| Files.isRegularFile s = callhook addHook (Just s) change
-				callhook addHook (Just s) change
 		| otherwise = noop
 
 	recursiveadd dirmap change = do

Utility/Lsof.hs

@@ -62,8 +62,7 @@ parse s = bundle $ go [] $ lines s
 		| otherwise = parsefail
 	go _ _ = parsefail
 
-		parseprocess l =
+	parseprocess l = case splitnull l of
-			case splitnull l of
 		[pid, 'c':cmdline, ""] ->
 			case readish pid of
 				(Just n) -> ProcessInfo n cmdline
@@ -71,8 +70,7 @@ parse s = bundle $ go [] $ lines s
 		_ -> parsefail
 
 	parsefiles c [] = (c, [])
-		parsefiles c (l:ls) = 
+	parsefiles c (l:ls) = case splitnull l of
-			case splitnull l of
 		['a':mode, 'n':file, ""] ->
 			parsefiles ((file, parsemode mode):c) ls
 		(('p':_):_) -> (c, l:ls)

Utility/Network.hs

@@ -18,5 +18,4 @@ import Control.Applicative
 getHostname :: IO (Maybe String)
 getHostname = catchMaybeIO uname_node
   where
-		uname_node = takeWhile (/= '\n') <$>
+	uname_node = takeWhile (/= '\n') <$> readProcess "uname" ["-n"]
-			readProcess "uname" ["-n"]	

Utility/Touch.hsc

@@ -71,9 +71,9 @@ touchBoth file atime mtime follow =
 		r <- c_utimensat at_fdcwd f ptr flags
 		when (r /= 0) $ throwErrno "touchBoth"
   where
-		flags = if follow
+	flags
-			then 0
+       		| follow = 0
-			else at_symlink_nofollow 
+		| otherwise = at_symlink_nofollow 
 
 #else
 #if 0
@@ -109,9 +109,9 @@ touchBoth file atime mtime follow =
 		when (r /= 0) $
 			throwErrno "touchBoth"
   where
-		syscall = if follow
+	syscall
-			then c_lutimes
+       		| follow = c_lutimes
-			else c_utimes
+		| otherwise = c_utimes
 
 #else
 #warning "utimensat and lutimes not available; building without symlink timestamp preservation support"