more newline fixes

Adds a missing newline when a longnote is followed by a endresult.

Multiple longnotes in a row will now be separated by a blank line, which
could be a bug or a feature depending on taste.

Removed several places where newlines were explicitly displayed after
longnotes.

Command/Unused.hs

@@ -57,9 +57,7 @@ checkUnused = do
 	where
 		list file msg l c = do
 			let unusedlist = number c l
-			unless (null l) $ do
-				showLongNote $ msg unusedlist
-				showLongNote "\n"
+			unless (null l) $ showLongNote $ msg unusedlist
 			writeUnusedFile file unusedlist
 			return $ c + length l
 
@@ -76,9 +74,7 @@ checkRemoteUnused' r = do
 	let remoteunused = remotehas `exclude` referenced
 	let list = number 0 remoteunused
 	writeUnusedFile "" list
-	unless (null remoteunused) $ do
-		showLongNote $ remoteUnusedMsg r list
-		showLongNote "\n"
+	unless (null remoteunused) $ showLongNote $ remoteUnusedMsg r list
 	where
 		{- This should run strictly to avoid the filterM
 		 - building many thunks containing keyLocations data. -}

Command/Whereis.hs

@@ -40,7 +40,6 @@ perform key = do
 	pp' <- prettyPrintUUIDs "untrusted" untrustedlocations
 	unless (null untrustedlocations) $
 		showLongNote $ untrustedheader ++ pp'
-	unless (null locations) showOutput
 	if null safelocations then stop else next $ return True
 	where
 		copiesplural 1 = "copy"

Messages.hs

@@ -57,7 +57,7 @@ showOutput :: Annex ()
 showOutput = handle q $ putStr "\n"
 
 showLongNote :: String -> Annex ()
-showLongNote s = handle (JSON.note s) $ putStr $ '\n' : indent s
+showLongNote s = handle (JSON.note s) $ putStrLn $ '\n' : indent s
 
 showEndOk :: Annex ()
 showEndOk = showEndResult True

Upgrade/V2.hs

@@ -123,7 +123,6 @@ push = do
 			showLongNote $
 				"git-annex branch created\n" ++
 				"Be sure to push this branch when pushing to remotes.\n"
-			showOutput
 
 {- Old .gitattributes contents, not needed anymore. -}
 attrLines :: [String]