Gitlink
/
gitlink-cli
0
0
Fork 49
Code Issues Pull Requests 11 Packages Projects Releases 10 Wiki Activity

feat(pr): 全部 pr 子命令统一支持 --number（--id 保留为兼容别名） #341

Merged
wbtiger merged 1 commits from Taoyouce/gitlink-cli:feat/pr-number-alias into master 2026-07-14 20:37:22 +08:00
Conversation 0 Commits 1 Files Changed 3 +65 -24
3 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/i18n/locales/en-US.json
View File

@ -183,9 +183,10 @@
"flag.pr.body": "PR description",
"flag.pr.file": "Filter diff by file path",
"flag.pr.head": "Source branch",
"flag.pr.id": "PR number",
"flag.pr.id": "Compatibility alias for --number",
"flag.pr.merge_method": "Merge method: merge, rebase, squash",
"flag.pr.milestone_id": "Milestone ID",
"flag.pr.number": "PR number from the web URL (preferred)",
"flag.pr.priority_id": "Priority ID",
"flag.pr.review_commit": "Commit SHA to attach the review to",
"flag.pr.review_content": "Review content",

3
internal/i18n/locales/zh-CN.json
View File

@ -183,9 +183,10 @@
"flag.pr.body": "PR 描述",
"flag.pr.file": "按文件路径筛选 diff",
"flag.pr.head": "源分支",
"flag.pr.id": "PR 编号",
"flag.pr.id": "--number 的兼容别名",
"flag.pr.merge_method": "合并方式：merge、rebase、squash",
"flag.pr.milestone_id": "里程碑 ID",
"flag.pr.number": "网页 URL 中的 PR 编号（首选）",
"flag.pr.priority_id": "优先级 ID",
"flag.pr.review_commit": "关联评审的 Commit SHA",
"flag.pr.review_content": "评审内容",

83
shortcuts/pr/pr.go
View File

@ -127,13 +127,17 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "view",
Description: tr.T("cmd.pr.view.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
env, err := ctx.CallAPI("GET", fmt.Sprintf("%s/pulls/%s", ctx.RepoPath(), id), nil)
if err != nil {
return err
@ -148,14 +152,18 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "merge",
Description: tr.T("cmd.pr.merge.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
{Name: "method", Short: "m", Usage: tr.T("flag.pr.merge_method"), Default: "merge"},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
method := ctx.Arg("method")
if method == "" {
method = "merge"
@ -174,13 +182,17 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "refuse",
Description: "Refuse and close a pull request",
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
env, err := ctx.CallAPI("POST", fmt.Sprintf("%s/pulls/%s/refuse_merge", ctx.RepoPath(), id), nil)
if err != nil {
return err
@ -192,13 +204,14 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "reopen",
Description: "Reopen a closed pull request",
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: "PR number", Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, err := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
@ -213,13 +226,17 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "files",
Description: tr.T("cmd.pr.files.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
env, err := ctx.CallAPI("GET", fmt.Sprintf("%s/pulls/%s/files", ctx.RepoPath(), id), nil)
if err != nil {
return err
@ -231,13 +248,17 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "diff",
Description: tr.T("cmd.pr.diff.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
env, err := ctx.CallAPI("GET", fmt.Sprintf("%s/pulls/%s/files", ctx.RepoPath(), id), nil)
if err != nil {
return err
@ -249,13 +270,14 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "versions",
Description: tr.T("cmd.pr.versions.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, err := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
@ -270,7 +292,8 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "version-diff",
Description: tr.T("cmd.pr.version_diff.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
{Name: "version-id", Short: "v", Usage: tr.T("flag.pr.version_id"), Required: true},
{Name: "file", Short: "f", Usage: tr.T("flag.pr.file")},
},
@ -278,7 +301,7 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, err := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
@ -307,14 +330,15 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "reviews",
Description: tr.T("cmd.pr.reviews.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
{Name: "status", Short: "s", Usage: tr.T("flag.pr.review_status_filter")},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, err := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
@ -336,7 +360,8 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "review",
Description: tr.T("cmd.pr.review.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
{Name: "status", Short: "s", Usage: tr.T("flag.pr.review_status"), Default: "common"},
{Name: "content", Short: "c", Usage: tr.T("flag.pr.review_content"), Required: true},
{Name: "commit", Short: "m", Usage: tr.T("flag.pr.review_commit")},
@ -346,7 +371,7 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, err := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
@ -402,14 +427,18 @@ func Shortcuts(translators ...*i18n.Translator) []*common.Shortcut {
Name: "comment",
Description: tr.T("cmd.pr.comment.short"),
Flags: []common.Flag{
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id"), Required: true},
{Name: "number", Short: "n", Usage: tr.T("flag.pr.number")},
{Name: "id", Short: "i", Usage: tr.T("flag.pr.id")},
{Name: "body", Short: "b", Usage: tr.T("flag.comment.body"), Required: true},
},
Run: func(ctx *common.RuntimeContext) error {
if err := ctx.ResolveOwnerRepo(); err != nil {
return err
}
id, _ := ctx.RequireArg("id")
id, err := prNumberArg(ctx)
if err != nil {
return err
}
body, _ := ctx.RequireArg("body")
prEnv, err := ctx.CallAPI("GET", fmt.Sprintf("%s/pulls/%s", ctx.RepoPath(), id), nil)
@ -559,3 +588,13 @@ func numberField(m map[string]interface{}, key string) (float64, bool) {
return 0, false
}
}
func prNumberArg(ctx *common.RuntimeContext) (string, error) {
if number := strings.TrimSpace(ctx.Arg("number")); number != "" {
return number, nil
}
if id := strings.TrimSpace(ctx.Arg("id")); id != "" {
return id, nil
}
return "", fmt.Errorf("required flag --number is missing (or use --id as a compatibility alias)")
}