-
Notifications
You must be signed in to change notification settings - Fork 220
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add batching to implicit commands (#695)
* fix: add batching to implicit commands * chore: move limits to a separate file * chore: apply the similar struct-interface model for skip setting command executor as in git
- Loading branch information
Showing
17 changed files
with
244 additions
and
198 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "runtime" | ||
| ) | ||
|
|
||
| // Executor is a general execution interface for implicit commands. | ||
| type Executor interface { | ||
| Execute(args []string, root string) (string, error) | ||
| } | ||
|
|
||
| // commandExecutor implements execution of a skip checks passed in a `run` option. | ||
| type commandExecutor struct { | ||
| exec Executor | ||
| } | ||
|
|
||
| // cmd runs plain string command in a subshell returning the success of it. | ||
| func (c *commandExecutor) cmd(commandLine string) bool { | ||
| if commandLine == "" { | ||
| return false | ||
| } | ||
|
|
||
| var args []string | ||
| if runtime.GOOS == "windows" { | ||
| args = []string{"powershell", "-Command", commandLine} | ||
| } else { | ||
| args = []string{"sh", "-c", commandLine} | ||
| } | ||
|
|
||
| _, err := c.exec.Execute(args, "") | ||
|
|
||
| return err == nil | ||
| } |
This file was deleted.
Oops, something went wrong.
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,99 @@ | ||
| package git | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/evilmartians/lefthook/internal/system" | ||
| ) | ||
|
|
||
| // Executor is a general execution interface for implicit commands. | ||
| // Added here mostly for mockable tests. | ||
| type Executor interface { | ||
| Execute(args []string, root string) (string, error) | ||
| } | ||
|
|
||
| // CommandExecutor provides some methods that take some effect on execution and/or result data. | ||
| type CommandExecutor struct { | ||
| exec Executor | ||
| root string | ||
| } | ||
|
|
||
| // NewExecutor returns an object that executes given commands in the OS. | ||
| func NewExecutor(exec Executor) *CommandExecutor { | ||
| return &CommandExecutor{exec: exec} | ||
| } | ||
|
|
||
| // Cmd runs plain string command. Trims spaces around output. | ||
| func (c CommandExecutor) Cmd(args []string) (string, error) { | ||
| out, err := c.exec.Execute(args, c.root) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return strings.TrimSpace(out), nil | ||
| } | ||
|
|
||
| // BatchedCmd runs the command with any number of appended arguments batched in chunks to match the OS limits. | ||
| func (c CommandExecutor) BatchedCmd(cmd []string, args []string) (string, error) { | ||
| maxlen := system.MaxCmdLen() | ||
| result := strings.Builder{} | ||
|
|
||
| argsBatched := batchByLength(args, maxlen-len(cmd)) | ||
| for i, batch := range argsBatched { | ||
| out, err := c.Cmd(append(cmd, batch...)) | ||
| if err != nil { | ||
| return "", fmt.Errorf("error in batch %d: %w", i, err) | ||
| } | ||
| result.WriteString(out) | ||
| result.WriteString("\n") | ||
| } | ||
|
|
||
| return result.String(), nil | ||
| } | ||
|
|
||
| // CmdLines runs plain string command, returns its output split by newline. | ||
| func (c CommandExecutor) CmdLines(cmd []string) ([]string, error) { | ||
| out, err := c.exec.Execute(cmd, c.root) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return strings.Split(strings.TrimSpace(out), "\n"), nil | ||
| } | ||
|
|
||
| // CmdLines runs plain string command, returns its output split by newline. | ||
| func (c CommandExecutor) CmdLinesWithinFolder(cmd []string, folder string) ([]string, error) { | ||
| root := filepath.Join(c.root, folder) | ||
| out, err := c.exec.Execute(cmd, root) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return strings.Split(strings.TrimSpace(out), "\n"), nil | ||
| } | ||
|
|
||
| func batchByLength(s []string, length int) [][]string { | ||
| batches := make([][]string, 0) | ||
|
|
||
| var acc, prev int | ||
| for i := range s { | ||
| acc += len(s[i]) | ||
| if acc > length { | ||
| if i == prev { | ||
| batches = append(batches, s[prev:i+1]) | ||
| prev = i + 1 | ||
| } else { | ||
| batches = append(batches, s[prev:i]) | ||
| prev = i | ||
| } | ||
| acc = len(s[i]) | ||
| } | ||
| } | ||
| if acc > 0 { | ||
| batches = append(batches, s[prev:]) | ||
| } | ||
|
|
||
| return batches | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.