but: target description

Author: rsteube

completers/common/but_completer/cmd/describe.go

@@ -21,6 +21,6 @@ func init() {
 	rootCmd.AddCommand(describeCmd)
 
 	carapace.Gen(describeCmd).PositionalCompletion(
-		but.ActionLocalBranches(), // TODO commit id
+		but.ActionTargets(),
 	)
 }

pkg/actions/tools/but/branch.go

@@ -9,8 +9,8 @@ import (
 
 // ActionLocalBranches completes local branches
 //
-//	mybranch
-//	another
+//	branch (branch description)
+//	another (another description)
 func ActionLocalBranches() carapace.Action {
 	return carapace.ActionExecCommand("but", "branch", "list", "--local")(func(output []byte) carapace.Action {
 		lines := strings.Split(string(output), "\n")

pkg/actions/tools/but/commit.go

@@ -0,0 +1,46 @@
+package but
+
+import (
+	"encoding/json"
+
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/git"
+	"github.com/carapace-sh/carapace-bin/pkg/styles"
+)
+
+type logEntry struct {
+	BranchDetails []struct {
+		Commits []struct {
+			ID           string `json:"id"`
+			Message      string `json:"message"`
+			HasConflicts bool   `json:"hasConflicts"`
+			State        struct {
+				Type string `json:"type"`
+			} `json:"state"`
+			CreatedAt int64 `json:"createdAt"`
+		} `json:"commits"`
+	} `json:"branchDetails"`
+}
+
+// ActionCommits completes commits
+//
+//	36ae34b (some commit)
+//	e1b2490 (another commit)
+func ActionCommits() carapace.Action {
+	return carapace.ActionExecCommand("but", "--json", "log")(func(output []byte) carapace.Action {
+		var entries []logEntry
+		if err := json.Unmarshal(output, &entries); err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		vals := make([]string, 0)
+		for _, entry := range entries {
+			for _, branch := range entry.BranchDetails {
+				for _, commit := range branch.Commits {
+					vals = append(vals, commit.ID[:7], commit.Message, styles.Git.Commit)
+				}
+			}
+		}
+		return carapace.ActionStyledValuesDescribed(vals...)
+	}).Tag("commits").UidF(git.Uid("ref")) // TODO custom uid
+}

pkg/actions/tools/but/target.go

@@ -0,0 +1,14 @@
+package but
+
+import "github.com/carapace-sh/carapace"
+
+// ActionTargets completes targets
+//
+//	36ae34b (some commit)
+//	branch  (some branch)
+func ActionTargets() carapace.Action {
+	return carapace.Batch(
+		ActionCommits(),
+		ActionLocalBranches(),
+	).ToA()
+}