feat: add --stdin flag to bd vc commit (bd-0twn2)
Allow reading commit message from stdin for multi-line messages with special characters, following the pattern from bd audit record. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Executed-By: beads/polecats/onyx Rig: beads Role: polecats
This commit is contained in:
parent
e3566ffc9c
commit
6e136ef67f
2 changed files with 130 additions and 2 deletions
21
cmd/bd/vc.go
21
cmd/bd/vc.go
|
|
@ -2,6 +2,9 @@ package main
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/beads/internal/storage"
|
||||
|
|
@ -109,6 +112,7 @@ Examples:
|
|||
}
|
||||
|
||||
var vcCommitMessage string
|
||||
var vcCommitStdin bool
|
||||
|
||||
var vcCommitCmd = &cobra.Command{
|
||||
Use: "commit",
|
||||
|
|
@ -117,12 +121,24 @@ var vcCommitCmd = &cobra.Command{
|
|||
|
||||
Examples:
|
||||
bd vc commit -m "Added new feature issues"
|
||||
bd vc commit --message "Fixed priority on several issues"`,
|
||||
bd vc commit --message "Fixed priority on several issues"
|
||||
echo "Multi-line message" | bd vc commit --stdin`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
ctx := rootCtx
|
||||
|
||||
if vcCommitStdin {
|
||||
if vcCommitMessage != "" {
|
||||
FatalErrorRespectJSON("cannot specify both --stdin and -m/--message")
|
||||
}
|
||||
b, err := io.ReadAll(os.Stdin)
|
||||
if err != nil {
|
||||
FatalErrorRespectJSON("failed to read commit message from stdin: %v", err)
|
||||
}
|
||||
vcCommitMessage = strings.TrimRight(string(b), "\n")
|
||||
}
|
||||
|
||||
if vcCommitMessage == "" {
|
||||
FatalErrorRespectJSON("commit message is required (use -m or --message)")
|
||||
FatalErrorRespectJSON("commit message is required (use -m, --message, or --stdin)")
|
||||
}
|
||||
|
||||
// Check if storage supports versioning
|
||||
|
|
@ -200,6 +216,7 @@ Examples:
|
|||
func init() {
|
||||
vcMergeCmd.Flags().StringVar(&vcMergeStrategy, "strategy", "", "Conflict resolution strategy: 'ours' or 'theirs'")
|
||||
vcCommitCmd.Flags().StringVarP(&vcCommitMessage, "message", "m", "", "Commit message")
|
||||
vcCommitCmd.Flags().BoolVar(&vcCommitStdin, "stdin", false, "Read commit message from stdin")
|
||||
|
||||
vcCmd.AddCommand(vcMergeCmd)
|
||||
vcCmd.AddCommand(vcCommitCmd)
|
||||
|
|
|
|||
111
cmd/bd/vc_test.go
Normal file
111
cmd/bd/vc_test.go
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestVcCommitStdinFlag(t *testing.T) {
|
||||
t.Run("StdinReadsMessage", func(t *testing.T) {
|
||||
// Save and restore globals
|
||||
origMessage := vcCommitMessage
|
||||
origStdin := vcCommitStdin
|
||||
t.Cleanup(func() {
|
||||
vcCommitMessage = origMessage
|
||||
vcCommitStdin = origStdin
|
||||
})
|
||||
|
||||
// Create a pipe to simulate stdin
|
||||
r, w, err := os.Pipe()
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create pipe: %v", err)
|
||||
}
|
||||
|
||||
oldStdin := os.Stdin
|
||||
os.Stdin = r
|
||||
t.Cleanup(func() { os.Stdin = oldStdin })
|
||||
|
||||
content := "Multi-line commit message\nWith special chars: 'quotes' & \"doubles\"\n"
|
||||
go func() {
|
||||
w.WriteString(content)
|
||||
w.Close()
|
||||
}()
|
||||
|
||||
// Simulate what the Run function does when --stdin is set
|
||||
vcCommitStdin = true
|
||||
vcCommitMessage = ""
|
||||
|
||||
cmd := vcCommitCmd
|
||||
cmd.SetArgs([]string{"--stdin"})
|
||||
if err := cmd.ParseFlags([]string{"--stdin"}); err != nil {
|
||||
t.Fatalf("failed to parse flags: %v", err)
|
||||
}
|
||||
|
||||
// Verify the flag is registered and parsed
|
||||
stdinVal, err := cmd.Flags().GetBool("stdin")
|
||||
if err != nil {
|
||||
t.Fatalf("--stdin flag not found: %v", err)
|
||||
}
|
||||
if !stdinVal {
|
||||
t.Error("expected --stdin to be true")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("StdinAndMessageConflict", func(t *testing.T) {
|
||||
// Verify both flags can be set (conflict check happens at runtime in Run)
|
||||
cmd := vcCommitCmd
|
||||
if err := cmd.ParseFlags([]string{"--stdin", "-m", "test"}); err != nil {
|
||||
t.Fatalf("failed to parse flags: %v", err)
|
||||
}
|
||||
|
||||
stdinVal, _ := cmd.Flags().GetBool("stdin")
|
||||
msgVal, _ := cmd.Flags().GetString("message")
|
||||
|
||||
if !stdinVal {
|
||||
t.Error("expected --stdin to be true")
|
||||
}
|
||||
if msgVal != "test" {
|
||||
t.Errorf("expected message 'test', got %q", msgVal)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("StdinFlagRegistered", func(t *testing.T) {
|
||||
// Verify the --stdin flag exists on the commit command
|
||||
flag := vcCommitCmd.Flags().Lookup("stdin")
|
||||
if flag == nil {
|
||||
t.Fatal("--stdin flag not registered on vc commit command")
|
||||
}
|
||||
if flag.Usage != "Read commit message from stdin" {
|
||||
t.Errorf("unexpected usage text: %q", flag.Usage)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("TrailingNewlinesTrimmed", func(t *testing.T) {
|
||||
// Verify strings.TrimRight behavior for the stdin path
|
||||
// This tests the trimming logic used in the command
|
||||
input := "commit message\n\n"
|
||||
expected := "commit message"
|
||||
got := trimTrailingNewlines(input)
|
||||
if got != expected {
|
||||
t.Errorf("expected %q, got %q", expected, got)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("PreservesInternalNewlines", func(t *testing.T) {
|
||||
input := "line 1\nline 2\nline 3\n"
|
||||
expected := "line 1\nline 2\nline 3"
|
||||
got := trimTrailingNewlines(input)
|
||||
if got != expected {
|
||||
t.Errorf("expected %q, got %q", expected, got)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// trimTrailingNewlines mirrors the strings.TrimRight(s, "\n") used in vcCommitCmd.
|
||||
func trimTrailingNewlines(s string) string {
|
||||
// This matches the behavior in vc.go: strings.TrimRight(string(b), "\n")
|
||||
for len(s) > 0 && s[len(s)-1] == '\n' {
|
||||
s = s[:len(s)-1]
|
||||
}
|
||||
return s
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue