Add Merge functionality to tag submenu

closes jesseduffield#1315 credit to @adamDilger for original commit, I slightly modified it to match master then did the pull request.
RetoranPetra · Mar 13, 2024 · 6405912 · 6405912
1 parent fd18db6
commit 6405912
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 0 deletions.
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -349,6 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Merge | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | View commits | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
@@ -183,6 +183,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | コミットを閲覧 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md
@@ -322,6 +322,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 커밋 보기 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -349,6 +349,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | Bekijk commits | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -342,6 +342,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Scal do obecnej gałęzi | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | View commits | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md
@@ -288,6 +288,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | Просмотреть коммиты | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md
@@ -248,6 +248,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 推送标签 | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 查看提交 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md
@@ -284,6 +284,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
 | `` <enter> `` | 檢視提交 | |
 | `` w `` | View worktree options | |
 | `` / `` | Filter the current view by text | |

diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go
@@ -74,6 +74,13 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
  DisplayOnScreen: true,
  OpensMenu: true,
  },
+ {
+ Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
+ Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)),
+ Description: self.c.Tr.Merge,
+ Tooltip: self.c.Tr.MergeBranchTooltip,
+ DisplayOnScreen: true,
+ },
  }
 
  return bindings
@@ -236,6 +243,10 @@ func (self *TagsController) create() error {
  })
 }
 
+func (self *TagsController) merge(tag *models.Tag) error {
+ return self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(tag.RefName())
+}
+
 func (self *TagsController) context() *context.TagsContext {
  return self.c.Contexts().Tags
 }