feature: add Merge <tag> to <current context menu for selected tag

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -947,6 +947,7 @@
   <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Custom Action</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Delete selected {0} tags...</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ into ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Update Submodules</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">All submodules</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -951,6 +951,7 @@
   <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">自定义操作</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">删除 ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">删除选中 {0} 个标签...</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">合并 ${0}$ 到 ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模块</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">更新所有子模块</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -951,6 +951,7 @@
   <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">自訂動作</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">刪除 ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">刪除所選的 {0} 個標籤...</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">合併 ${0}$ 到 ${1}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模組</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">更新所有子模組</x:String>

src/Views/TagsView.axaml.cs

@@ -262,8 +262,6 @@ private void OnTagsContextMenuRequested(object sender, ContextRequestedEventArgs
                     menu.Items.Add(checkoutCommit);
                 }
 
-                menu.Items.Add(new MenuItem() { Header = "-" });
-
                 var pushTag = new MenuItem();
                 pushTag.Header = App.Text("TagCM.Push", tag.Name);
                 pushTag.Icon = this.CreateMenuIcon("Icons.Push");
@@ -274,6 +272,22 @@ private void OnTagsContextMenuRequested(object sender, ContextRequestedEventArgs
                         repo.ShowPopup(new ViewModels.PushTag(repo, tag));
                     ev.Handled = true;
                 };
+                menu.Items.Add(new MenuItem() { Header = "-" });
+                menu.Items.Add(pushTag);
+
+                if (repo.CurrentBranch is { IsDetachedHead: false } current)
+                {
+                    var mergeTag = new MenuItem();
+                    mergeTag.Header = App.Text("TagCM.Merge", tag.Name, current.Name);
+                    mergeTag.Icon = this.CreateMenuIcon("Icons.Merge");
+                    mergeTag.Click += (_, ev) =>
+                    {
+                        if (repo.CanCreatePopup())
+                            repo.ShowPopup(new ViewModels.Merge(repo, tag, current.Name));
+                        ev.Handled = true;
+                    };
+                    menu.Items.Add(mergeTag);
+                }
 
                 var deleteTag = new MenuItem();
                 deleteTag.Header = App.Text("TagCM.Delete", tag.Name);
@@ -284,6 +298,8 @@ private void OnTagsContextMenuRequested(object sender, ContextRequestedEventArgs
                         repo.ShowPopup(new ViewModels.DeleteTag(repo, tag));
                     ev.Handled = true;
                 };
+                menu.Items.Add(deleteTag);
+                menu.Items.Add(new MenuItem() { Header = "-" });
 
                 var compareWithHead = new MenuItem();
                 compareWithHead.Header = App.Text("TagCM.CompareWithHead");
@@ -300,6 +316,9 @@ private void OnTagsContextMenuRequested(object sender, ContextRequestedEventArgs
                 {
                     new ViewModels.CompareCommandPalette(repo, tag).Open();
                 };
+                menu.Items.Add(compareWithHead);
+                menu.Items.Add(compareWith);
+                menu.Items.Add(new MenuItem() { Header = "-" });
 
                 var archive = new MenuItem();
                 archive.Icon = this.CreateMenuIcon("Icons.Archive");
@@ -310,13 +329,6 @@ private void OnTagsContextMenuRequested(object sender, ContextRequestedEventArgs
                         repo.ShowPopup(new ViewModels.Archive(repo, tag));
                     ev.Handled = true;
                 };
-
-                menu.Items.Add(pushTag);
-                menu.Items.Add(deleteTag);
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(compareWithHead);
-                menu.Items.Add(compareWith);
-                menu.Items.Add(new MenuItem() { Header = "-" });
                 menu.Items.Add(archive);
                 menu.Items.Add(new MenuItem() { Header = "-" });