fix: Apply changes to directories recursively when editing directories

pkg/cmd/editcmd.go

@@ -174,7 +174,7 @@ TARGETRELPATH:
 			if err := c.applyArgs(cmd.Context(), c.destSystem, c.DestDirAbsPath, args, applyArgsOptions{
 				include:      c.Edit.include,
 				init:         c.Edit.init,
-				recursive:    false,
+				recursive:    true,
 				umask:        c.Umask,
 				preApplyFunc: c.defaultPreApplyFunc,
 			}); err != nil {
@@ -193,6 +193,7 @@ TARGETRELPATH:
 		defer watcher.Close()
 
 		for _, editorArg := range editorArgs {
+			// FIXME watch directories recursively
 			if err := watcher.Add(editorArg); err != nil {
 				return err
 			}

pkg/cmd/main_test.go

@@ -666,6 +666,7 @@ func setup(env *testscript.Env) error {
 					`:loop`,
 					`IF EXIST %~s1\NUL (`,
 					`	copy /y NUL "%~1\.edited" >NUL`,
+					// FIXME recursively edit all files if in a directory
 					`) ELSE (`,
 					`	echo # edited >> "%~1"`,
 					`)`,
@@ -677,8 +678,7 @@ func setup(env *testscript.Env) error {
 	default:
 		root["/bin"] = map[string]any{
 			// editor is a non-interactive script that appends "# edited\n" to
-			// the end of each file and creates an empty .edited file in each
-			// directory.
+			// the end of each file.
 			"editor": &vfst.File{
 				Perm: 0o755,
 				Contents: []byte(chezmoitest.JoinLines(
@@ -687,6 +687,9 @@ func setup(env *testscript.Env) error {
 					`for name in $*; do`,
 					`    if [ -d $name ]; then`,
 					`        touch $name/.edited`,
+					`        for filename in $(find $name -type f); do`,
+					`            echo "# edited" >> $filename`,
+					`        done`,
 					`    else`,
 					`        echo "# edited" >> $name`,
 					`    fi`,

pkg/cmd/testdata/scripts/issue2300.txtar

@@ -0,0 +1,13 @@
+[windows] skip 'UNIX only' # FIXME
+
+# test that chezmoi edit --apply applies changes to a directory
+exec chezmoi edit --apply $HOME/.dir
+grep '# edited' $HOME/.dir/file
+
+-- home/user/.dir/file --
+# contents of .dir/file
+-- home/user/.config/chezmoi/chezmoi.toml --
+[edit]
+    minDuration = 0
+-- home/user/.local/share/chezmoi/dot_dir/file --
+# contents of .dir/file