summaryrefslogtreecommitdiffstats
path: root/pkg/commands
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-12-30 17:25:36 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-04 09:07:15 +1100
commitd69ce7a529474565ea61f1e104d3e42cd55ff8e1 (patch)
tree31a2dfe297c434d398f1aa90a4657a508f0e67c9 /pkg/commands
parent9b2b0fc1226ebe0858fcbed59d87bcaae8c8a2e9 (diff)
move reflog commit loader into loaders package
Diffstat (limited to 'pkg/commands')
-rw-r--r--pkg/commands/loaders/loading_reflog_commits.go (renamed from pkg/commands/loading_reflog_commits.go)22
1 files changed, 18 insertions, 4 deletions
diff --git a/pkg/commands/loading_reflog_commits.go b/pkg/commands/loaders/loading_reflog_commits.go
index 218db9865..012c7c297 100644
--- a/pkg/commands/loading_reflog_commits.go
+++ b/pkg/commands/loaders/loading_reflog_commits.go
@@ -1,4 +1,4 @@
-package commands
+package loaders
import (
"fmt"
@@ -6,19 +6,33 @@ import (
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/models"
+ "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+ "github.com/jesseduffield/lazygit/pkg/common"
)
+type ReflogCommitLoader struct {
+ *common.Common
+ cmd oscommands.ICmdObjBuilder
+}
+
+func NewReflogCommitLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *ReflogCommitLoader {
+ return &ReflogCommitLoader{
+ Common: common,
+ cmd: cmd,
+ }
+}
+
// GetReflogCommits only returns the new reflog commits since the given lastReflogCommit
// if none is passed (i.e. it's value is nil) then we get all the reflog commits
-func (c *GitCommand) GetReflogCommits(lastReflogCommit *models.Commit, filterPath string) ([]*models.Commit, bool, error) {
+func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit, filterPath string) ([]*models.Commit, bool, error) {
commits := make([]*models.Commit, 0)
filterPathArg := ""
if filterPath != "" {
- filterPathArg = fmt.Sprintf(" --follow -- %s", c.OSCommand.Quote(filterPath))
+ filterPathArg = fmt.Sprintf(" --follow -- %s", self.cmd.Quote(filterPath))
}
- cmdObj := c.OSCommand.Cmd.New(fmt.Sprintf(`git log -g --abbrev=20 --format="%%h %%ct %%gs" %s`, filterPathArg))
+ cmdObj := self.cmd.New(fmt.Sprintf(`git log -g --abbrev=20 --format="%%h %%ct %%gs" %s`, filterPathArg))
onlyObtainedNewReflogCommits := false
err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
fields := strings.SplitN(line, " ", 3)