Merge pull request #3225 from carapace-sh/jj-changeid

jj: complete change ids

Author: rsteube

docs/src/choices.md

@@ -34,6 +34,7 @@ Currently available bridges:
 - [complete](https://github.com/posener/complete)
 - [fish](https://fishshell.com/)
 - [inshellisense](https://github.com/microsoft/inshellisense)
+- [jj](https://www.jj-vcs.dev)
 - [kingpin](https://github.com/alecthomas/kingpin)
 - [kitten](https://github.com/kovidgoyal/kitty)
 - [powershell](https://microsoft.com/powershell)

go.mod

@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/carapace-sh/carapace v1.11.0
-	github.com/carapace-sh/carapace-bridge v1.5.0
+	github.com/carapace-sh/carapace-bridge v1.5.1
 	github.com/carapace-sh/carapace-selfupdate v0.0.10
 	github.com/carapace-sh/carapace-shlex v1.1.1
 	github.com/carapace-sh/carapace-spec v1.5.0

go.sum

@@ -1,7 +1,7 @@
 github.com/carapace-sh/carapace v1.11.0 h1:dTUFXvIrUTLd9BGLsfDt4wCgEyPl8bJeZOFDmN7fIfo=
 github.com/carapace-sh/carapace v1.11.0/go.mod h1:NVkuv1s8wyFvu7d98rdgYwqGKMB6GO1MEUZp5RcWri8=
-github.com/carapace-sh/carapace-bridge v1.5.0 h1:7TaRw1o59QrKDO+7uLxupS8/IOUTOllPLicY8oe08FE=
-github.com/carapace-sh/carapace-bridge v1.5.0/go.mod h1:6C3kzrDWOmQM8FlK3rmTSWFi2I4M8jPCjzWJZWzBHD0=
+github.com/carapace-sh/carapace-bridge v1.5.1 h1:kQ6KrahugCxSuTm+ej8pUFtL6bFSTBy70n+awaZVa9w=
+github.com/carapace-sh/carapace-bridge v1.5.1/go.mod h1:6C3kzrDWOmQM8FlK3rmTSWFi2I4M8jPCjzWJZWzBHD0=
 github.com/carapace-sh/carapace-pflag v1.1.0 h1:uB33wch8ADjP878NadQnbZ5vyROcj/Ac+wUQKMcIrQM=
 github.com/carapace-sh/carapace-pflag v1.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/carapace-sh/carapace-selfupdate v0.0.10 h1:ZvutqGwVvSj6TmI/tLcort63JD6PaOG0ia6squwbTuo=

pkg/actions/tools/jj/change.go

@@ -0,0 +1,18 @@
+package jj
+
+import (
+	"strings"
+
+	"github.com/carapace-sh/carapace"
+)
+
+// ActionChangeIds completes change ids
+//
+//	t (message)
+//	x (another message)
+func ActionChangeIds() carapace.Action {
+	return actionExecJJ("log", "--no-graph", "--template", `change_id.shortest() ++ "\n" ++ description.first_line() ++ "\n"`)(func(output []byte) carapace.Action {
+		lines := strings.Split(string(output), "\n")
+		return carapace.ActionValuesDescribed(lines[:len(lines)-1]...)
+	}).Tag("change ids")
+}

pkg/actions/tools/jj/commit.go

@@ -43,6 +43,7 @@ func ActionPrevCommits(limit int) carapace.Action {
 	}).Tag("previous commits")
 }
 
+// ActionNextCommits completes next commits
 func ActionNextCommits(limit int) carapace.Action {
 	return actionExecJJ("log", "--no-graph", "--template", `commit_id.short() ++ "\t" ++ description.first_line() ++ "\n"`, "--revisions", "@-::", "--limit", strconv.Itoa(limit))(func(output []byte) carapace.Action {
 		lines := strings.Split(string(output), "\n")

pkg/actions/tools/jj/config.go

@@ -9,6 +9,10 @@ import (
 	"github.com/pelletier/go-toml"
 )
 
+// ActionConfigs completes configs
+//
+//	ui.color (never)
+//	ui.editor (hx)
 func ActionConfigs(includeDefaults bool) carapace.Action {
 	if !includeDefaults {
 		return actionConfigs(false)

pkg/actions/tools/jj/rev.go

@@ -12,6 +12,7 @@ type RevOption struct {
 	Commits         int
 	HeadCommits     int
 	Tags            bool
+	ChangeIds       bool
 }
 
 func (o RevOption) Default() RevOption {
@@ -20,6 +21,7 @@ func (o RevOption) Default() RevOption {
 	o.Commits = 100
 	o.HeadCommits = 20
 	o.Tags = true
+	o.ChangeIds = true
 	return o
 
 }
@@ -49,6 +51,10 @@ func ActionRevs(revOption RevOption) carapace.Action {
 			batch = append(batch, ActionTags())
 		}
 
+		if revOption.ChangeIds {
+			batch = append(batch, ActionChangeIds())
+		}
+
 		return batch.ToA()
 	})
 }