Don't add files if template would be overwritten

Author: twpayne

cmd/add.go

@@ -24,6 +24,7 @@ var addCmd = &cobra.Command{
 }
 
 type addCmdConfig struct {
+	force     bool
 	recursive bool
 	prompt    bool
 	options   chezmoi.AddOptions
@@ -35,6 +36,7 @@ func init() {
 	persistentFlags := addCmd.PersistentFlags()
 	persistentFlags.BoolVarP(&config.add.options.Empty, "empty", "e", false, "add empty files")
 	persistentFlags.BoolVar(&config.add.options.Encrypt, "encrypt", false, "encrypt files")
+	persistentFlags.BoolVarP(&config.add.force, "force", "f", false, "overwrite source state, even if template would be lost")
 	persistentFlags.BoolVarP(&config.add.options.Exact, "exact", "x", false, "add directories exactly")
 	persistentFlags.BoolVarP(&config.add.prompt, "prompt", "p", false, "prompt before adding")
 	persistentFlags.BoolVarP(&config.add.recursive, "recursive", "r", false, "recurse in to subdirectories")
@@ -75,6 +77,16 @@ func (c *Config) runAddCmd(cmd *cobra.Command, args []string) (err error) {
 					fmt.Fprintf(c.Stderr(), "warning: skipping file ignored by .chezmoiignore: %s\n", path)
 					return nil
 				}
+				if !c.add.force {
+					entry, err := ts.Get(c.fs, path)
+					if err != nil && !os.IsNotExist(err) {
+						return err
+					}
+					if file, ok := entry.(*chezmoi.File); ok && file.Template {
+						fmt.Fprintf(c.Stderr(), "warning: skipping file generated by template, use --force to force: %s\n", path)
+						return nil
+					}
+				}
 				if c.add.prompt {
 					choice, err := c.prompt(fmt.Sprintf("Add %s", path), "ynqa")
 					if err != nil {
@@ -99,6 +111,16 @@ func (c *Config) runAddCmd(cmd *cobra.Command, args []string) (err error) {
 				fmt.Fprintf(c.Stderr(), "warning: skipping file ignored by .chezmoiignore: %s\n", path)
 				continue
 			}
+			if !c.add.force {
+				entry, err := ts.Get(c.fs, path)
+				if err != nil && !os.IsNotExist(err) {
+					return err
+				}
+				if file, ok := entry.(*chezmoi.File); ok && file.Template {
+					fmt.Fprintf(c.Stderr(), "warning: skipping file generated by template, use --force to force: %s\n", path)
+					continue
+				}
+			}
 			if c.add.prompt {
 				choice, err := c.prompt(fmt.Sprintf("Add %s", path), "ynqa")
 				if err != nil {

cmd/helps.gen.go

@@ -277,6 +277,8 @@ _chezmoi_add()
     flags+=("--encrypt")
     flags+=("--exact")
     flags+=("-x")
+    flags+=("--force")
+    flags+=("-f")
     flags+=("--prompt")
     flags+=("-p")
     flags+=("--recursive")

completions/chezmoi-completion.bash

@@ -74,6 +74,7 @@ complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s a -l aut
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s e -l empty -d 'add empty files'
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'   -l encrypt -d 'encrypt files'
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s x -l exact -d 'add directories exactly'
+complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s f -l force -d 'overwrite source state, even if template would be lost'
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s p -l prompt -d 'prompt before adding'
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s r -l recursive -d 'recurse in to subdirectories'
 complete -c chezmoi -f -n '__fish_chezmoi_seen_subcommand_path add'  -s T -l template -d 'add files as templates'

completions/chezmoi.fish

@@ -143,6 +143,7 @@ function _chezmoi_add {
     '(-e --empty)'{-e,--empty}'[add empty files]' \
     '--encrypt[encrypt files]' \
     '(-x --exact)'{-x,--exact}'[add directories exactly]' \
+    '(-f --force)'{-f,--force}'[overwrite source state, even if template would be lost]' \
     '(-p --prompt)'{-p,--prompt}'[prompt before adding]' \
     '(-r --recursive)'{-r,--recursive}'[recurse in to subdirectories]' \
     '(-T --template)'{-T,--template}'[add files as templates]' \

completions/chezmoi.zsh

@@ -322,6 +322,10 @@ directory. The `add` command accepts additional flags:
 
 Set the `empty` attribute on added files.
 
+#### `-f`, `--force`
+
+Add *targets*, even if doing so would cause a source template to be overwritten.
+
 #### `-x`, `--exact`
 
 Set the `exact` attribute on added directories.