chore: Tidy up entry type set logic

gchkhikvadze · Oct 15, 2022 · 504ca18 · 504ca18
1 parent 801a79b
commit 504ca18
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/assets/chezmoi.io/docs/reference/command-line-flags/common.md b/assets/chezmoi.io/docs/reference/command-line-flags/common.md
@@ -10,8 +10,8 @@ Set the output format.
 
 Only operate on target state entries of type *types*. *types* is a
 comma-separated list of target states (`all`, `dirs`, `files`, `remove`,
-`scripts`, `symlinks`, and `encrypted`) and can be excluded by preceding them
-with a `no`.
+`scripts`, `symlinks`) and/or source attributes (`encrypted`, `externals`) and
+can be excluded by preceding them with a `no`.
 
 !!! example
 

diff --git a/pkg/chezmoi/entrytypeset.go b/pkg/chezmoi/entrytypeset.go
@@ -114,11 +114,10 @@ func (s *EntryTypeSet) IncludeFileInfo(fileInfo fs.FileInfo) bool {
 
 // IncludeTargetStateEntry returns true if type of targetStateEntry is a member.
 func (s *EntryTypeSet) IncludeTargetStateEntry(targetStateEntry TargetStateEntry) bool {
-	if s.IncludeEncrypted() && targetStateEntry.SourceAttr().Encrypted {
+	switch sourceAttr := targetStateEntry.SourceAttr(); {
+	case s.IncludeEncrypted() && sourceAttr.Encrypted:
 		return true
-	}
-
-	if s.IncludeExternals() && targetStateEntry.SourceAttr().External {
+	case s.IncludeExternals() && sourceAttr.External:
 		return true
 	}
 

diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
@@ -311,9 +311,7 @@ func newConfig(options ...configOption) (*Config, error) {
 		},
 		managed: managedCmdConfig{
 			exclude: chezmoi.NewEntryTypeSet(chezmoi.EntryTypesNone),
-			include: chezmoi.NewEntryTypeSet(
-				chezmoi.EntryTypeDirs | chezmoi.EntryTypeFiles | chezmoi.EntryTypeSymlinks | chezmoi.EntryTypeEncrypted,
-			),
+			include: chezmoi.NewEntryTypeSet(chezmoi.EntryTypesAll &^ (chezmoi.EntryTypeRemove | chezmoi.EntryTypeScripts)),
 		},
 		mergeAll: mergeAllCmdConfig{
 			recursive: true,