chore: Move core packages back to internal

twpayne · Jul 30, 2023 · ad2ab65 · ad2ab65
1 parent e649df2
commit ad2ab65
Show file tree

Hide file tree

Showing 457 changed files with 165 additions and 164 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,7 +40,7 @@ jobs:
           - 'assets/scripts/**'
           - 'assets/vagrant/**'
           - 'go.*'
-          - 'pkg/**'
+          - 'internal/**'
   codeql:
     needs: changes
     if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
@@ -252,13 +252,13 @@ jobs:
       env:
         CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
       run: |
-        go test -ldflags="-X github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o022" -race ./...
+        go test -ldflags="-X github.com/twpayne/chezmoi/v2/internal/chezmoitest.umaskStr=0o022" -race ./...
     - name: test-umask-002
       if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
       env:
         CHEZMOI_GITHUB_TOKEN: ${{ secrets.CHEZMOI_GITHUB_TOKEN }}
       run: |
-        go test -ldflags="-X github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o002" -race ./...
+        go test -ldflags="-X github.com/twpayne/chezmoi/v2/internal/chezmoitest.umaskStr=0o002" -race ./...
     - name: test-install.sh
       if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
       run: |

diff --git a/.golangci.yml b/.golangci.yml
@@ -135,14 +135,14 @@ linters-settings:
     - github\.com/go-git/go-git/v5/plumbing/format/diff\.File
     - github\.com/go-git/go-git/v5/plumbing/format/diff\.Patch
     - github\.com/mitchellh/mapstructure\.DecodeHookFunc
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.ActualStateEntry
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.Encryption
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.Format
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.PersistentState
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.SourceStateOrigin
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.SourceStateEntry
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.System
-    - github\.com/twpayne/chezmoi/v2/pkg/chezmoi\.TargetStateEntry
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.ActualStateEntry
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.Encryption
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.Format
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.PersistentState
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.SourceStateOrigin
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.SourceStateEntry
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.System
+    - github\.com/twpayne/chezmoi/v2/internal/chezmoi\.TargetStateEntry
     - github\.com/twpayne/go-vfs/v4\.FS
     - stdlib
   misspell:

diff --git a/Makefile b/Makefile
@@ -86,8 +86,8 @@ rm-dist:
 
 .PHONY: test
 test:
-	${GO} test -ldflags="-X github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o022" ./...
-	${GO} test -ldflags="-X github.com/twpayne/chezmoi/v2/pkg/chezmoitest.umaskStr=0o002" ./...
+	${GO} test -ldflags="-X github.com/twpayne/chezmoi/v2/internal/chezmoitest.umaskStr=0o022" ./...
+	${GO} test -ldflags="-X github.com/twpayne/chezmoi/v2/internal/chezmoitest.umaskStr=0o002" ./...
 
 .PHONY: test-docker
 test-docker:

