Disable inherited askpass helpers and limit retained output-pipe waits to two seconds. Preserve UNKNOWN for incomplete remote output. Agent-Signature: codex-gpt-6.1-sol-high on behalf of Vishnu Jayavel
211 lines
7.6 KiB
Go
211 lines
7.6 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/steveyegge/beads/internal/beads"
|
|
"github.com/steveyegge/beads/internal/doltremote"
|
|
)
|
|
|
|
// isGitRepo checks if the current working directory is in a git repository.
|
|
// NOTE: This intentionally checks CWD, not the beads repo. It's used as a guard
|
|
// before calling other git functions to prevent hangs on Windows (GH#727).
|
|
// Does not use RepoContext because it's a prerequisite check for git availability.
|
|
func isGitRepo() bool {
|
|
cmd := exec.Command("git", "rev-parse", "--git-dir")
|
|
return cmd.Run() == nil
|
|
}
|
|
|
|
// isBareGitRepo checks if the current git repository is bare.
|
|
// Returns false when not in a git repository.
|
|
func isBareGitRepo() bool {
|
|
cmd := exec.Command("git", "rev-parse", "--is-bare-repository")
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return strings.TrimSpace(string(output)) == "true"
|
|
}
|
|
|
|
// gitHasUpstream checks if the current branch has an upstream configured in the beads repository.
|
|
// Uses RepoContext to ensure git commands run in the correct repository.
|
|
// Uses git config directly for compatibility with Git for Windows.
|
|
func gitHasUpstream() bool {
|
|
rc, err := beads.GetRepoContext()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
|
|
ctx := context.Background()
|
|
// Get current branch name
|
|
branchCmd := rc.GitCmd(ctx, "symbolic-ref", "--short", "HEAD")
|
|
branchOutput, err := branchCmd.Output()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
branch := strings.TrimSpace(string(branchOutput))
|
|
|
|
return gitBranchHasUpstream(branch)
|
|
}
|
|
|
|
// gitHasAnyRemotes returns true if the git repository has any remotes configured.
|
|
// Used to distinguish between "new repo with no remotes" and "repo with origin but no upstream".
|
|
func gitHasAnyRemotes() bool {
|
|
rc, err := beads.GetRepoContext()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
|
|
ctx := context.Background()
|
|
remoteCmd := rc.GitCmd(ctx, "remote")
|
|
output, err := remoteCmd.Output()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return strings.TrimSpace(string(output)) != ""
|
|
}
|
|
|
|
// gitOriginGetURL returns the URL for the origin git remote.
|
|
func gitOriginGetURL() (string, error) {
|
|
cmd := exec.Command("git", "remote", "get-url", "origin")
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(output)), nil
|
|
}
|
|
|
|
func gitOriginGetURLForActiveRepo(ctx context.Context) (string, error) {
|
|
rc, err := beads.GetRepoContext()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
cmd := rc.GitCmd(ctx, "remote", "get-url", "origin")
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(output)), nil
|
|
}
|
|
|
|
// gitOriginHasDoltDataRef checks if origin has refs/dolt/data.
|
|
// Returns false on any error (network, no remote, timeout, etc).
|
|
// Uses a 10s timeout since this is a network call used for auto-detection,
|
|
// and suppresses credential prompts to avoid blocking on SSH remotes.
|
|
func gitOriginHasDoltDataRef() bool {
|
|
return gitRemoteHasDoltDataRef("origin")
|
|
}
|
|
|
|
func gitRemoteHasDoltDataRef(remote string) bool {
|
|
hasData, err := gitRemoteHasDoltDataRefStatus(remote)
|
|
return err == nil && hasData
|
|
}
|
|
|
|
// gitOriginHasDoltDataRefStatus is the tri-state form: no data vs. unknown.
|
|
func gitOriginHasDoltDataRefStatus() (bool, error) {
|
|
return gitRemoteHasDoltDataRefStatus("origin")
|
|
}
|
|
|
|
// A non-nil error means UNKNOWN, not "no data" — the bool is meaningless.
|
|
//
|
|
// The error names the failure, not the remote: every caller already names the
|
|
// remote it probed, and wrapping here too produced messages that said the URL
|
|
// and the ref twice ("...on sync.remote \"X\": probe refs/dolt/data on X: exit
|
|
// status 128").
|
|
func gitRemoteHasDoltDataRefStatus(remote string) (bool, error) {
|
|
ctx, cancel := context.WithTimeout(context.Background(), gitDoltDataProbeTimeout)
|
|
defer cancel()
|
|
// #nosec G702 -- no shell is involved: the binary is the literal "git" and
|
|
// the remote URL is its own argv element, so it cannot inject a command.
|
|
// The value is this repo's configured sync remote, local operator state
|
|
// rather than request data; gosec only reaches it because this PR routed
|
|
// config discovery through env-derived paths (see testSSHConnectivity in
|
|
// dolt.go for the same taint path).
|
|
cmd := exec.CommandContext(ctx, "git", "ls-remote", gitRemoteURLForLsRemote(remote), "refs/dolt/data")
|
|
// Terminal prompts and inherited askpass helpers can block an advisory probe.
|
|
cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0", "GIT_ASKPASS=", "SSH_ASKPASS=")
|
|
// Descendants may retain stdout/stderr after Git exits or the context expires.
|
|
// Bound that pipe wait separately from the 10-second network deadline.
|
|
cmd.WaitDelay = 2 * time.Second
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return false, gitLsRemoteProbeError(ctx, err)
|
|
}
|
|
return strings.TrimSpace(string(output)) != "", nil
|
|
}
|
|
|
|
const gitDoltDataProbeTimeout = 10 * time.Second
|
|
|
|
// gitLsRemoteProbeError turns a failed `git ls-remote` into something a user
|
|
// can act on. exec.ExitError.Error() is only "exit status 128" — git's actual
|
|
// complaint (auth vs. DNS vs. deleted repo) sits unread in ExitError.Stderr
|
|
// because cmd.Output() captures it there, and a context timeout surfaces as
|
|
// the equally opaque "signal: killed".
|
|
func gitLsRemoteProbeError(ctx context.Context, err error) error {
|
|
if ctx.Err() == context.DeadlineExceeded {
|
|
return fmt.Errorf("git ls-remote did not answer within %s (network, or an SSH key that wants a passphrase)", gitDoltDataProbeTimeout)
|
|
}
|
|
var exitErr *exec.ExitError
|
|
if errors.As(err, &exitErr) {
|
|
// git can echo the remote it failed to reach — including a CI token in
|
|
// https://x-access-token:<token>@host form — so scrub credentials before
|
|
// this detail reaches plan.Reason, which flows to both stderr and
|
|
// `bd bootstrap --json`. exitErr itself is only "exit status 128".
|
|
if detail := scrubURLCredentials(firstNonEmptyLine(string(exitErr.Stderr))); detail != "" {
|
|
return fmt.Errorf("git ls-remote: %v: %s", exitErr, detail)
|
|
}
|
|
}
|
|
return fmt.Errorf("git ls-remote: %w", err)
|
|
}
|
|
|
|
// firstNonEmptyLine returns the first meaningful line of git's stderr. git
|
|
// prefixes most failures with a "remote:"/"fatal:" line that already says
|
|
// everything; the rest is usually a hint block we do not want inside a
|
|
// single-line Reason.
|
|
func firstNonEmptyLine(s string) string {
|
|
for _, line := range strings.Split(s, "\n") {
|
|
if trimmed := strings.TrimSpace(line); trimmed != "" {
|
|
return trimmed
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func gitRemoteURLForLsRemote(remote string) string {
|
|
return strings.TrimPrefix(remote, "git+")
|
|
}
|
|
|
|
// gitURLToDoltRemote converts a git remote URL to dolt's remote format.
|
|
// HTTPS URLs get "git+" prefix: https://... → git+https://...
|
|
// SCP-style SSH URLs are converted: git@host:path → git+ssh://git@host/path
|
|
// SSH URLs get "git+" prefix: ssh://... → git+ssh://...
|
|
// URLs that already have "git+" prefix are returned as-is.
|
|
func gitURLToDoltRemote(url string) string {
|
|
return doltremote.FromGitURL(url)
|
|
}
|
|
|
|
// gitBranchHasUpstream checks if a specific branch has an upstream configured.
|
|
// Unlike gitHasUpstream(), this works even when HEAD is detached (e.g., jj/jujutsu).
|
|
// Uses RepoContext to ensure git commands run in the correct repository.
|
|
func gitBranchHasUpstream(branch string) bool {
|
|
rc, err := beads.GetRepoContext()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
|
|
ctx := context.Background()
|
|
// Check if remote and merge refs are configured for the branch
|
|
remoteCmd := rc.GitCmd(ctx, "config", "--get", fmt.Sprintf("branch.%s.remote", branch)) //nolint:gosec // G204: branch from caller
|
|
mergeCmd := rc.GitCmd(ctx, "config", "--get", fmt.Sprintf("branch.%s.merge", branch)) //nolint:gosec // G204: branch from caller
|
|
|
|
remoteErr := remoteCmd.Run()
|
|
mergeErr := mergeCmd.Run()
|
|
|
|
return remoteErr == nil && mergeErr == nil
|
|
}
|