refactor: branch compare

Author: love-linger

src/Resources/Locales/de_DE.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Auschecken von ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Mit Branch vergleichen</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Mit HEAD vergleichen</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Mit Worktree vergleichen</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Branch-Namen kopieren</x:String>

src/Resources/Locales/en_US.axaml

@@ -47,7 +47,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME ON THIS FILE IS NOT SUPPORTED!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Compare with Branch</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copy Branch Name</x:String>

src/Resources/Locales/es_ES.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">¡BLAME EN ESTE ARCHIVO NO SOPORTADO!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparar con Rama</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nombre de Rama</x:String>

src/Resources/Locales/fr_FR.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blâme</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">LE BLÂME SUR CE FICHIER N'EST PAS SUPPORTÉ!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Récupérer ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparer avec la branche</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copier le nom de la branche</x:String>

src/Resources/Locales/it_IT.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Attribuisci</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">L'ATTRIBUZIONE SU QUESTO FILE NON È SUPPORTATA!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Confronta con Branch</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Confronta con HEAD</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copia Nome Branch</x:String>

src/Resources/Locales/pt_BR.axaml

@@ -75,7 +75,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME NESTE ARQUIVO NÃO É SUPORTADO!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Comparar com Branch</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Comparar com HEAD</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar com Worktree</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nome do Branch</x:String>

src/Resources/Locales/ru_RU.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">Расследование</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Проверить ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">Сравнить с веткой</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Сравнить с ГОЛОВОЙ (HEAD)</x:String> 
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Сравнить с рабочим каталогом</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Копировать имя ветки</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">逐行追溯(blame)</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">选中文件不支持该操作!!!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">检出(checkout) ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">与其他分支对比</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">复制分支名</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -50,7 +50,6 @@
  <x:String x:Key="Text.Blame" xml:space="preserve">逐行溯源 (blame)</x:String>
  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">所選擇的檔案不支援該操作!</x:String>
  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">簽出 (checkout) ${0}$...</x:String>
- <x:String x:Key="Text.BranchCM.CompareWithBranch" xml:space="preserve">與其他分支比較</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">複製分支名稱</x:String>

src/ViewModels/Repository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.Intrinsics.Arm;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -1463,13 +1464,6 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
  }
 
  menu.Items.Add(push);
-
- var compareWithBranch = CreateMenuItemToCompareBranches(branch);
- if (compareWithBranch != null)
- {
- menu.Items.Add(new MenuItem() { Header = "-" });
- menu.Items.Add(compareWithBranch);
- }
  }
  else
  {
@@ -1540,6 +1534,19 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
  menu.Items.Add(merge);
  menu.Items.Add(rebase);
 
+ var compareWithHead = new MenuItem();
+ compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
+ compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
+ compareWithHead.Click += (_, _) =>
+ {
+ App.OpenDialog(new Views.BranchCompare()
+ {
+ DataContext = new BranchCompare(_fullpath, branch, _currentBranch)
+ });
+ };
+ menu.Items.Add(new MenuItem() { Header = "-" });
+ menu.Items.Add(compareWithHead);
+
  if (_localChangesCount > 0)
  {
  var compareWithWorktree = new MenuItem();
@@ -1556,18 +1563,8 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
  _histories.DetailContext = new RevisionCompare(_fullpath, target, null);
  }
  };
- menu.Items.Add(new MenuItem() { Header = "-" });
  menu.Items.Add(compareWithWorktree);
  }
-
- var compareWithBranch = CreateMenuItemToCompareBranches(branch);
- if (compareWithBranch != null)
- {
- if (_localChangesCount == 0)
- menu.Items.Add(new MenuItem() { Header = "-" });
-
- menu.Items.Add(compareWithBranch);
- }
  }
 
  var detect = Commands.GitFlow.DetectType(_fullpath, _branches, branch.Name);
@@ -1813,7 +1810,19 @@ public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch)
  menu.Items.Add(new MenuItem() { Header = "-" });
  }
 
- var hasCompare = false;
+ var compareWithHead = new MenuItem();
+ compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
+ compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare");
+ compareWithHead.Click += (_, _) =>
+ {
+ App.OpenDialog(new Views.BranchCompare()
+ {
+ DataContext = new BranchCompare(_fullpath, branch, _currentBranch)
+ });
+ };
+ menu.Items.Add(new MenuItem() { Header = "-" });
+ menu.Items.Add(compareWithHead);
+
  if (_localChangesCount > 0)
  {
  var compareWithWorktree = new MenuItem();
@@ -1831,19 +1840,8 @@ public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch)
  }
  };
  menu.Items.Add(compareWithWorktree);
- hasCompare = true;
  }
 
- var compareWithBranch = CreateMenuItemToCompareBranches(branch);
- if (compareWithBranch != null)
- {
- menu.Items.Add(compareWithBranch);
- hasCompare = true;
- }
-
- if (hasCompare)
- menu.Items.Add(new MenuItem() { Header = "-" });
-
  var delete = new MenuItem();
  delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);
  delete.Icon = App.CreateMenuIcon("Icons.Clear");
@@ -2078,39 +2076,6 @@ public ContextMenu CreateContextMenuForWorktree(Models.Worktree worktree)
  return menu;
  }
 
- private MenuItem CreateMenuItemToCompareBranches(Models.Branch branch)
- {
- if (_branches.Count == 1)
- return null;
-
- var compare = new MenuItem();
- compare.Header = App.Text("BranchCM.CompareWithBranch");
- compare.Icon = App.CreateMenuIcon("Icons.Compare");
-
- foreach (var b in _branches)
- {
- if (b.FullName != branch.FullName)
- {
- var dup = b;
- var target = new MenuItem();
- target.Header = b.FriendlyName;
- target.Icon = App.CreateMenuIcon(b.IsCurrent ? "Icons.Check" : "Icons.Branch");
- target.Click += (_, e) =>
- {
- App.OpenDialog(new Views.BranchCompare()
- {
- DataContext = new BranchCompare(_fullpath, branch, dup)
- });
- e.Handled = true;
- };
-
- compare.Items.Add(target);
- }
- }
-
- return compare;
- }
-
  private LauncherPage GetOwnerPage()
  {
  var launcher = App.GetLauncer();