mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve messages

Browse source
This commit is contained in:
Joey Hess 2015-04-30 14:10:28 -04:00
parent ac6b492711
commit 607eed0de2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Import.hs
View file

@ -84,7 +84,7 @@ start mode (srcfile, destfile) =
liftIO $ removeFile srcfile liftIO $ removeFile srcfile
next $ return True next $ return True
, do , do
warning "could not verify that the content is still present in the annex; not removing from the import location" warning "Could not verify that the content is still present in the annex; not removing from the import location."
stop stop
) )
importfile = do importfile = do

4
Remote.hs
View file

@ -282,7 +282,9 @@ showLocations separateuntrusted key exclude nolocmsg = do
let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted) let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted)
ppuuidswanted <- prettyPrintUUIDs "wanted" uuidswanted ppuuidswanted <- prettyPrintUUIDs "wanted" uuidswanted
ppuuidsskipped <- prettyPrintUUIDs "skipped" uuidsskipped ppuuidsskipped <- prettyPrintUUIDs "skipped" uuidsskipped
showLongNote $ message ppuuidswanted ppuuidsskipped let msg = message ppuuidswanted ppuuidsskipped
unless (null msg) $
showLongNote msg
ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList
unless (null ignored) $ unless (null ignored) $
showLongNote $ "(Note that these git remotes have annex-ignore set: " ++ unwords (map name ignored) ++ ")" showLongNote $ "(Note that these git remotes have annex-ignore set: " ++ unwords (map name ignored) ++ ")"