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

support merging remote branches into checked out branch

Browse Source
This commit is contained in:
Jesse Duffield 2019-11-17 13:21:38 +11:00
parent 55ff0c0dee
commit 2afbd7ba7f
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/git.go
View File

@ -1080,3 +1080,8 @@ func (c *GitCommand) AddRemote(name string, url string) error {
func (c *GitCommand) RemoveRemote(name string) error { func (c *GitCommand) RemoveRemote(name string) error {
return c.OSCommand.RunCommand(fmt.Sprintf("git remote remove %s", name)) return c.OSCommand.RunCommand(fmt.Sprintf("git remote remove %s", name))
} }
func (c *GitCommand) IsHeadDetached() bool {
err := c.OSCommand.RunCommand("git symbolic-ref -q HEAD")
return err != nil
}

25
pkg/gui/branches_panel.go
View File

@ -276,27 +276,34 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
}, nil) }, nil)
} }
func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
checkedOutBranch := gui.State.Branches[0].Name if gui.GitCommand.IsHeadDetached() {
selectedBranch := gui.getSelectedBranch().Name return gui.createErrorPanel(gui.g, "Cannot merge branch in detached head state. You might have checked out a commit directly or a remote branch, in which case you should checkout the local branch you want to be on")
if checkedOutBranch == selectedBranch { }
return gui.createErrorPanel(g, gui.Tr.SLocalize("CantMergeBranchIntoItself")) checkedOutBranchName := gui.State.Branches[0].Name
if checkedOutBranchName == branchName {
return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantMergeBranchIntoItself"))
} }
prompt := gui.Tr.TemplateLocalize( prompt := gui.Tr.TemplateLocalize(
"ConfirmMerge", "ConfirmMerge",
Teml{ Teml{
"checkedOutBranch": checkedOutBranch, "checkedOutBranch": checkedOutBranchName,
"selectedBranch": selectedBranch, "selectedBranch": branchName,
}, },
) )
return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("MergingTitle"), prompt, return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("MergingTitle"), prompt,
func(g *gocui.Gui, v *gocui.View) error { func(g *gocui.Gui, v *gocui.View) error {
err := gui.GitCommand.Merge(selectedBranch) err := gui.GitCommand.Merge(branchName)
return gui.handleGenericMergeCommandResult(err) return gui.handleGenericMergeCommandResult(err)
}, nil) }, nil)
} }
func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
selectedBranchName := gui.getSelectedBranch().Name
return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName)
}
func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
checkedOutBranch := gui.State.Branches[0].Name checkedOutBranch := gui.State.Branches[0].Name
selectedBranch := gui.getSelectedBranch().Name selectedBranch := gui.getSelectedBranch().Name

8
pkg/gui/keybindings.go
View File

@ -1065,6 +1065,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleCheckoutRemoteBranch, Handler: gui.handleCheckoutRemoteBranch,
Description: gui.Tr.SLocalize("checkout"), Description: gui.Tr.SLocalize("checkout"),
}, },
{
ViewName: "branches",
Contexts: []string{"remote-branches"},
Key: 'M',
Modifier: gocui.ModNone,
Handler: gui.handleMergeRemoteBranch,
Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"),
},
{ {
ViewName: "commits", ViewName: "commits",
Key: gocui.MouseLeft, Key: gocui.MouseLeft,

5
pkg/gui/remote_branches_panel.go
View File

@ -92,3 +92,8 @@ func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error {
} }
return gui.switchBranchesPanelContext("local-branches") return gui.switchBranchesPanelContext("local-branches")
} }
func (gui *Gui) handleMergeRemoteBranch(g *gocui.Gui, v *gocui.View) error {
selectedBranchName := gui.getSelectedRemoteBranch().Name
return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName)
}