diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-28 20:35:23 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-01-29 15:19:19 +1100 |
commit | c166c57c5da73f9243ac4b4bc7e38fd0b3fa0f46 (patch) | |
tree | 9d88ff0191aefaebcc44838e38f85f91e208cce3 /pkg/gui/files_panel.go | |
parent | 6b77e4ee4a7fa05e293afb4fb8a7460df3c2817a (diff) |
make use of branch config when pushing/pulling
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r-- | pkg/gui/files_panel.go | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index a923d56e6..beb913c64 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -393,6 +393,17 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error { return err } if pullables == "?" { + // see if we have this branch in our config with an upstream + conf, err := gui.GitCommand.Repo.Config() + if err != nil { + return gui.createErrorPanel(gui.g, err.Error()) + } + for branchName, branch := range conf.Branches { + if branchName == currentBranchName { + return gui.pullFiles(v, fmt.Sprintf("%s %s", branch.Remote, branchName)) + } + } + return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranchName, func(g *gocui.Gui, v *gocui.View) error { upstream := gui.trimmedContent(v) if err := gui.GitCommand.SetUpstreamBranch(upstream); err != nil { @@ -402,21 +413,21 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error { } return gui.createErrorPanel(gui.g, errorMessage) } - return gui.pullFiles(v) + return gui.pullFiles(v, "") }) } - return gui.pullFiles(v) + return gui.pullFiles(v, "") } -func (gui *Gui) pullFiles(v *gocui.View) error { +func (gui *Gui) pullFiles(v *gocui.View, args string) error { if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PullWait")); err != nil { return err } go func() { unamePassOpend := false - err := gui.GitCommand.Pull(func(passOrUname string) string { + err := gui.GitCommand.Pull(args, func(passOrUname string) string { unamePassOpend = true return gui.waitForPassUname(gui.g, v, passOrUname) }) @@ -426,14 +437,14 @@ func (gui *Gui) pullFiles(v *gocui.View) error { return nil } -func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string) error { +func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string, args string) error { if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PushWait")); err != nil { return err } go func() { unamePassOpend := false branchName := gui.getCheckedOutBranch().Name - err := gui.GitCommand.Push(branchName, force, upstream, func(passOrUname string) string { + err := gui.GitCommand.Push(branchName, force, upstream, args, func(passOrUname string) string { unamePassOpend = true return gui.waitForPassUname(g, v, passOrUname) }) @@ -451,14 +462,25 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error { } if pullables == "?" { + // see if we have this branch in our config with an upstream + conf, err := gui.GitCommand.Repo.Config() + if err != nil { + return gui.createErrorPanel(gui.g, err.Error()) + } + for branchName, branch := range conf.Branches { + if branchName == currentBranchName { + return gui.pushWithForceFlag(g, v, false, "", fmt.Sprintf("%s %s", branch.Remote, branchName)) + } + } + return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranchName, func(g *gocui.Gui, v *gocui.View) error { - return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v)) + return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "") }) } else if pullables == "0" { - return gui.pushWithForceFlag(g, v, false, "") + return gui.pushWithForceFlag(g, v, false, "", "") } return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error { - return gui.pushWithForceFlag(g, v, true, "") + return gui.pushWithForceFlag(g, v, true, "", "") }, nil) } |