From: Bjørn Erik Pedersen Date: Sat, 21 Mar 2026 10:23:11 +0000 (+0100) Subject: Replace deprecated excludeFiles and includeFiles with files in tests X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=182b104571efdfc05a328a339cbcf16b94a90337;p=brevno-suite%2Fhugo Replace deprecated excludeFiles and includeFiles with files in tests --- diff --git a/common/hugo/hugo.go b/common/hugo/hugo.go index 679321602..fbb1e53a4 100644 --- a/common/hugo/hugo.go +++ b/common/hugo/hugo.go @@ -334,6 +334,9 @@ func deprecateLevel(item, alternative, version string, level logg.Level) { // DeprecateLevel informs about a deprecation logging at the given level. func deprecateLevelWithLogger(item, alternative, version string, level logg.Level, log logg.Logger) { + //if strings.Contains(item, "module.mounts.lang") || strings.Contains(item, "includeFiles") { + // hdebug.Panicf("Deprecated") + //} var msg string if level == logg.LevelError { // Useful to debug deprecation errors that needs to be removedor fixed. Comment out when done debugging. diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go index 6f02f2c7f..5bc0393fe 100644 --- a/hugolib/filesystems/basefs_test.go +++ b/hugolib/filesystems/basefs_test.go @@ -227,11 +227,11 @@ disableWatch = true [[module.mounts]] source = 'content4' target = 'content/excludedsome' -excludeFiles = 'p1.md' +files = '! p1.md' [[module.mounts]] source = 'content5' target = 'content/excludedall' -excludeFiles = '/**' +files = '! /**' [[module.mounts]] source = "hugo_stats.json" target = "assets/watching/hugo_stats.json" diff --git a/hugolib/hugo_modules_test.go b/hugolib/hugo_modules_test.go index f2f365e50..512afb707 100644 --- a/hugolib/hugo_modules_test.go +++ b/hugolib/hugo_modules_test.go @@ -51,13 +51,15 @@ path="a" [[module.imports.mounts]] source="myacontent" target="content/blog" -lang="en" +[module.imports.mounts.sites.matrix] +languages = "en" [[module.imports]] path="b" [[module.imports.mounts]] source="mybcontent" target="content/blog" -lang="nn" +[module.imports.mounts.sites.matrix] +languages = "nn" [[module.imports]] path="c" [[module.imports]] diff --git a/hugolib/mount_filters_test.go b/hugolib/mount_filters_test.go index 6bb4870a3..3443a43b7 100644 --- a/hugolib/mount_filters_test.go +++ b/hugolib/mount_filters_test.go @@ -27,22 +27,22 @@ baseURL = "http://example.com/" [[module.mounts]] source = 'content' target = 'content' -excludeFiles = "/a/c/**" +files = "! /a/c/**" [[module.mounts]] source = 'static' target = 'static' [[module.mounts]] source = 'layouts' target = 'layouts' -excludeFiles = "/**/foo.html" +files = "! /**/foo.html" [[module.mounts]] source = 'data' target = 'data' -includeFiles = "/mydata/**" +files = "/mydata/**" [[module.mounts]] source = 'assets' target = 'assets' -excludeFiles = ["/**exclude.*", "/moooo.*"] +files = ["! /**exclude.*", "! /moooo.*"] [[module.mounts]] source = 'i18n' target = 'i18n'