feat: Include name of target in error message

twpayne · Apr 22, 2024 · 4a9d0e4 · 4a9d0e4
1 parent 89fab4b
commit 4a9d0e4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
@@ -652,11 +652,14 @@ func (c *Config) applyArgs(
 		switch err := sourceState.Apply(targetSystem, c.destSystem, c.persistentState, targetDirAbsPath, targetRelPath, applyOptions); {
 		case errors.Is(err, fs.SkipDir):
 			continue
-		case err != nil && c.keepGoing:
-			c.errorf("%v\n", err)
-			keptGoingAfterErr = true
 		case err != nil:
-			return err
+			err = fmt.Errorf("%s: %w", targetRelPath, err)
+			if c.keepGoing {
+				c.errorf("%v\n", err)
+				keptGoingAfterErr = true
+			} else {
+				return err
+			}
 		}
 	}
 

diff --git a/internal/cmd/testdata/scripts/apply.txtar b/internal/cmd/testdata/scripts/apply.txtar
@@ -69,3 +69,4 @@ grep -count=2 '# edited' $HOME/.file
 
 # test that chezmoi apply --source-path fails when called with a targetDirAbsPath
 ! exec chezmoi apply --force --source-path $HOME${/}.file
+[!windows] stderr ${HOME@R}/\.file:\snot\sin\s${CHEZMOISOURCEDIR@R}$
diff --git a/internal/cmd/testdata/scripts/external.txtar b/internal/cmd/testdata/scripts/external.txtar
@@ -97,7 +97,7 @@ chhome home11/user
 
 # test that checksums detect corrupt files
 ! exec chezmoi apply --force
-stderr 'MD5 mismatch'
+stderr \.file:\sMD5\smismatch
 stderr 'SHA256 mismatch'
 
 chhome home12/user

diff --git a/internal/cmd/testdata/scripts/keepgoing.txtar b/internal/cmd/testdata/scripts/keepgoing.txtar
@@ -8,6 +8,7 @@ mkhomedir
 cmp $HOME/1ok golden/1ok
 ! exists $HOME/2error
 ! exists $HOME/3ok
+stderr '2error: template: 2error\.tmpl:2: unclosed action started at 2error\.tmpl:1'
 
 # test that chezmoi apply with --keep-going writes all files that it can without errors
 ! exec chezmoi apply --force --keep-going

diff --git a/internal/cmd/testdata/scripts/noencryption.txtar b/internal/cmd/testdata/scripts/noencryption.txtar
@@ -6,7 +6,7 @@ stderr 'no encryption'
 
 # test that chezmoi apply without encryption fails
 ! exec chezmoi apply --force
-stderr 'no encryption'
+stderr \.encrypted:\sno\sencryption$
 
 -- home/user/.encrypted --
 # contents of .encrypted

diff --git a/internal/cmd/testdata/scripts/scriptsdir_unix.txtar b/internal/cmd/testdata/scripts/scriptsdir_unix.txtar
@@ -8,13 +8,13 @@ chhome home2/user
 
 # test that chezmoi apply fails if .chezmoiscripts contains a non-script
 ! exec chezmoi apply
-stderr 'not a script'
+stderr ${CHEZMOISOURCEDIR@R}/\.chezmoiscripts/dot_file:\snot\sa\sscript$
 
 chhome home3/user
 
 # test that chezmoi apply fails if .chezmoiscripts contains duplicate targets
 ! exec chezmoi apply
-stderr 'inconsistent state'
+stderr \.chezmoiscripts/script\.sh:\sinconsistent\sstate
 
 chhome home4/user