diff --git a/assets/chezmoi.io/docs/developer/architecture.md b/assets/chezmoi.io/docs/developer/architecture.md
@@ -7,7 +7,7 @@ You can generate Go documentation for chezmoi's source code with `go doc`, for
 example:
 
 ```console
-$ go doc -all -u github.com/twpayne/chezmoi/v2/pkg/chezmoi
+$ go doc -all -u github.com/twpayne/chezmoi/v2/internal/chezmoi
 ```
 
 You can also [browse chezmoi's generated documentation
@@ -17,12 +17,12 @@ online](https://pkg.go.dev/github.com/twpayne/chezmoi/v2).
 
 The important directories in chezmoi are:
 
-| Directory                   | Contents                                                                                                                                                       |
-| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `assets/chezmoi.io/docs/`   | The documentation single source of truth. Help text, examples, and the [chezmoi.io](https://chezmoi.io) website are generated from the files in this directory |
-| `pkg/chezmoi/`              | chezmoi's core functionality                                                                                                                                   |
-| `pkg/cmd/`                  | Code for the `chezmoi` command                                                                                                                                 |
-| `pkg/cmd/testdata/scripts/` | High-level tests of chezmoi's commands using [`testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript)
+| Directory                        | Contents                                                                                                                                                       |
+| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `assets/chezmoi.io/docs/`        | The documentation single source of truth. Help text, examples, and the [chezmoi.io](https://chezmoi.io) website are generated from the files in this directory |
+| `internal/chezmoi/`              | chezmoi's core functionality                                                                                                                                   |
+| `internal/cmd/`                  | Code for the `chezmoi` command                                                                                                                                 |
+| `internal/cmd/testdata/scripts/` | High-level tests of chezmoi's commands using [`testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript)
 
 ## Key concepts
 
@@ -36,7 +36,7 @@ represented directly in chezmoi's code.
 chezmoi uses the generic term *entry* to describe something that it manages.
 Entries can be files, directories, symlinks, scripts, amongst other things.
 
-## `pkg/chezmoi/` directory
+## `internal/chezmoi/` directory
 
 All of chezmoi's interaction with the operating system is abstracted through
 the `System` interface. A `System` includes functionality to read and write
@@ -99,10 +99,10 @@ its persistent state. chezmoi can then detect if a third party has updated a
 target since chezmoi last wrote it by comparing the actual state entry in the
 target state with the entry state in the persistent state.
 
-## `pkg/cmd/` directory
+## `internal/cmd/` directory
 
-`pkg/cmd/*cmd.go` contains the code for each individual command and
-`pkg/cmd/*templatefuncs.go` contain the template functions.
+`internal/cmd/*cmd.go` contains the code for each individual command and
+`internal/cmd/*templatefuncs.go` contain the template functions.
 
 Commands are defined as methods on the `Config` struct. The `Config` struct is
 large, containing all configuration values read from the config file, command
@@ -163,12 +163,13 @@ integration tests use the
 [`github.com/alecthomas/assert/v2`](https://pkg.go.dev/github.com/alecthomas/assert)
 framework. End-to-end tests use
 [`github.com/rogpeppe/go-internal/testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript)
-with the test scripts themselves in `pkg/cmd/testdata/scripts/$TEST_NAME.txtar`.
+with the test scripts themselves in
+`internal/cmd/testdata/scripts/$TEST_NAME.txtar`.
 
 You can run individual end-to-end tests with
 
 ```console
-$ go test ./pkg/cmd -run=TestScript/$TEST_NAME
+$ go test ./internal/cmd -run=TestScript/$TEST_NAME
 ```
 
 Tests should, if at all possible, run unmodified on all operating systems

diff --git a/pkg/archivetest/archivetest.go → internal/archivetest/archivetest.go b/pkg/archivetest/archivetest.go → internal/archivetest/archivetest.go
diff --git a/pkg/archivetest/tar.go → internal/archivetest/tar.go b/pkg/archivetest/tar.go → internal/archivetest/tar.go
diff --git a/pkg/archivetest/tar_test.go → internal/archivetest/tar_test.go b/pkg/archivetest/tar_test.go → internal/archivetest/tar_test.go
diff --git a/pkg/archivetest/zip.go → internal/archivetest/zip.go b/pkg/archivetest/zip.go → internal/archivetest/zip.go
diff --git a/pkg/archivetest/zip_test.go → internal/archivetest/zip_test.go b/pkg/archivetest/zip_test.go → internal/archivetest/zip_test.go
diff --git a/pkg/chezmoi/abspath.go → internal/chezmoi/abspath.go b/pkg/chezmoi/abspath.go → internal/chezmoi/abspath.go
diff --git a/pkg/chezmoi/abspath_test.go → internal/chezmoi/abspath_test.go b/pkg/chezmoi/abspath_test.go → internal/chezmoi/abspath_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestNewAbsPathFromExtPath(t *testing.T) {

diff --git a/pkg/chezmoi/actualstateentry.go → internal/chezmoi/actualstateentry.go b/pkg/chezmoi/actualstateentry.go → internal/chezmoi/actualstateentry.go
diff --git a/pkg/chezmoi/ageencryption.go → internal/chezmoi/ageencryption.go b/pkg/chezmoi/ageencryption.go → internal/chezmoi/ageencryption.go
@@ -13,7 +13,7 @@ import (
 	"filippo.io/age/armor"
 	"go.uber.org/multierr"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // An AgeEncryption uses age for encryption and decryption. See

diff --git a/pkg/chezmoi/ageencryption_test.go → internal/chezmoi/ageencryption_test.go b/pkg/chezmoi/ageencryption_test.go → internal/chezmoi/ageencryption_test.go
@@ -8,7 +8,7 @@ import (
 	"filippo.io/age"
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestAgeEncryption(t *testing.T) {

diff --git a/pkg/chezmoi/archive.go → internal/chezmoi/archive.go b/pkg/chezmoi/archive.go → internal/chezmoi/archive.go
diff --git a/pkg/chezmoi/archive_test.go → internal/chezmoi/archive_test.go b/pkg/chezmoi/archive_test.go → internal/chezmoi/archive_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/archivetest"
+	"github.com/twpayne/chezmoi/v2/internal/archivetest"
 )
 
 func TestWalkArchive(t *testing.T) {

diff --git a/pkg/chezmoi/archivereadersystem.go → internal/chezmoi/archivereadersystem.go b/pkg/chezmoi/archivereadersystem.go → internal/chezmoi/archivereadersystem.go
diff --git a/pkg/chezmoi/archivereadersystem_test.go → internal/chezmoi/archivereadersystem_test.go b/pkg/chezmoi/archivereadersystem_test.go → internal/chezmoi/archivereadersystem_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/archivetest"
+	"github.com/twpayne/chezmoi/v2/internal/archivetest"
 )
 
 func TestArchiveReaderSystemTar(t *testing.T) {

diff --git a/pkg/chezmoi/attr.go → internal/chezmoi/attr.go b/pkg/chezmoi/attr.go → internal/chezmoi/attr.go
diff --git a/pkg/chezmoi/attr_test.go → internal/chezmoi/attr_test.go b/pkg/chezmoi/attr_test.go → internal/chezmoi/attr_test.go
diff --git a/pkg/chezmoi/boltpersistentstate.go → internal/chezmoi/boltpersistentstate.go b/pkg/chezmoi/boltpersistentstate.go → internal/chezmoi/boltpersistentstate.go
diff --git a/pkg/chezmoi/boltpersistentstate_test.go → internal/chezmoi/boltpersistentstate_test.go b/pkg/chezmoi/boltpersistentstate_test.go → internal/chezmoi/boltpersistentstate_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 var _ PersistentState = &BoltPersistentState{}

diff --git a/pkg/chezmoi/chezmoi.go → internal/chezmoi/chezmoi.go b/pkg/chezmoi/chezmoi.go → internal/chezmoi/chezmoi.go
diff --git a/pkg/chezmoi/chezmoi_go1.19.go → internal/chezmoi/chezmoi_go1.19.go b/pkg/chezmoi/chezmoi_go1.19.go → internal/chezmoi/chezmoi_go1.19.go
diff --git a/pkg/chezmoi/chezmoi_go1.20.go → internal/chezmoi/chezmoi_go1.20.go b/pkg/chezmoi/chezmoi_go1.20.go → internal/chezmoi/chezmoi_go1.20.go
diff --git a/pkg/chezmoi/chezmoi_test.go → internal/chezmoi/chezmoi_test.go b/pkg/chezmoi/chezmoi_test.go → internal/chezmoi/chezmoi_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/rs/zerolog/pkgerrors"
 	"github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func init() {

diff --git a/pkg/chezmoi/chezmoi_unix.go → internal/chezmoi/chezmoi_unix.go b/pkg/chezmoi/chezmoi_unix.go → internal/chezmoi/chezmoi_unix.go
diff --git a/pkg/chezmoi/chezmoi_unix_test.go → internal/chezmoi/chezmoi_unix_test.go b/pkg/chezmoi/chezmoi_unix_test.go → internal/chezmoi/chezmoi_unix_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestUmask(t *testing.T) {

diff --git a/pkg/chezmoi/chezmoi_windows.go → internal/chezmoi/chezmoi_windows.go b/pkg/chezmoi/chezmoi_windows.go → internal/chezmoi/chezmoi_windows.go
diff --git a/pkg/chezmoi/data.go → internal/chezmoi/data.go b/pkg/chezmoi/data.go → internal/chezmoi/data.go
diff --git a/pkg/chezmoi/data_test.go → internal/chezmoi/data_test.go b/pkg/chezmoi/data_test.go → internal/chezmoi/data_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestKernel(t *testing.T) {

diff --git a/pkg/chezmoi/debugencryption.go → internal/chezmoi/debugencryption.go b/pkg/chezmoi/debugencryption.go → internal/chezmoi/debugencryption.go
@@ -3,7 +3,7 @@ package chezmoi
 import (
 	"github.com/rs/zerolog"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // A DebugEncryption logs all calls to an Encryption.

diff --git a/pkg/chezmoi/debugpersistentstate.go → internal/chezmoi/debugpersistentstate.go b/pkg/chezmoi/debugpersistentstate.go → internal/chezmoi/debugpersistentstate.go
diff --git a/pkg/chezmoi/debugsystem.go → internal/chezmoi/debugsystem.go b/pkg/chezmoi/debugsystem.go → internal/chezmoi/debugsystem.go
@@ -8,7 +8,7 @@ import (
 	"github.com/rs/zerolog"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // A DebugSystem logs all calls to a System.

diff --git a/pkg/chezmoi/debugsystem_test.go → internal/chezmoi/debugsystem_test.go b/pkg/chezmoi/debugsystem_test.go → internal/chezmoi/debugsystem_test.go
diff --git a/pkg/chezmoi/diff.go → internal/chezmoi/diff.go b/pkg/chezmoi/diff.go → internal/chezmoi/diff.go
diff --git a/pkg/chezmoi/dryrunsystem.go → internal/chezmoi/dryrunsystem.go b/pkg/chezmoi/dryrunsystem.go → internal/chezmoi/dryrunsystem.go
diff --git a/pkg/chezmoi/dryrunsystem_test.go → internal/chezmoi/dryrunsystem_test.go b/pkg/chezmoi/dryrunsystem_test.go → internal/chezmoi/dryrunsystem_test.go
diff --git a/pkg/chezmoi/dumpsystem.go → internal/chezmoi/dumpsystem.go b/pkg/chezmoi/dumpsystem.go → internal/chezmoi/dumpsystem.go
diff --git a/pkg/chezmoi/dumpsystem_test.go → internal/chezmoi/dumpsystem_test.go b/pkg/chezmoi/dumpsystem_test.go → internal/chezmoi/dumpsystem_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coreos/go-semver/semver"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 var _ System = &DumpSystem{}

diff --git a/pkg/chezmoi/duration.go → internal/chezmoi/duration.go b/pkg/chezmoi/duration.go → internal/chezmoi/duration.go
diff --git a/pkg/chezmoi/encryption.go → internal/chezmoi/encryption.go b/pkg/chezmoi/encryption.go → internal/chezmoi/encryption.go
diff --git a/pkg/chezmoi/encryption_test.go → internal/chezmoi/encryption_test.go b/pkg/chezmoi/encryption_test.go → internal/chezmoi/encryption_test.go
diff --git a/pkg/chezmoi/entrystate.go → internal/chezmoi/entrystate.go b/pkg/chezmoi/entrystate.go → internal/chezmoi/entrystate.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // An EntryStateType is an entry state type.

diff --git a/pkg/chezmoi/entrystate_test.go → internal/chezmoi/entrystate_test.go b/pkg/chezmoi/entrystate_test.go → internal/chezmoi/entrystate_test.go
diff --git a/pkg/chezmoi/entrytypefilter.go → internal/chezmoi/entrytypefilter.go b/pkg/chezmoi/entrytypefilter.go → internal/chezmoi/entrytypefilter.go
diff --git a/pkg/chezmoi/entrytypeset.go → internal/chezmoi/entrytypeset.go b/pkg/chezmoi/entrytypeset.go → internal/chezmoi/entrytypeset.go
diff --git a/pkg/chezmoi/entrytypeset_test.go → internal/chezmoi/entrytypeset_test.go b/pkg/chezmoi/entrytypeset_test.go → internal/chezmoi/entrytypeset_test.go
diff --git a/pkg/chezmoi/erroronwritesystem.go → internal/chezmoi/erroronwritesystem.go b/pkg/chezmoi/erroronwritesystem.go → internal/chezmoi/erroronwritesystem.go
diff --git a/pkg/chezmoi/erroronwritesystem_test.go → internal/chezmoi/erroronwritesystem_test.go b/pkg/chezmoi/erroronwritesystem_test.go → internal/chezmoi/erroronwritesystem_test.go
diff --git a/pkg/chezmoi/errors.go → internal/chezmoi/errors.go b/pkg/chezmoi/errors.go → internal/chezmoi/errors.go
diff --git a/pkg/chezmoi/externaldiffsystem.go → internal/chezmoi/externaldiffsystem.go b/pkg/chezmoi/externaldiffsystem.go → internal/chezmoi/externaldiffsystem.go
@@ -14,7 +14,7 @@ import (
 	vfs "github.com/twpayne/go-vfs/v4"
 	"go.uber.org/multierr"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // An ExternalDiffSystem is a DiffSystem that uses an external diff tool.

diff --git a/pkg/chezmoi/externaldiffsystem_test.go → internal/chezmoi/externaldiffsystem_test.go b/pkg/chezmoi/externaldiffsystem_test.go → internal/chezmoi/externaldiffsystem_test.go
diff --git a/pkg/chezmoi/format.go → internal/chezmoi/format.go b/pkg/chezmoi/format.go → internal/chezmoi/format.go
diff --git a/pkg/chezmoi/format_test.go → internal/chezmoi/format_test.go b/pkg/chezmoi/format_test.go → internal/chezmoi/format_test.go
diff --git a/pkg/chezmoi/gitdiffsystem.go → internal/chezmoi/gitdiffsystem.go b/pkg/chezmoi/gitdiffsystem.go → internal/chezmoi/gitdiffsystem.go
diff --git a/pkg/chezmoi/gitdiffsystem_test.go → internal/chezmoi/gitdiffsystem_test.go b/pkg/chezmoi/gitdiffsystem_test.go → internal/chezmoi/gitdiffsystem_test.go
diff --git a/pkg/chezmoi/github.go → internal/chezmoi/github.go b/pkg/chezmoi/github.go → internal/chezmoi/github.go
diff --git a/pkg/chezmoi/glob.go → internal/chezmoi/glob.go b/pkg/chezmoi/glob.go → internal/chezmoi/glob.go
diff --git a/pkg/chezmoi/gpgencryption.go → internal/chezmoi/gpgencryption.go b/pkg/chezmoi/gpgencryption.go → internal/chezmoi/gpgencryption.go
@@ -7,7 +7,7 @@ import (
 
 	"go.uber.org/multierr"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // A GPGEncryption uses gpg for encryption and decryption. See https://gnupg.org/.

diff --git a/pkg/chezmoi/gpgencryption_test.go → internal/chezmoi/gpgencryption_test.go b/pkg/chezmoi/gpgencryption_test.go → internal/chezmoi/gpgencryption_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestGPGEncryption(t *testing.T) {

diff --git a/pkg/chezmoi/hexbytes.go → internal/chezmoi/hexbytes.go b/pkg/chezmoi/hexbytes.go → internal/chezmoi/hexbytes.go
diff --git a/pkg/chezmoi/hexbytes_test.go → internal/chezmoi/hexbytes_test.go b/pkg/chezmoi/hexbytes_test.go → internal/chezmoi/hexbytes_test.go
diff --git a/pkg/chezmoi/interpreter.go → internal/chezmoi/interpreter.go b/pkg/chezmoi/interpreter.go → internal/chezmoi/interpreter.go
diff --git a/pkg/chezmoi/lazy.go → internal/chezmoi/lazy.go b/pkg/chezmoi/lazy.go → internal/chezmoi/lazy.go
diff --git a/pkg/chezmoi/lookpath.go → internal/chezmoi/lookpath.go b/pkg/chezmoi/lookpath.go → internal/chezmoi/lookpath.go
diff --git a/pkg/chezmoi/mockpersistentstate.go → internal/chezmoi/mockpersistentstate.go b/pkg/chezmoi/mockpersistentstate.go → internal/chezmoi/mockpersistentstate.go
diff --git a/pkg/chezmoi/mockpersistentstate_test.go → internal/chezmoi/mockpersistentstate_test.go b/pkg/chezmoi/mockpersistentstate_test.go → internal/chezmoi/mockpersistentstate_test.go
diff --git a/pkg/chezmoi/mode.go → internal/chezmoi/mode.go b/pkg/chezmoi/mode.go → internal/chezmoi/mode.go
diff --git a/pkg/chezmoi/noencryption.go → internal/chezmoi/noencryption.go b/pkg/chezmoi/noencryption.go → internal/chezmoi/noencryption.go
diff --git a/pkg/chezmoi/noencryption_test.go → internal/chezmoi/noencryption_test.go b/pkg/chezmoi/noencryption_test.go → internal/chezmoi/noencryption_test.go
diff --git a/pkg/chezmoi/nullpersistentstate.go → internal/chezmoi/nullpersistentstate.go b/pkg/chezmoi/nullpersistentstate.go → internal/chezmoi/nullpersistentstate.go
diff --git a/pkg/chezmoi/nullsystem.go → internal/chezmoi/nullsystem.go b/pkg/chezmoi/nullsystem.go → internal/chezmoi/nullsystem.go
diff --git a/pkg/chezmoi/nullsystem_test.go → internal/chezmoi/nullsystem_test.go b/pkg/chezmoi/nullsystem_test.go → internal/chezmoi/nullsystem_test.go
diff --git a/pkg/chezmoi/path_unix.go → internal/chezmoi/path_unix.go b/pkg/chezmoi/path_unix.go → internal/chezmoi/path_unix.go
diff --git a/pkg/chezmoi/path_windows.go → internal/chezmoi/path_windows.go b/pkg/chezmoi/path_windows.go → internal/chezmoi/path_windows.go
diff --git a/pkg/chezmoi/path_windows_test.go → internal/chezmoi/path_windows_test.go b/pkg/chezmoi/path_windows_test.go → internal/chezmoi/path_windows_test.go
diff --git a/pkg/chezmoi/patternset.go → internal/chezmoi/patternset.go b/pkg/chezmoi/patternset.go → internal/chezmoi/patternset.go
diff --git a/pkg/chezmoi/patternset_test.go → internal/chezmoi/patternset_test.go b/pkg/chezmoi/patternset_test.go → internal/chezmoi/patternset_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/alecthomas/assert/v2"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestPatternSet(t *testing.T) {

diff --git a/pkg/chezmoi/persistentstate.go → internal/chezmoi/persistentstate.go b/pkg/chezmoi/persistentstate.go → internal/chezmoi/persistentstate.go
diff --git a/pkg/chezmoi/persistentstate_test.go → internal/chezmoi/persistentstate_test.go b/pkg/chezmoi/persistentstate_test.go → internal/chezmoi/persistentstate_test.go
diff --git a/pkg/chezmoi/readonlysystem.go → internal/chezmoi/readonlysystem.go b/pkg/chezmoi/readonlysystem.go → internal/chezmoi/readonlysystem.go
diff --git a/pkg/chezmoi/readonlysystem_test.go → internal/chezmoi/readonlysystem_test.go b/pkg/chezmoi/readonlysystem_test.go → internal/chezmoi/readonlysystem_test.go
diff --git a/pkg/chezmoi/realsystem.go → internal/chezmoi/realsystem.go b/pkg/chezmoi/realsystem.go → internal/chezmoi/realsystem.go
@@ -12,7 +12,7 @@ import (
 	vfs "github.com/twpayne/go-vfs/v4"
 	"go.uber.org/multierr"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // A RealSystemOption sets an option on a RealSystem.

diff --git a/pkg/chezmoi/realsystem_test.go → internal/chezmoi/realsystem_test.go b/pkg/chezmoi/realsystem_test.go → internal/chezmoi/realsystem_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/alecthomas/assert/v2"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 var _ System = &RealSystem{}

diff --git a/pkg/chezmoi/realsystem_unix.go → internal/chezmoi/realsystem_unix.go b/pkg/chezmoi/realsystem_unix.go → internal/chezmoi/realsystem_unix.go
diff --git a/pkg/chezmoi/realsystem_windows.go → internal/chezmoi/realsystem_windows.go b/pkg/chezmoi/realsystem_windows.go → internal/chezmoi/realsystem_windows.go
diff --git a/pkg/chezmoi/recursivemerge.go → internal/chezmoi/recursivemerge.go b/pkg/chezmoi/recursivemerge.go → internal/chezmoi/recursivemerge.go
diff --git a/pkg/chezmoi/recursivemerge_test.go → internal/chezmoi/recursivemerge_test.go b/pkg/chezmoi/recursivemerge_test.go → internal/chezmoi/recursivemerge_test.go
diff --git a/pkg/chezmoi/refreshexternals.go → internal/chezmoi/refreshexternals.go b/pkg/chezmoi/refreshexternals.go → internal/chezmoi/refreshexternals.go
diff --git a/pkg/chezmoi/relpath.go → internal/chezmoi/relpath.go b/pkg/chezmoi/relpath.go → internal/chezmoi/relpath.go
diff --git a/pkg/chezmoi/set.go → internal/chezmoi/set.go b/pkg/chezmoi/set.go → internal/chezmoi/set.go
diff --git a/pkg/chezmoi/sourcerelpath.go → internal/chezmoi/sourcerelpath.go b/pkg/chezmoi/sourcerelpath.go → internal/chezmoi/sourcerelpath.go
diff --git a/pkg/chezmoi/sourcerelpath_test.go → internal/chezmoi/sourcerelpath_test.go b/pkg/chezmoi/sourcerelpath_test.go → internal/chezmoi/sourcerelpath_test.go
diff --git a/pkg/chezmoi/sourcestate.go → internal/chezmoi/sourcestate.go b/pkg/chezmoi/sourcestate.go → internal/chezmoi/sourcestate.go
@@ -34,7 +34,7 @@ import (
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // An ExternalType is a type of external source.

diff --git a/pkg/chezmoi/sourcestate_test.go → internal/chezmoi/sourcestate_test.go b/pkg/chezmoi/sourcestate_test.go → internal/chezmoi/sourcestate_test.go
@@ -19,7 +19,7 @@ import (
 	vfs "github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestSourceStateAdd(t *testing.T) {

diff --git a/pkg/chezmoi/sourcestateentry.go → internal/chezmoi/sourcestateentry.go b/pkg/chezmoi/sourcestateentry.go → internal/chezmoi/sourcestateentry.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 // A SourceAttr contains attributes of the source.

diff --git a/pkg/chezmoi/sourcestatetreenode.go → internal/chezmoi/sourcestatetreenode.go b/pkg/chezmoi/sourcestatetreenode.go → internal/chezmoi/sourcestatetreenode.go
diff --git a/pkg/chezmoi/sourcestatetreenode_test.go → internal/chezmoi/sourcestatetreenode_test.go b/pkg/chezmoi/sourcestatetreenode_test.go → internal/chezmoi/sourcestatetreenode_test.go
diff --git a/pkg/chezmoi/system.go → internal/chezmoi/system.go b/pkg/chezmoi/system.go → internal/chezmoi/system.go
diff --git a/pkg/chezmoi/system_test.go → internal/chezmoi/system_test.go b/pkg/chezmoi/system_test.go → internal/chezmoi/system_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestConcurrentWalkSourceDir(t *testing.T) {

diff --git a/pkg/chezmoi/targetstateentry.go → internal/chezmoi/targetstateentry.go b/pkg/chezmoi/targetstateentry.go → internal/chezmoi/targetstateentry.go
diff --git a/pkg/chezmoi/targetstateentry_test.go → internal/chezmoi/targetstateentry_test.go b/pkg/chezmoi/targetstateentry_test.go → internal/chezmoi/targetstateentry_test.go
@@ -10,7 +10,7 @@ import (
 	vfs "github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestTargetStateEntryApply(t *testing.T) {

diff --git a/pkg/chezmoi/tarwritersystem.go → internal/chezmoi/tarwritersystem.go b/pkg/chezmoi/tarwritersystem.go → internal/chezmoi/tarwritersystem.go
diff --git a/pkg/chezmoi/tarwritersystem_test.go → internal/chezmoi/tarwritersystem_test.go b/pkg/chezmoi/tarwritersystem_test.go → internal/chezmoi/tarwritersystem_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/coreos/go-semver/semver"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 var _ System = &TarWriterSystem{}

diff --git a/pkg/chezmoi/template.go → internal/chezmoi/template.go b/pkg/chezmoi/template.go → internal/chezmoi/template.go
diff --git a/pkg/chezmoi/template_test.go → internal/chezmoi/template_test.go b/pkg/chezmoi/template_test.go → internal/chezmoi/template_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/alecthomas/assert/v2"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 func TestTemplateParseAndExecute(t *testing.T) {

diff --git a/pkg/chezmoi/zipwritersystem.go → internal/chezmoi/zipwritersystem.go b/pkg/chezmoi/zipwritersystem.go → internal/chezmoi/zipwritersystem.go
diff --git a/pkg/chezmoi/zipwritersystem_test.go → internal/chezmoi/zipwritersystem_test.go b/pkg/chezmoi/zipwritersystem_test.go → internal/chezmoi/zipwritersystem_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/klauspost/compress/zip"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
 var _ System = &ZIPWriterSystem{}

diff --git a/pkg/chezmoiassert/chezmoiassert.go → internal/chezmoiassert/chezmoiassert.go b/pkg/chezmoiassert/chezmoiassert.go → internal/chezmoiassert/chezmoiassert.go
diff --git a/pkg/chezmoibubbles/boolinputmodel.go → internal/chezmoibubbles/boolinputmodel.go b/pkg/chezmoibubbles/boolinputmodel.go → internal/chezmoibubbles/boolinputmodel.go
@@ -6,7 +6,7 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoi"
 )
 
 type BoolInputModel struct {

diff --git a/pkg/chezmoibubbles/boolinputmodel_test.go → ...nal/chezmoibubbles/boolinputmodel_test.go b/pkg/chezmoibubbles/boolinputmodel_test.go → ...nal/chezmoibubbles/boolinputmodel_test.go
diff --git a/pkg/chezmoibubbles/chezmoibubbles.go → internal/chezmoibubbles/chezmoibubbles.go b/pkg/chezmoibubbles/chezmoibubbles.go → internal/chezmoibubbles/chezmoibubbles.go
diff --git a/pkg/chezmoibubbles/chezmoibubbles_test.go → ...nal/chezmoibubbles/chezmoibubbles_test.go b/pkg/chezmoibubbles/chezmoibubbles_test.go → ...nal/chezmoibubbles/chezmoibubbles_test.go
diff --git a/pkg/chezmoibubbles/choiceinputmodel.go → internal/chezmoibubbles/choiceinputmodel.go b/pkg/chezmoibubbles/choiceinputmodel.go → internal/chezmoibubbles/choiceinputmodel.go
@@ -7,7 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoi"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoi"
 )
 
 type ChoiceInputModel struct {

diff --git a/pkg/chezmoibubbles/choiceinputmodel_test.go → ...l/chezmoibubbles/choiceinputmodel_test.go b/pkg/chezmoibubbles/choiceinputmodel_test.go → ...l/chezmoibubbles/choiceinputmodel_test.go
diff --git a/pkg/chezmoibubbles/intinputmodel.go → internal/chezmoibubbles/intinputmodel.go b/pkg/chezmoibubbles/intinputmodel.go → internal/chezmoibubbles/intinputmodel.go
diff --git a/pkg/chezmoibubbles/intinputmodel_test.go → ...rnal/chezmoibubbles/intinputmodel_test.go b/pkg/chezmoibubbles/intinputmodel_test.go → ...rnal/chezmoibubbles/intinputmodel_test.go
diff --git a/pkg/chezmoibubbles/passwordinputmodel.go → ...rnal/chezmoibubbles/passwordinputmodel.go b/pkg/chezmoibubbles/passwordinputmodel.go → ...rnal/chezmoibubbles/passwordinputmodel.go
diff --git a/...chezmoibubbles/passwordinputmodel_test.go → ...chezmoibubbles/passwordinputmodel_test.go b/...chezmoibubbles/passwordinputmodel_test.go → ...chezmoibubbles/passwordinputmodel_test.go
diff --git a/pkg/chezmoibubbles/stringinputmodel.go → internal/chezmoibubbles/stringinputmodel.go b/pkg/chezmoibubbles/stringinputmodel.go → internal/chezmoibubbles/stringinputmodel.go
diff --git a/pkg/chezmoibubbles/stringinputmodel_test.go → ...l/chezmoibubbles/stringinputmodel_test.go b/pkg/chezmoibubbles/stringinputmodel_test.go → ...l/chezmoibubbles/stringinputmodel_test.go
diff --git a/pkg/chezmoilog/chezmoilog.go → internal/chezmoilog/chezmoilog.go b/pkg/chezmoilog/chezmoilog.go → internal/chezmoilog/chezmoilog.go
diff --git a/pkg/chezmoilog/chezmoilog_test.go → internal/chezmoilog/chezmoilog_test.go b/pkg/chezmoilog/chezmoilog_test.go → internal/chezmoilog/chezmoilog_test.go
diff --git a/pkg/chezmoitest/chezmoitest.go → internal/chezmoitest/chezmoitest.go b/pkg/chezmoitest/chezmoitest.go → internal/chezmoitest/chezmoitest.go
@@ -15,7 +15,7 @@ import (
 	"github.com/twpayne/go-vfs/v4"
 	"github.com/twpayne/go-vfs/v4/vfst"
 
-	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
 )
 
 var ageRecipientRx = regexp.MustCompile(`(?m)^Public key: ([0-9a-z]+)\s*$`)

diff --git a/pkg/chezmoitest/chezmoitest_test.go → internal/chezmoitest/chezmoitest_test.go b/pkg/chezmoitest/chezmoitest_test.go → internal/chezmoitest/chezmoitest_test.go