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

empty preferred content

Browse source 
* Document that settting preferred content to "" is the same as the
  default unset behavior.
* sync: Avoid misleading warning about future preferred content
  transition when preferred content is set to "".
This commit is contained in:
Joey Hess 2024-12-13 13:26:48 -04:00
parent 57d276cabf
commit 7d8558548b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Sync.hs
View file

@ -85,6 +85,7 @@ import Utility.Bloom
import Utility.OptParse
import Utility.Process.Transcript
import Utility.Tuple
import Utility.Matcher
import Control.Concurrent.MVar
import qualified Data.Map as M
@ -1130,7 +1131,7 @@ warnSyncContentTransition o remotes
_ -> do
m <- preferredContentMap
hereu <- getUUID
when (any (`M.member` m) (hereu:map Remote.uuid remotes)) $
when (any (preferredcontentconfigured m) (hereu:map Remote.uuid remotes)) $
showwarning
where
showwarning = earlyWarning $
@ -1140,6 +1141,8 @@ warnSyncContentTransition o remotes
<> " send any content, use --no-content (or -g)"
<> " to prepare for that change."
<> " (Or you can configure annex.synccontent)"
preferredcontentconfigured m u =
maybe False (not . isEmpty . fst) (M.lookup u m)
notOnlyAnnex :: SyncOptions -> Annex Bool
notOnlyAnnex o = not <$> onlyAnnex o