feat: Remove deprecated --autotemplate flag

twpayne · Apr 21, 2023 · ed0c798 · ed0c798
1 parent ebc536f
commit ed0c798
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 394 deletions.
diff --git a/assets/chezmoi.io/docs/reference/commands/add.md b/assets/chezmoi.io/docs/reference/commands/add.md
@@ -4,22 +4,6 @@ Add *target*s to the source state. If any target is already in the source
 state, then its source state is replaced with its current state in the
 destination directory.
 
-## `--autotemplate` (deprecated)
-
-Automatically generate a template by replacing strings that match variable
-values from the `data` section of the config file with their respective config
-names as a template string. Longer substitutions occur before shorter ones.
-This implies the `--template` option.
-
-!!! warning
-
-    `--autotemplate` uses a greedy algorithm which occasionally generates
-    templates with unwanted variable substitutions. Carefully review any
-    templates it generates.
-
-    `--autotemplate` has been deprecated and will be removed in a future
-    release of chezmoi.
-
 ## `--encrypt`
 
 Encrypt files using the defined encryption method.

diff --git a/pkg/chezmoi/autotemplate.go b/pkg/chezmoi/autotemplate.go
diff --git a/pkg/chezmoi/autotemplate_test.go b/pkg/chezmoi/autotemplate_test.go
diff --git a/pkg/chezmoi/sourcestate.go b/pkg/chezmoi/sourcestate.go
@@ -292,7 +292,6 @@ type ReplaceFunc func(targetRelPath RelPath, newSourceStateEntry, oldSourceState
 
 // AddOptions are options to SourceState.Add.
 type AddOptions struct {
-	AutoTemplate      bool             // Automatically create templates, if possible.
 	Create            bool             // Add create_ entries instead of normal entries.
 	Encrypt           bool             // Encrypt files.
 	EncryptedSuffix   string           // Suffix for encrypted files.
@@ -1876,13 +1875,6 @@ func (s *SourceState) newSourceStateFileEntryFromFile(
 	if err != nil {
 		return nil, err
 	}
-	if options.AutoTemplate {
-		var replacements bool
-		contents, replacements = autoTemplate(contents, s.TemplateData())
-		if replacements {
-			fileAttr.Template = true
-		}
-	}
 	if len(contents) == 0 {
 		fileAttr.Empty = true
 	}
@@ -1920,8 +1912,6 @@ func (s *SourceState) newSourceStateFileEntryFromSymlink(
 	contents := []byte(linkname)
 	template := false
 	switch {
-	case options.AutoTemplate:
-		contents, template = autoTemplate(contents, s.TemplateData())
 	case options.Template:
 		template = true
 	case !options.Template && options.TemplateSymlinks:

diff --git a/pkg/chezmoi/sourcestate_test.go b/pkg/chezmoi/sourcestate_test.go
@@ -428,23 +428,6 @@ func TestSourceStateAdd(t *testing.T) {
 				),
 			},
 		},
-		{
-			name: "template",
-			destAbsPaths: []AbsPath{
-				NewAbsPath("/home/user/.template"),
-			},
-			addOptions: AddOptions{
-				AutoTemplate: true,
-				Filter:       NewEntryTypeFilter(EntryTypesAll, EntryTypesNone),
-			},
-			tests: []any{
-				vfst.TestPath("/home/user/.local/share/chezmoi/dot_template.tmpl",
-					vfst.TestModeIsRegular,
-					vfst.TestModePerm(0o666&^chezmoitest.Umask),
-					vfst.TestContentsString("key = {{ .variable }}\n"),
-				),
-			},
-		},
 		{
 			name: "dir_and_dir_file",
 			destAbsPaths: []AbsPath{