utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-15 01:56:24 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix conflicts

Browse source
This commit is contained in:
Yuki Osaki 2022-02-25 11:46:16 +09:00
parent ed4e7ac960
commit c3d2722cb8
17 changed files with 180 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/keybindings/Keybindings_pl.md
View file

@ -43,8 +43,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>space</kbd>: przełącz
<kbd>o</kbd>: utwórz żądanie pobrania
<kbd>O</kbd>: utwórz opcje żądania ściągnięcia
<kbd>o</kbd>: maak of laat een pull-request zien
<kbd>O</kbd>: utwórz opcje żądania
<kbd>ctrl+y</kbd>: skopiuj adres URL żądania pobrania do schowka
<kbd>c</kbd>: przełącz używając nazwy
<kbd>F</kbd>: wymuś przełączenie

2
docs/keybindings/Keybindings_zh.md
View file

@ -44,7 +44,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>space</kbd>: 检出
<kbd>o</kbd>: 创建抓取请求
<kbd>O</kbd>: 创建抓取请求选项
<kbd>O</kbd>: 创建抓取请求
<kbd>ctrl+y</kbd>: 将抓取请求 URL 复制到剪贴板
<kbd>c</kbd>: 按名称检出
<kbd>F</kbd>: 强制检出

2
pkg/app/app.go
View file

