Skip to content

feat: numeric-id positional heuristic for PR commands (bb pr 42 from inside a checkout) #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniel-pittman merged 2 commits into from
Jun 28, 2026
Merged

feat: numeric-id positional heuristic for PR commands (bb pr 42 from inside a checkout) #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2624804
feat: numeric-id positional heuristic for PR commands
daniel-pittman Jun 28, 2026
6392030
Address PR #40 MEDIUM: usage check must precede 'shift $pr_args_consu…
daniel-pittman Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 74 additions & 32 deletions bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,38 @@ resolve_workspace() {
fi
}

# Resolve positional args for PR commands of shape `bb <verb> [repo] <id> [extras...]`.
# Sets caller-scope:
# repo -- via resolve_repo (caller must `local repo`)
# pr_id -- the PR id (caller must `local pr_id`)
# pr_args_consumed -- 1 or 2 (caller `shift $pr_args_consumed` to reach extras)
#
# Heuristic: if $1 is purely digits, treat it as the id and auto-detect the
# repo from git. Otherwise $1 is the [repo] slot and $2 is the id (the
# existing positional form, unchanged). This makes `bb pr 42` Just Work
# from inside a checkout instead of treating 42 as a repo slug. Mirrors
# the state-recognition heuristic in cmd_pr_list (bb prs MERGED).
#
# Tradeoff: a repo literally named with pure digits (e.g. slug "42") would
# be shadowed by the heuristic. Acceptable: Bitbucket slugs by convention
# are lowercase-hyphenated, pure-digit slugs are vanishingly rare, and the
# explicit "workspace/42" form remains as a clean escape hatch (the
# heuristic only triggers on the bare-digits form).
_resolve_pr_args() {
case "${1:-}" in
''|*[!0-9]*)
resolve_repo "${1:-}"
pr_id="${2:-}"
pr_args_consumed=2
;;
*)
resolve_repo ""
pr_id="$1"
pr_args_consumed=1
;;
esac
}

repo_path() {
local repo="$1"
# Validate inputs at the boundary so a malformed slug doesn't
Expand Down Expand Up @@ -935,12 +967,11 @@ cmd_pr_list() {
}

cmd_pr_view() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-view [repo] <pr-id>" >&2
echo "Usage: bb pr-view [repo] <pr-id> (or: bb pr <id> from inside a checkout)" >&2
exit 1
fi

Expand Down Expand Up @@ -1077,9 +1108,8 @@ cmd_pr_create() {
}

cmd_pr_approve() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-approve [repo] <pr-id>" >&2
Expand All @@ -1099,9 +1129,8 @@ cmd_pr_approve() {
}

cmd_pr_unapprove() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-unapprove [repo] <pr-id>" >&2
Expand All @@ -1120,16 +1149,20 @@ cmd_pr_unapprove() {
}

cmd_pr_merge() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local strategy="${3:-merge_commit}"

local repo pr_id pr_args_consumed
_resolve_pr_args "$@"
# Check usage BEFORE `shift $pr_args_consumed`. If the user passed a
# single non-numeric arg (e.g. `bb pr-merge myrepo` with no id),
# pr_args_consumed=2 but only 1 positional exists, so shift 2 returns
# non-zero, which under `set -euo pipefail` aborts the script before
# the friendly Usage message can print.
if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-merge [repo] <pr-id> [strategy]" >&2
echo "Usage: bb pr-merge [repo] <pr-id> [strategy] (or: bb pr-merge <id> [strategy] from inside a checkout)" >&2
echo " Strategies: merge_commit (default), squash, fast_forward" >&2
exit 1
fi
shift $pr_args_consumed
local strategy="${1:-merge_commit}"

# Validate strategy against Bitbucket's accepted set so a typo
# (e.g. "squash_commit") fails locally with a clear message
Expand Down Expand Up @@ -1168,9 +1201,8 @@ cmd_pr_merge() {
}

cmd_pr_decline() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-decline [repo] <pr-id>" >&2
Expand All @@ -1188,9 +1220,8 @@ cmd_pr_decline() {
}

cmd_pr_diff() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-diff [repo] <pr-id>" >&2
Expand All @@ -1207,9 +1238,8 @@ cmd_pr_diff() {
}

cmd_pr_comments() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"

if [[ -z "$pr_id" ]]; then
echo "Usage: bb pr-comments [repo] <pr-id>" >&2
Expand All @@ -1231,17 +1261,25 @@ cmd_pr_comments() {
}

cmd_pr_comment_add() {
local repo
resolve_repo "${1:-}"
local pr_id="${2:-}"
local body="${3:-}"

if [[ -z "$pr_id" || -z "$body" ]]; then
echo "Usage: bb pr-comment [repo] <pr-id> <body>" >&2
local repo pr_id pr_args_consumed
_resolve_pr_args "$@"
# Same ordering rule as cmd_pr_merge: check pr_id BEFORE shift to
# avoid `shift 2` aborting under `set -euo pipefail` when the user
# passed only one (non-numeric) arg.
_usage_pr_comment() {
echo "Usage: bb pr-comment [repo] <pr-id> <body> (or: bb pr-comment <id> <body> from inside a checkout)" >&2
echo "" >&2
echo " Add a top-level comment to PR #<pr-id>." >&2
echo " Use single quotes around <body> if it contains spaces or shell metacharacters." >&2
exit 1
}
if [[ -z "$pr_id" ]]; then
_usage_pr_comment
fi
shift $pr_args_consumed
local body="${1:-}"
if [[ -z "$body" ]]; then
_usage_pr_comment
fi

# Bitbucket's contract: POST {"content": {"raw": "<text>"}}.
Expand Down Expand Up @@ -2745,6 +2783,10 @@ GLOBAL FLAGS

NOTES
[repo] is auto-detected from the current git remote if omitted.
For PR-id commands (pr / pr-merge / pr-diff / pr-comments / pr-approve /
pr-unapprove / pr-decline / pr-comment), a bare numeric first arg is
treated as the PR id and the repo is auto-detected (e.g. `bb pr 42` from
inside the checkout). Pass `workspace/slug <id>` for an explicit repo.
Config: ~/.config/bb/config or env vars BB_USER, BB_TOKEN, BB_WORKSPACE.

Auth uses Atlassian API tokens with HTTP Basic auth.
Expand Down
Loading