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

move remotes and remote branches

Browse Source
This commit is contained in:
Jesse Duffield
2020-09-29 18:41:06 +10:00
parent e849ca3372
commit eda4619a4f
9 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/commands/loading_remotes.go
View File

@ -5,9 +5,11 @@ import (
"regexp"
"sort"
"strings"
"github.com/jesseduffield/lazygit/pkg/models"
)
func (c *GitCommand) GetRemotes() ([]*Remote, error) {
func (c *GitCommand) GetRemotes() ([]*models.Remote, error) {
// get remote branches
unescaped := "git branch -r"
remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped)
@ -21,21 +23,21 @@ func (c *GitCommand) GetRemotes() ([]*Remote, error) {
}
// first step is to get our remotes from go-git
remotes := make([]*Remote, len(goGitRemotes))
remotes := make([]*models.Remote, len(goGitRemotes))
for i, goGitRemote := range goGitRemotes {
remoteName := goGitRemote.Config().Name
re := regexp.MustCompile(fmt.Sprintf(`%s\/([\S]+)`, remoteName))
matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
branches := make([]*RemoteBranch, len(matches))
branches := make([]*models.RemoteBranch, len(matches))
for j, match := range matches {
branches[j] = &RemoteBranch{
branches[j] = &models.RemoteBranch{
Name: match[1],
RemoteName: remoteName,
}
}
remotes[i] = &Remote{
remotes[i] = &models.Remote{
Name: goGitRemote.Config().Name,
Urls: goGitRemote.Config().URLs,
Branches: branches,