feat: Support filenames containing # in ignore and remove files

twpayne · Jan 14, 2025 · 8b42ee8 · 8b42ee8
1 parent 785f012
commit 8b42ee8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
@@ -50,6 +50,7 @@ const (
 )
 
 var (
+	commentRx                       = regexp.MustCompile(`(?:\A|\s+)#.*$`)
 	lineEndingRx                    = regexp.MustCompile(`(?m)(?:\r\n|\r|\n)`)
 	modifyTemplateRx                = regexp.MustCompile(`(?m)^.*chezmoi:modify-template.*$(?:\r?\n)?`)
 	templateDirectiveRx             = regexp.MustCompile(`(?m)^.*?chezmoi:template:(.*)$(?:\r?\n)?`)
@@ -1426,7 +1427,7 @@ func (s *SourceState) addPatterns(patternSet *patternSet, sourceAbsPath AbsPath,
 	for scanner.Scan() {
 		lineNumber++
 		text := scanner.Text()
-		text, _, _ = strings.Cut(text, "#")
+		text = commentRx.ReplaceAllString(text, "")
 		text = strings.TrimSpace(text)
 		if text == "" {
 			continue

diff --git a/internal/chezmoi/sourcestate_test.go b/internal/chezmoi/sourcestate_test.go
@@ -1175,6 +1175,25 @@ func TestSourceStateRead(t *testing.T) {
 				),
 			),
 		},
+		{
+			name: "chezmoiignore_ignore_file_with_hash",
+			root: map[string]any{
+				"/home/user/.local/share/chezmoi": map[string]any{
+					".chezmoiignore": "README.md#\n",
+					"README.md#":     "",
+				},
+			},
+			expectedSourceState: NewSourceState(
+				withIgnore(
+					mustNewPatternSet(t, map[string]patternSetIncludeType{
+						"README.md#": patternSetInclude,
+					}),
+				),
+				withIgnoredRelPathStrs(
+					"README.md#",
+				),
+			),
+		},
 		{
 			name: "chezmoiignore_exact_dir",
 			root: map[string]any{