Skip to content

H
hub

github / hub
10 个月 前同步成功

通知 3
Star 22523
Fork 2406
H
hub

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 11b467bd 编写于 作者: M Mislav Marohnić 提交者： GitHub
浏览文件
操作

Merge pull request #2297 from tomlazar/show-format 

implement format for `pr show`

Fixes #2288
上级 51a25659 2158b17a
隐藏空白更改
内联 并排
Showing with 95 addition and 11 deletion
commands/pr.go
浏览文件 @ 11b467bd
......@@ -17,8 +17,8 @@ var (
Usage: `
pr list [-s <STATE>] [-h <HEAD>] [-b <BASE>] [-o <SORT_KEY> [-^]] [-f <FORMAT>] [-L <LIMIT>]
pr checkout <PR-NUMBER> [<BRANCH>]
pr show [-uc] [-h <HEAD>]
pr show [-uc] <PR-NUMBER>
pr show [-uc] [-f <FORMAT>] [-h <HEAD>]
pr show [-uc] [-f <FORMAT>] <PR-NUMBER>
`,
Long: `Manage GitHub Pull Requests for the current repository.
......@@ -31,7 +31,10 @@ pr show [-uc] <PR-NUMBER>
Check out the head of a pull request in a new branch.
* _show_:
Open a pull request page in a web browser.
Open a pull request page in a web browser. When no <PR-NUMBER> is
specified, <HEAD> is used to look up open pull requests and defaults to
the current branch name. With '--format', print information about the
pull request instead of opening it.
## Options:
......@@ -166,6 +169,8 @@ hub-issue(1), hub-pull-request(1), hub(1)
-h, --head HEAD
-u, --url
-c, --copy
-f, --format FORMAT
--color
`,
}
)
......@@ -281,31 +286,45 @@ func showPr(command *Command, args *Args) {
baseProject, err := localRepo.MainProject()
utils.Check(err)
host, err := github.CurrentConfig().PromptForHost(baseProject.Host)
utils.Check(err)
gh := github.NewClientWithHost(host)
words := args.Words()
openUrl := ""
prNumber := 0
var pr *github.PullRequest
if len(words) > 0 {
if prNumber, err := strconv.Atoi(words[0]); err == nil {
if prNumber, err = strconv.Atoi(words[0]); err == nil {
openUrl = baseProject.WebURL("", "", fmt.Sprintf("pull/%d", prNumber))
} else {
utils.Check(fmt.Errorf("invalid pull request number: '%s'", words[0]))
}
} else {
pr, err := findCurrentPullRequest(localRepo, baseProject, args.Flag.Value("--head"))
pr, err = findCurrentPullRequest(localRepo, gh, baseProject, args.Flag.Value("--head"))
utils.Check(err)
openUrl = pr.HtmlUrl
}
args.NoForward()
if format := args.Flag.Value("--format"); format != "" {
if pr == nil {
pr, err = gh.PullRequest(baseProject, strconv.Itoa(prNumber))
utils.Check(err)
}
colorize := colorizeOutput(args.Flag.HasReceived("--color"), args.Flag.Value("--color"))
ui.Println(formatPullRequest(*pr, format, colorize))
return
}
printUrl := args.Flag.Bool("--url")
copyUrl := args.Flag.Bool("--copy")
printBrowseOrCopy(args, openUrl, !printUrl && !copyUrl, copyUrl)
}
func findCurrentPullRequest(localRepo *github.GitHubRepo, baseProject *github.Project, headArg string) (*github.PullRequest, error) {
host, err := github.CurrentConfig().PromptForHost(baseProject.Host)
utils.Check(err)
gh := github.NewClientWithHost(host)
func findCurrentPullRequest(localRepo *github.GitHubRepo, gh *github.Client, baseProject *github.Project, headArg string) (*github.PullRequest, error) {
filterParams := map[string]interface{}{
"state": "open",
}
......@@ -321,7 +340,7 @@ func findCurrentPullRequest(localRepo *github.GitHubRepo, baseProject *github.Pr
utils.Check(err)
if headBranch, headProject, err := findPushTarget(currentBranch); err == nil {
headWithOwner = fmt.Sprintf("%s:%s", headProject.Owner, headBranch.ShortName())
} else if headProject, err := deducePushTarget(currentBranch, host.User); err == nil {
} else if headProject, err := deducePushTarget(currentBranch, gh.Host.User); err == nil {
headWithOwner = fmt.Sprintf("%s:%s", headProject.Owner, currentBranch.ShortName())
} else {
headWithOwner = fmt.Sprintf("%s:%s", baseProject.Owner, currentBranch.ShortName())
......
features/pr-show.feature
浏览文件 @ 11b467bd
......@@ -35,6 +35,41 @@ Feature: hub pr show
And the output should contain exactly:
"""
https://github.com/ashemesh/hub/pull/102\n
"""
Scenario: Format Current branch output URL
Given I am on the "topic" branch
Given the GitHub API server:
"""
get('/repos/ashemesh/hub/pulls'){
assert :state => "open",
:head => "ashemesh:topic"
json [{
:number => 102,
:state => "open",
:base => {
:ref => "master",
:label => "github:master",
:repo => { :owner => { :login => "github" } }
},
:head => { :ref => "patch-1", :label => "octocat:patch-1" },
:user => { :login => "octocat" },
:requested_reviewers => [
{ :login => "rey" },
],
:requested_teams => [
{ :slug => "troopers" },
{ :slug => "cantina-band" },
],
:html_url => "https://github.com/ashemesh/hub/pull/102",
}]
}
"""
When I successfully run `hub pr show -f "%sC%>(8)%i %rs%n"`
Then "open https://github.com/ashemesh/hub/pull/102" should not be run
And the output should contain exactly:
"""
#102 rey, github/troopers, github/cantina-band\n
"""
Scenario: Current branch in fork
......@@ -146,6 +181,36 @@ Feature: hub pr show
When I successfully run `hub pr show 102`
Then "open https://github.com/ashemesh/hub/pull/102" should be run
Scenario: Format pull request by number
Given the GitHub API server:
"""
get('/repos/ashemesh/hub/pulls/102') {
json :number => 102,
:title => "First",
:state => "open",
:base => {
:ref => "master",
:label => "github:master",
:repo => { :owner => { :login => "github" } }
},
:head => { :ref => "patch-1", :label => "octocat:patch-1" },
:user => { :login => "octocat" },
:requested_reviewers => [
{ :login => "rey" },
],
:requested_teams => [
{ :slug => "troopers" },
{ :slug => "cantina-band" },
]
}
"""
When I successfully run `hub pr show 102 -f "%sC%>(8)%i %rs%n"`
Then "open https://github.com/ashemesh/hub/pull/102" should not be run
And the output should contain exactly:
"""
#102 rey, github/troopers, github/cantina-band\n
"""
Scenario: Show pull request by invalid number
When I run `hub pr show XYZ`
Then the exit status should be 1
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或