Merge pull request #83 from twpayne/import-flags

Import cleanups

Author: twpayne

cmd/import.go

@@ -19,7 +19,7 @@ import (
 	vfs "github.com/twpayne/go-vfs"
 )
 
-var _importommand = &cobra.Command{
+var _importCommand = &cobra.Command{
 	Use:   "import",
 	Args:  cobra.MaximumNArgs(1),
 	Short: "Import an archive",
@@ -33,9 +33,9 @@ type importCommandConfig struct {
 }
 
 func init() {
-	rootCommand.AddCommand(_importommand)
+	rootCommand.AddCommand(_importCommand)
 
-	persistentFlags := _importommand.PersistentFlags()
+	persistentFlags := _importCommand.PersistentFlags()
 	persistentFlags.StringVarP(&config._import.destination, "destination", "d", "", "destination prefix")
 	persistentFlags.IntVar(&config._import.stripComponents, "strip-components", 0, "strip components")
 	persistentFlags.BoolVarP(&config._import.removeDestination, "remove-destination", "r", false, "remove destination before import")
@@ -83,5 +83,5 @@ func (c *Config) runImportCommand(fs vfs.FS, cmd *cobra.Command, args []string)
 			return err
 		}
 	}
-	return ts.Import(tar.NewReader(r), c._import.destination, c._import.stripComponents, mutator)
+	return ts.ImportTAR(tar.NewReader(r), c._import.destination, c._import.stripComponents, mutator)
 }

lib/chezmoi/target_state.go

@@ -193,8 +193,8 @@ func (ts *TargetState) Get(target string) (Entry, error) {
 	return ts.findEntry(targetName)
 }
 
-// Import imports an archive.
-func (ts *TargetState) Import(r *tar.Reader, destinationDir string, stripComponents int, mutator Mutator) error {
+// ImportTAR imports a tar archive.
+func (ts *TargetState) ImportTAR(r *tar.Reader, destinationDir string, stripComponents int, mutator Mutator) error {
 	for {
 		header, err := r.Next()
 		if err == io.EOF {