go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Add separate open command for links and check if branch exists on remote before opening pull request link.

Browse Source
This commit is contained in:
Kristijan Husak
2018-10-17 14:20:15 +02:00
parent c69fce2e9d
commit 990dc8c4ea
11 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/commands/pull_request.go
View File

@ -3,7 +3,6 @@ package commands
import (
"errors"
"fmt"
"regexp"
"strings"
)
@ -53,6 +52,12 @@ func NewPullRequest(gitCommand *GitCommand) *PullRequest {
// Create opens link to new pull request in browser
func (pr *PullRequest) Create(branch *Branch) error {
branchExistsOnRemote := pr.GitCommand.CheckRemoteBranchExists(branch)
if !branchExistsOnRemote {
return errors.New(pr.GitCommand.Tr.SLocalize("NoBranchOnRemote"))
}
repoURL := pr.GitCommand.GetRemoteURL()
var gitService *Service
@ -69,19 +74,18 @@ func (pr *PullRequest) Create(branch *Branch) error {
repoInfo := getRepoInfoFromURL(repoURL)
return pr.GitCommand.OSCommand.OpenFile(fmt.Sprintf(
return pr.GitCommand.OSCommand.OpenLink(fmt.Sprintf(
gitService.PullRequestURL, repoInfo.Owner, repoInfo.Repository, branch.Name,
))
}
func getRepoInfoFromURL(url string) *RepoInformation {
isHTTP := strings.HasPrefix(url, "http")
removeGitExtension := regexp.MustCompile(`\.git$`)
if isHTTP {
splits := strings.Split(url, "/")
owner := splits[len(splits)-2]
repo := removeGitExtension.ReplaceAllString(splits[len(splits)-1], "")
repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
return &RepoInformation{
Owner: owner,
@ -92,7 +96,7 @@ func getRepoInfoFromURL(url string) *RepoInformation {
tmpSplit := strings.Split(url, ":")
splits := strings.Split(tmpSplit[1], "/")
owner := splits[0]
repo := removeGitExtension.ReplaceAllString(splits[1], "")
repo := strings.TrimSuffix(splits[1], ".git")
return &RepoInformation{
Owner: owner,