filter out control characters in all other Messages
This does, as a side effect, make long notes in json output not be indented. The indentation is only needed to offset them underneath the display of the file they apply to, so that's ok. Sponsored-by: Brock Spratlen on Patreon
This commit is contained in:
parent
a0e6fa18eb
commit
8b6c7bdbcc
54 changed files with 183 additions and 164 deletions
|
@ -504,7 +504,7 @@ handleRequest' st external req mp responsehandler
|
|||
mapM_ (send . VALUE) =<< getUrlsWithPrefix key prefix
|
||||
send (VALUE "") -- end of list
|
||||
handleRemoteRequest (DEBUG msg) = fastDebug "Remote.External" msg
|
||||
handleRemoteRequest (INFO msg) = showInfo msg
|
||||
handleRemoteRequest (INFO msg) = showInfo (UnquotedString msg)
|
||||
handleRemoteRequest (VERSION _) = senderror "too late to send VERSION"
|
||||
|
||||
handleExceptionalMessage (ERROR err) = giveup $ "external special remote error: " ++ err
|
||||
|
|
|
@ -193,9 +193,9 @@ encryptionSetup c gc = do
|
|||
Left _ -> True
|
||||
encsetup a = use "encryption setup" . a =<< highRandomQuality
|
||||
use m a = do
|
||||
showNote m
|
||||
showNote (UnquotedString m)
|
||||
cipher <- liftIO a
|
||||
showNote (describeCipher cipher)
|
||||
showNote (UnquotedString (describeCipher cipher))
|
||||
return (storeCipher cipher c', EncryptionIsSetup)
|
||||
highRandomQuality = ifM (Annex.getRead Annex.fast)
|
||||
( return False
|
||||
|
|
|
@ -29,4 +29,4 @@ cantCheck :: Describable a => a -> e
|
|||
cantCheck v = giveup $ "unable to check " ++ describe v
|
||||
|
||||
showLocking :: Describable a => a -> Annex ()
|
||||
showLocking v = showAction $ "locking " ++ describe v
|
||||
showLocking v = showAction $ UnquotedString $ "locking " ++ describe v
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module Remote.Helper.Ssh where
|
||||
|
||||
import Annex.Common
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE CPP, OverloadedStrings #-}
|
||||
|
||||
module Remote.Rsync (
|
||||
remote,
|
||||
|
|
|
@ -774,7 +774,7 @@ genBucket c gc u = do
|
|||
case r of
|
||||
Right True -> noop
|
||||
_ -> do
|
||||
showAction $ "creating bucket in " ++ datacenter
|
||||
showAction $ UnquotedString $ "creating bucket in " ++ datacenter
|
||||
void $ liftIO $ runResourceT $ sendS3Handle h $
|
||||
(S3.putBucket (bucket info))
|
||||
{ S3.pbCannedAcl = acl info
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue