feat: Make chezmoi's core functionality available as a Go module

BreadQL · Jan 26, 2022 · 8a84b31 · 8a84b31
1 parent 6c0d0b5
commit 8a84b31
Show file tree

Hide file tree

Showing 318 changed files with 133 additions and 134 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
           - 'assets/docker/**'
           - 'assets/vagrant/**'
           - 'go.*'
-          - 'internal/**'
+          - 'pkg/**'
   codeql:
     needs: changes
     if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
@@ -255,11 +255,11 @@ jobs:
     - name: Test (umask 022)
       if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
       run: |
-        go test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o022" -race ./...
+        go test -ldflags="-X github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o022" -race ./...
     - name: Test (umask 002)
       if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
       run: |
-        go test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o002" -race ./...
+        go test -ldflags="-X github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o002" -race ./...
     - name: Test install.sh
       if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
       run: |
@@ -466,7 +466,7 @@ jobs:
         ignore: completions
     - name: Whitespace
       run: |
-        go run ./internal/cmds/lint-whitespace
+        go run ./pkg/cmds/lint-whitespace
     - name: Typos
       run: |
         go install github.com/twpayne/findtypos@v0.0.1

diff --git a/.golangci.yml b/.golangci.yml
@@ -103,7 +103,7 @@ issues:
     - forbidigo
     - gosec
     - lll
-    path: ^internal/cmds/
+    path: ^pkg/cmds/
   - linters:
     - gosec
     - lll

diff --git a/Makefile b/Makefile
@@ -74,8 +74,8 @@ run:
 
 .PHONY: test
 test:
-	${GO} test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o022" ./...
-	${GO} test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o002" ./...
+	${GO} test -ldflags="-X github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o022" ./...
+	${GO} test -ldflags="-X github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=0o002" ./...
 
 .PHONY: test-docker
 test-docker:
@@ -100,7 +100,7 @@ generate:
 .PHONY: lint
 lint: ensure-golangci-lint
 	./bin/golangci-lint run
-	${GO} run ./internal/cmds/lint-whitespace
+	${GO} run ./pkg/cmds/lint-whitespace
 
 .PHONY: format
 format: ensure-gofumpt

diff --git a/assets/chezmoi.io/docs/developer/architecture.md b/assets/chezmoi.io/docs/developer/architecture.md
@@ -7,23 +7,22 @@ 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/internal/chezmoi
+$ go doc -all -u github.com/twpayne/chezmoi/v2/pkg/chezmoi
 ```
 
 You can also [browse chezmoi's generated documentation
-online](https://pkg.go.dev/github.com/twpayne/chezmoi/v2) but this only
-includes exported symbols.
+online](https://pkg.go.dev/github.com/twpayne/chezmoi/v2).
 
 ## Directory structure
 
 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, particularly `docs/reference.md` |
-| `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)                                                                       |
+| 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)
 
 ## Key concepts
 
@@ -37,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.
 
-## `internal/chezmoi/` directory
+## `pkg/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
@@ -100,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.
 
-## `internal/cmd/` directory
+## `pkg/cmd/` directory
 