@ -150,7 +150,7 @@ func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
}
func (app *App) validateGhVersion() error {
output, err := app.OSCommand.RunCommandWithOutput("gh --version")
output, err := app.OSCommand.Cmd.New("gh --version").RunWithOutput()
// if we get an error anywhere here we'll show the same status
minVersionError := errors.New(app.Tr.MinGhVersionError)
if err != nil {

3
pkg/commands/git.go
View file

@ -37,6 +37,7 @@ type GitCommand struct {
Tag *git_commands.TagCommands
WorkingTree *git_commands.WorkingTreeCommands
Bisect *git_commands.BisectCommands
Gh *git_commands.GhCommands
Loaders Loaders
}
@ -115,6 +116,7 @@ func NewGitCommandAux(
patchManager := patch.NewPatchManager(cmn.Log, workingTreeCommands.ApplyPatch, workingTreeCommands.ShowFileDiff)
patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchManager)
bisectCommands := git_commands.NewBisectCommands(gitCommon)
ghCommands := git_commands.NewGhCommand(gitCommon)
return &GitCommand{
Branch: branchCommands,
@ -133,6 +135,7 @@ func NewGitCommandAux(
Tag: tagCommands,
Bisect: bisectCommands,
WorkingTree: workingTreeCommands,
Gh: ghCommands,
Loaders: Loaders{
Branches: loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName, configCommands),
CommitFiles: loaders.NewCommitFileLoader(cmn, cmd),

128
pkg/commands/git_commands/gh.go Normal file
View file

@ -0,0 +1,128 @@
package git_commands
import (
"encoding/json"
"fmt"
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/hosting_service"
"github.com/jesseduffield/lazygit/pkg/commands/models"
)
type GhCommands struct {
*GitCommon
}
func NewGhCommand(gitCommon *GitCommon) *GhCommands {
return &GhCommands{
GitCommon: gitCommon,
}
}
// https://github.com/cli/cli/issues/2300
func (self *GhCommands) BaseRepo() error {
return self.cmd.New("git config --local --get-regexp .gh-resolved").StreamOutput().Run()
}
// Ex: git config --local --add "remote.origin.gh-resolved" "jesseduffield/lazygit"
func (self *GhCommands) SetBaseRepo(repository string) (string, error) {
return self.cmd.NewShell(fmt.Sprintf("git config --local --add \"remote.origin.gh-resolved\" \"%s\"", repository)).RunWithOutput()
}
func (self *GhCommands) prList() (string, error) {
return self.cmd.NewShell("gh pr list --limit 100 --state all --json state,url,number,headRefName,headRepositoryOwner").RunWithOutput()
}
func (self *GhCommands) GithubMostRecentPRs() ([]*models.GithubPullRequest, error) {
commandOutput, err := self.prList()
if err != nil {
return nil, err
}
prs := []*models.GithubPullRequest{}
err = json.Unmarshal([]byte(commandOutput), &prs)
if err != nil {
return nil, err
}
return prs, nil
}
func GenerateGithubPullRequestMap(prs []*models.GithubPullRequest, branches []*models.Branch, remotes []*models.Remote) (map[*models.Branch]*models.GithubPullRequest, error) {
res := map[*models.Branch]*models.GithubPullRequest{}
if len(prs) == 0 {
return res, nil
}
remotesToOwnersMap, err := getRemotesToOwnersMap(remotes)
if len(remotesToOwnersMap) == 0 {
return res, err
}
prWithStringKey := map[string]models.GithubPullRequest{}
for _, pr := range prs {
prWithStringKey[pr.UserName()+":"+pr.BranchName()] = *pr
}
for _, branch := range branches {
if !branch.IsTrackingRemote() || branch.UpstreamBranch == "" {
continue
}
owner, foundRemoteOwner := remotesToOwnersMap[branch.UpstreamRemote]
if !foundRemoteOwner {
continue
}
pr, hasPr := prWithStringKey[owner+":"+branch.UpstreamBranch]
if !hasPr {
continue
}
res[branch] = &pr
}
return res, nil
}
func GetRepoInfoFromURL(url string) hosting_service.RepoInformation {
isHTTP := strings.HasPrefix(url, "http")
if isHTTP {
splits := strings.Split(url, "/")
owner := strings.Join(splits[3:len(splits)-1], "/")
repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
return hosting_service.RepoInformation{
Owner: owner,
Repository: repo,
}
}
tmpSplit := strings.Split(url, ":")
splits := strings.Split(tmpSplit[1], "/")
owner := strings.Join(splits[0:len(splits)-1], "/")
repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
return hosting_service.RepoInformation{
Owner: owner,
Repository: repo,
}
}
func getRemotesToOwnersMap(remotes []*models.Remote) (map[string]string, error) {
res := map[string]string{}
for _, remote := range remotes {
if len(remote.Urls) == 0 {
continue
}
res[remote.Name] = GetRepoInfoFromURL(remote.Urls[0]).Owner
}
return res, nil
}

62
pkg/commands/github.go
View file

@ -1,62 +0,0 @@
package commands
import (
"encoding/json"
"github.com/jesseduffield/lazygit/pkg/commands/models"
)
func (c *GitCommand) GithubMostRecentPRs() ([]*models.GithubPullRequest, error) {
commandOutput, err := c.OSCommand.RunCommandWithOutput("gh pr list --limit 50 --state all --json state,url,number,headRefName,headRepositoryOwner")
if err != nil {
return nil, err
}
prs := []*models.GithubPullRequest{}
err = json.Unmarshal([]byte(commandOutput), &prs)
if err != nil {
return nil, err
}
return prs, nil
}
func (c *GitCommand) GenerateGithubPullRequestMap(prs []*models.GithubPullRequest, branches []*models.Branch, remotes []*models.Remote) (map[*models.Branch]*models.GithubPullRequest, error) {
res := map[*models.Branch]*models.GithubPullRequest{}
if len(prs) == 0 {
return res, nil
}
remotesToOwnersMap, err := c.GetRemotesToOwnersMap(remotes)
if len(remotesToOwnersMap) == 0 {
return res, err
}
prWithStringKey := map[string]models.GithubPullRequest{}
for _, pr := range prs {
prWithStringKey[pr.UserName()+":"+pr.BranchName()] = *pr
}
for _, branch := range branches {
if !branch.IsTrackingRemote() || branch.BranchName() == "" {
continue
}
owner, foundRemoteOwner := remotesToOwnersMap[branch.RemoteName()]
if branch.BranchName() == "" || !foundRemoteOwner {
continue
}
pr, hasPr := prWithStringKey[owner+":"+branch.BranchName()]
if !hasPr {
continue
}
res[branch] = &pr
}
return res, nil
}

70
pkg/commands/github_test.go
View file

@ -1,70 +0,0 @@
package commands
import (
"os/exec"
"testing"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/secureexec"
"github.com/stretchr/testify/assert"
)
func TestGithubMostRecentPRs(t *testing.T) {
scenarios := []struct {
testName string
response string
expect []*models.GithubPullRequest
}{
{
"no response",
"",
nil,
},
{
"error response",
"none of the git remotes configured for this repository point to a known GitHub host. To tell gh about a new GitHub host, please use `gh auth login`",
nil,
},
{
"empty response",
"[]",
[]*models.GithubPullRequest{},
},
{
"response with data",
`[{
"headRefName": "command-log-2",
"number": 1249,
"state": "MERGED",
"url": "https://github.com/jesseduffield/lazygit/pull/1249",
"headRepositoryOwner": {
"id": "MDQ6VXNlcjg0NTY2MzM=",
"name": "Jesse Duffield",
"login": "jesseduffield"
}
}]`,
[]*models.GithubPullRequest{{
HeadRefName: "command-log-2",
Number: 1249,
State: "MERGED",
Url: "https://github.com/jesseduffield/lazygit/pull/1249",
HeadRepositoryOwner: models.GithubRepositoryOwner{ID: "MDQ6VXNlcjg0NTY2MzM=", Name: "Jesse Duffield", Login: "jesseduffield"},
}},
},
}
for _, s := range scenarios {
t.Run(s.testName, func(t *testing.T) {
gitCmd := NewDummyGitCommand()
gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "gh", cmd)
assert.EqualValues(t, []string{"pr", "list", "--limit", "50", "--state", "all", "--json", "state,url,number,headRefName,headRepositoryOwner"}, args)
return secureexec.Command("echo", s.response)
}
res, _ := gitCmd.GithubMostRecentPRs()
assert.Equal(t, s.expect, res)
})
}
}

14
pkg/commands/models/branch.go
View file

@ -1,7 +1,5 @@
package models
import "strings"
// Branch : A git branch
// duplicating this for now
type Branch struct {
@ -57,15 +55,3 @@ func (b *Branch) HasCommitsToPull() bool {
func (b *Branch) IsRealBranch() bool {
return b.Pushables != "" && b.Pullables != ""
}
func (b *Branch) RemoteName() string {
return strings.SplitN(b.UpstreamName, "/", 2)[0]
}
func (b *Branch) BranchName() string {
remoteAndBranch := strings.SplitN(b.UpstreamName, "/", 2)
if len(remoteAndBranch) != 2 {
return ""
}
return strings.SplitN(b.UpstreamName, "/", 2)[1]
}

3
pkg/config/user_config.go
View file

@ -71,7 +71,7 @@ type GitConfig struct {
OverrideGpg bool `yaml:"overrideGpg"`
DisableForcePushing bool `yaml:"disableForcePushing"`
CommitPrefixes map[string]CommitPrefixConfig `yaml:"commitPrefixes"`
// this shoudl really be under 'gui', not 'git'
// this should really be under 'gui', not 'git'
ParseEmoji bool `yaml:"parseEmoji"`
Log LogConfig `yaml:"log"`
EnableGhCommand bool `yaml:"enableGhCommand"`
@ -376,6 +376,7 @@ func GetDefaultConfig() *UserConfig {
CommitPrefixes: map[string]CommitPrefixConfig(nil),
ParseEmoji: false,
DiffContextSize: 3,
EnableGhCommand: false,
},
Refresher: RefresherConfig{
RefreshInterval: 10,

8
pkg/gui/branches_panel.go
View file

@ -75,7 +75,7 @@ func (gui *Gui) refreshBranches() {
}
func (gui *Gui) refreshGithubPullRequests() {
_, err := gui.GitCommand.RunCommandWithOutput("git config --local --get-regexp .gh-resolved$")
err := gui.Git.Gh.BaseRepo()
if err == nil {
_ = gui.setGithubPullRequests()
return
@ -89,8 +89,7 @@ func (gui *Gui) refreshGithubPullRequests() {
findSuggestionsFunc: gui.getRemoteRepoSuggestionsFunc(),
handleConfirm: func(repository string) error {
return gui.WithWaitingStatus(gui.Tr.LcSelectingRemote, func() error {
// ex git config --local --add "remote.origin.gh-resolved" "jesseduffield/lazygit"
_, err := gui.GitCommand.RunCommandWithOutput(fmt.Sprintf("git config --local --add \"remote.origin.gh-resolved\" \"%s\"", repository))
_, err := gui.Git.Gh.SetBaseRepo(repository)
if err != nil {
return err
}
@ -107,7 +106,8 @@ func (gui *Gui) refreshGithubPullRequests() {
}
func (gui *Gui) setGithubPullRequests() error {
prs, err := gui.GitCommand.GithubMostRecentPRs()
prs, err := gui.Git.Gh.GithubMostRecentPRs()
if err != nil {
return gui.surfaceError(err)
}

4
pkg/gui/find_suggestions.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/jesseduffield/lazygit/pkg/commands"
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
"github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
@ -60,7 +60,7 @@ func (gui *Gui) getRemoteRepoNames() []string {
if len(remote.Urls) == 0 {
continue
}
info := commands.GetRepoInfoFromURL(remote.Urls[0])
info := git_commands.GetRepoInfoFromURL(remote.Urls[0])
result = append(result, fmt.Sprintf("%s/%s", info.Owner, info.Repository))
}

25
pkg/gui/gui.go
View file

@ -313,6 +313,7 @@ type guiState struct {
Tags []*models.Tag
MenuItems []*menuItem
BisectInfo *git_commands.BisectInfo
GithubState *GithubState
Updating bool
Panels *panelStates
@ -789,20 +790,20 @@ func (gui *Gui) setColorScheme() error {
return nil
}
// func (gui *Gui) GetPr(branch *models.Branch) (*models.GithubPullRequest, bool, error) {
// prs, err := gui.GitCommand.GenerateGithubPullRequestMap(
// gui.State.GithubState.RecentPRs,
// []*models.Branch{branch},
// gui.State.Remotes,
// )
// if err != nil {
// return nil, false, err
// }
func (gui *Gui) GetPr(branch *models.Branch) (*models.GithubPullRequest, bool, error) {
prs, err := git_commands.GenerateGithubPullRequestMap(
gui.State.GithubState.RecentPRs,
[]*models.Branch{branch},
gui.State.Remotes,
)
if err != nil {
return nil, false, err
}
// pr, hasPr := prs[branch]
pr, hasPr := prs[branch]
// return pr, hasPr, nil
// }
return pr, hasPr, nil
}
func (gui *Gui) OnUIThread(f func() error) {
gui.g.Update(func(*gocui.Gui) error {

2
pkg/gui/list_context_config.go
View file

@ -69,7 +69,7 @@ func (gui *Gui) branchesListContext() IListContext {
OnRenderToMain: OnFocusWrapper(gui.branchesRenderToMain),
Gui: gui,
GetDisplayStrings: func(startIdx int, length int) [][]string {
prs, err := gui.GitCommand.GenerateGithubPullRequestMap(gui.State.GithubState.RecentPRs, gui.State.Branches, gui.State.Remotes)
prs, err := git_commands.GenerateGithubPullRequestMap(gui.State.GithubState.RecentPRs, gui.State.Branches, gui.State.Remotes)
if err != nil {
panic(err)
}

25
pkg/gui/presentation/branches.go
View file

@ -2,6 +2,7 @@ package presentation
import (
"fmt"
"strconv"
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/models"
@ -12,7 +13,10 @@ import (
var branchPrefixColorCache = make(map[string]style.TextStyle)
func GetBranchListDisplayStrings(branches []*models.Branch, fullDescription bool, diffName string) [][]string {
func GetBranchListDisplayStrings(
branches []*models.Branch,
prs map[*models.Branch]*models.GithubPullRequest,
fullDescription bool, diffName string) [][]string {
lines := make([][]string, len(branches))
for i := range branches {
@ -50,11 +54,11 @@ func getBranchDisplayStrings(
res := []string{recencyColor.Sprint(b.Recency)}
pr, hasPr := prs[b]
res = append(res, coloredPrNumber(pr, hasPr), coloredName)
if fullDescription {
return append(
res,
res = append(res,
fmt.Sprintf("%s %s",
style.FgYellow.Sprint(b.UpstreamRemote),
style.FgYellow.Sprint(b.UpstreamBranch),
@ -102,3 +106,18 @@ func BranchStatus(branch *models.Branch) string {
func SetCustomBranches(customBranchColors map[string]string) {
branchPrefixColorCache = utils.SetCustomColors(customBranchColors)
}
func coloredPrNumber(pr *models.GithubPullRequest, hasPr bool) string {
if hasPr {
colour := style.FgMagenta // = state MERGED
switch pr.State {
case "OPEN":
colour = style.FgGreen
case "CLOSED":
colour = style.FgRed
}
return colour.Sprint("#" + strconv.Itoa(pr.Number))
}
return ("")
}

2
pkg/gui/pull_request_menu_panel.go
View file

@ -45,7 +45,7 @@ func (gui *Gui) createOrOpenPullRequestMenu(selectedBranch *models.Branch, check
if hasPr {
menuItems = append(menuItems, &menuItem{
displayString: gui.GitCommand.Tr.MustSpecifyOriginError + strconv.Itoa(pr.Number),
displayString: gui.Git.Gh.Tr.MustSpecifyOriginError + strconv.Itoa(pr.Number),
onPress: func() error {
return gui.OSCommand.OpenLink(pr.Url)
},

3
pkg/i18n/chinese.go
View file

@ -441,9 +441,6 @@ func chineseTranslationSet() TranslationSet {
LcSelectBranch: "选择分支",
CreatingPullRequestAtUrl: "在 URL 创建抓取请求: %s",
OpenPr: "公开公关 #",
Spans: Spans{
ConfirmRevertCommit: "您确定要撤消 {{.selectedCommit}} 吗？",
Actions: Actions{
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
CheckoutCommit: "检出提交",

2
pkg/i18n/english.go
View file

@ -440,8 +440,6 @@ type TranslationSet struct {
DecreaseContextInDiffView string
CreatePullRequestOptions string
LcCreatePullRequestOptions string
LcDefaultBranch string
LcSelectBranch string
CreatePullRequest string
SelectConfigFile string
NoConfigFileFoundErr string