-
Notifications
You must be signed in to change notification settings - Fork 486
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #654 from twpayne/v2
Rework internals
- Loading branch information
Showing
226 changed files
with
26,204 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/twpayne/chezmoi/chezmoi2/internal/chezmoi" | ||
| ) | ||
|
|
||
| type addCmdConfig struct { | ||
| autoTemplate bool | ||
| empty bool | ||
| encrypt bool | ||
| exact bool | ||
| exists bool | ||
| follow bool | ||
| include *chezmoi.IncludeSet | ||
| recursive bool | ||
| template bool | ||
| } | ||
|
|
||
| func (c *Config) newAddCmd() *cobra.Command { | ||
| addCmd := &cobra.Command{ | ||
| Use: "add targets...", | ||
| Aliases: []string{"manage"}, | ||
| Short: "Add an existing file, directory, or symlink to the source state", | ||
| Long: mustLongHelp("add"), | ||
| Example: example("add"), | ||
| Args: cobra.MinimumNArgs(1), | ||
| RunE: c.makeRunEWithSourceState(c.runAddCmd), | ||
| Annotations: map[string]string{ | ||
| modifiesSourceDirectory: "true", | ||
| persistentStateMode: persistentStateModeReadWrite, | ||
| requiresSourceDirectory: "true", | ||
| }, | ||
| } | ||
|
|
||
| flags := addCmd.Flags() | ||
| flags.BoolVarP(&c.add.autoTemplate, "autotemplate", "a", c.add.autoTemplate, "auto generate the template when adding files as templates") | ||
| flags.BoolVarP(&c.add.empty, "empty", "e", c.add.empty, "add empty files") | ||
| flags.BoolVar(&c.add.encrypt, "encrypt", c.add.encrypt, "encrypt files") | ||
| flags.BoolVarP(&c.add.exact, "exact", "x", c.add.exact, "add directories exactly") | ||
| flags.BoolVar(&c.add.exists, "exists", c.add.exists, "add files that should exist, irrespective of their contents") | ||
| flags.BoolVarP(&c.add.follow, "follow", "f", c.add.follow, "add symlink targets instead of symlinks") | ||
| flags.BoolVarP(&c.add.recursive, "recursive", "r", c.add.recursive, "recursive") | ||
| flags.BoolVarP(&c.add.template, "template", "T", c.add.template, "add files as templates") | ||
|
|
||
| return addCmd | ||
| } | ||
|
|
||
| func (c *Config) runAddCmd(cmd *cobra.Command, args []string, sourceState *chezmoi.SourceState) error { | ||
| destAbsPathInfos, err := c.destAbsPathInfos(sourceState, args, c.add.recursive, c.add.follow) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return sourceState.Add(c.sourceSystem, c.persistentState, c.destSystem, destAbsPathInfos, &chezmoi.AddOptions{ | ||
| AutoTemplate: c.add.autoTemplate, | ||
| Empty: c.add.empty, | ||
| Encrypt: c.add.encrypt, | ||
| Exact: c.add.exact, | ||
| Exists: c.add.exists, | ||
| Include: c.add.include, | ||
| Template: c.add.template, | ||
| }) | ||
| } |
Oops, something went wrong.