-`internal/cmd/*cmd.go` contains the code for each individual command and
-`internal/cmd/*templatefuncs.go` contain the template functions.
+`pkg/cmd/*cmd.go` contains the code for each individual command and
+`pkg/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
@@ -164,12 +163,12 @@ integration tests use the
 [`github.com/stretchr/testify`](https://pkg.go.dev/github.com/stretchr/testify)
 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 `internal/cmd/testdata/scripts/*.txt`.
+with the test scripts themselves in `pkg/cmd/testdata/scripts/*.txt`.
 
 You can run individual end-to-end tests with
 
 ```console
-$ go test ./internal/cmd -run=TestScript/<name>
+$ go test ./pkg/cmd -run=TestScript/<name>
 ```
 
 where `<name>` is the basename of file without the `.txt` extension.

diff --git a/internal/cmd/cmd_test.go b/internal/cmd/cmd_test.go
diff --git a/main.go b/main.go
@@ -5,14 +5,14 @@
 //go:generate go run . completion fish -o completions/chezmoi.fish
 //go:generate go run . completion powershell -o completions/chezmoi.ps1
 //go:generate go run . completion zsh -o completions/chezmoi.zsh
-//go:generate go run ./internal/cmds/generate-install.sh -o assets/scripts/install.sh
+//go:generate go run ./pkg/cmds/generate-install.sh -o assets/scripts/install.sh
 
 package main
 
 import (
 	"os"
 
-	"github.com/twpayne/chezmoi/v2/internal/cmd"
+	"github.com/twpayne/chezmoi/v2/pkg/cmd"
 )
 
 var (

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

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

diff --git a/internal/chezmoi/ageencryption_test.go → pkg/chezmoi/ageencryption_test.go b/internal/chezmoi/ageencryption_test.go → pkg/chezmoi/ageencryption_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
 )
 
 func TestAgeEncryption(t *testing.T) {

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

diff --git a/internal/chezmoi/attr.go → pkg/chezmoi/attr.go b/internal/chezmoi/attr.go → pkg/chezmoi/attr.go
diff --git a/internal/chezmoi/attr_test.go → pkg/chezmoi/attr_test.go b/internal/chezmoi/attr_test.go → pkg/chezmoi/attr_test.go
diff --git a/internal/chezmoi/autotemplate.go → pkg/chezmoi/autotemplate.go b/internal/chezmoi/autotemplate.go → pkg/chezmoi/autotemplate.go
diff --git a/internal/chezmoi/autotemplate_test.go → pkg/chezmoi/autotemplate_test.go b/internal/chezmoi/autotemplate_test.go → pkg/chezmoi/autotemplate_test.go
diff --git a/internal/chezmoi/boltpersistentstate.go → pkg/chezmoi/boltpersistentstate.go b/internal/chezmoi/boltpersistentstate.go → pkg/chezmoi/boltpersistentstate.go
diff --git a/internal/chezmoi/boltpersistentstate_test.go → pkg/chezmoi/boltpersistentstate_test.go b/internal/chezmoi/boltpersistentstate_test.go → pkg/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/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
 )
 
 var _ PersistentState = &BoltPersistentState{}

diff --git a/internal/chezmoi/chezmoi.go → pkg/chezmoi/chezmoi.go b/internal/chezmoi/chezmoi.go → pkg/chezmoi/chezmoi.go
diff --git a/internal/chezmoi/chezmoi_go1.17.go → pkg/chezmoi/chezmoi_go1.17.go b/internal/chezmoi/chezmoi_go1.17.go → pkg/chezmoi/chezmoi_go1.17.go
diff --git a/internal/chezmoi/chezmoi_go1.18.go → pkg/chezmoi/chezmoi_go1.18.go b/internal/chezmoi/chezmoi_go1.18.go → pkg/chezmoi/chezmoi_go1.18.go
diff --git a/internal/chezmoi/chezmoi_test.go → pkg/chezmoi/chezmoi_test.go b/internal/chezmoi/chezmoi_test.go → pkg/chezmoi/chezmoi_test.go
diff --git a/internal/chezmoi/chezmoi_unix.go → pkg/chezmoi/chezmoi_unix.go b/internal/chezmoi/chezmoi_unix.go → pkg/chezmoi/chezmoi_unix.go
diff --git a/internal/chezmoi/chezmoi_unix_test.go → pkg/chezmoi/chezmoi_unix_test.go b/internal/chezmoi/chezmoi_unix_test.go → pkg/chezmoi/chezmoi_unix_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	vfs "github.com/twpayne/go-vfs/v4"
 
-	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
 )
 
 func TestFQDNHostname(t *testing.T) {

diff --git a/internal/chezmoi/chezmoi_windows.go → pkg/chezmoi/chezmoi_windows.go b/internal/chezmoi/chezmoi_windows.go → pkg/chezmoi/chezmoi_windows.go
diff --git a/internal/chezmoi/data.go → pkg/chezmoi/data.go b/internal/chezmoi/data.go → pkg/chezmoi/data.go
diff --git a/internal/chezmoi/data_test.go → pkg/chezmoi/data_test.go b/internal/chezmoi/data_test.go → pkg/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/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
 )
 
 func TestKernel(t *testing.T) {

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

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

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

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

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

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

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

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

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

diff --git a/internal/chezmoi/realsystem_unix.go → pkg/chezmoi/realsystem_unix.go b/internal/chezmoi/realsystem_unix.go → pkg/chezmoi/realsystem_unix.go
diff --git a/internal/chezmoi/realsystem_windows.go → pkg/chezmoi/realsystem_windows.go b/internal/chezmoi/realsystem_windows.go → pkg/chezmoi/realsystem_windows.go
diff --git a/internal/chezmoi/recursivemerge.go → pkg/chezmoi/recursivemerge.go b/internal/chezmoi/recursivemerge.go → pkg/chezmoi/recursivemerge.go
diff --git a/internal/chezmoi/recursivemerge_test.go → pkg/chezmoi/recursivemerge_test.go b/internal/chezmoi/recursivemerge_test.go → pkg/chezmoi/recursivemerge_test.go
diff --git a/internal/chezmoi/relpath.go → pkg/chezmoi/relpath.go b/internal/chezmoi/relpath.go → pkg/chezmoi/relpath.go
diff --git a/internal/chezmoi/sourcerelpath.go → pkg/chezmoi/sourcerelpath.go b/internal/chezmoi/sourcerelpath.go → pkg/chezmoi/sourcerelpath.go
diff --git a/internal/chezmoi/sourcerelpath_test.go → pkg/chezmoi/sourcerelpath_test.go b/internal/chezmoi/sourcerelpath_test.go → pkg/chezmoi/sourcerelpath_test.go
diff --git a/internal/chezmoi/sourcestate.go → pkg/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go → pkg/chezmoi/sourcestate.go
@@ -31,7 +31,7 @@ import (
 	vfs "github.com/twpayne/go-vfs/v4"
 	"go.uber.org/multierr"
 
-	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
 )
 
 // An ExternalType is a type of external source.

diff --git a/internal/chezmoi/sourcestate_test.go → pkg/chezmoi/sourcestate_test.go b/internal/chezmoi/sourcestate_test.go → pkg/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/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoitest"
 )
 
 func TestSourceStateAdd(t *testing.T) {

diff --git a/internal/chezmoi/sourcestateentry.go → pkg/chezmoi/sourcestateentry.go b/internal/chezmoi/sourcestateentry.go → pkg/chezmoi/sourcestateentry.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/twpayne/chezmoi/v2/internal/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
 )
 
 // A SourceStateEntry represents the state of an entry in the source state.

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

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

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

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

diff --git a/internal/chezmoilog/chezmoilog.go → pkg/chezmoilog/chezmoilog.go b/internal/chezmoilog/chezmoilog.go → pkg/chezmoilog/chezmoilog.go
diff --git a/internal/chezmoitest/chezmoitest.go → pkg/chezmoitest/chezmoitest.go b/internal/chezmoitest/chezmoitest.go → pkg/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/internal/chezmoilog"
+	"github.com/twpayne/chezmoi/v2/pkg/chezmoilog"
 )
 
 var ageRecipientRx = regexp.MustCompile(`(?m)^Public key: ([0-9a-z]+)\s*$`)

diff --git a/internal/chezmoitest/chezmoitest_unix.go → pkg/chezmoitest/chezmoitest_unix.go b/internal/chezmoitest/chezmoitest_unix.go → pkg/chezmoitest/chezmoitest_unix.go
@@ -10,7 +10,7 @@ import (
 var (
 	// umaskStr is the umask used in tests represented as a string so it can be
 	// set with the
-	//   -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=..."
+	//   -ldflags="-X github.com/twpayne/chezmoi/pkg/chezmoitest.umaskStr=..."
 	// option to go build and go test.
 	umaskStr = "0o022"