ux: add a warning icon when the tracking upstream of a local branch is gone (#1006)

love-linger · dtentori · love-linger · commit 53f591bdad68 · 2025-02-20T10:14:25.000+08:00
Co-authored-by: Davide Tentori &lt;dtentori@softeam.it&gt;
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -25,11 +25,22 @@ public QueryBranches(string repo)
                 return branches;
 
             var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            var remoteBranches = new HashSet<string>();
             foreach (var line in lines)
             {
                 var b = ParseLine(line);
                 if (b != null)
+                {
                     branches.Add(b);
+                    if (!b.IsLocal)
+                        remoteBranches.Add(b.FullName);
+                }
+            }
+
+            foreach (var b in branches)
+            {
+                if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
+                    b.IsUpsteamGone = !remoteBranches.Contains(b.Upstream);
             }
 
             return branches;
@@ -75,6 +86,7 @@ private Models.Branch ParseLine(string line)
             branch.Head = parts[1];
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
+            branch.IsUpsteamGone = false;
 
             if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
                 branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
@@ -34,6 +34,7 @@ public class Branch
         public string Upstream { get; set; }
         public BranchTrackStatus TrackStatus { get; set; }
         public string Remote { get; set; }
+        public bool IsUpsteamGone { get; set; }
 
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -72,6 +72,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">Rename ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Set Tracking Branch...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Compare</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Invalid upstream!</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">Bytes</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">CANCEL</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Reset to This Revision</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
@@ -75,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">重命名 ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切换上游分支 ...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比较</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">跟踪的上游分支不存在或已删除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">字节</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取    消</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">重置文件到该版本</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
@@ -75,6 +75,7 @@
   <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">重新命名 ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切換上游分支...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比較</x:String>
+  <x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">追蹤上游分支不存在或已刪除！</x:String>
   <x:String x:Key="Text.Bytes" xml:space="preserve">位元組</x:String>
   <x:String x:Key="Text.Cancel" xml:space="preserve">取  消</x:String>
   <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">重設檔案為此版本</x:String>
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-
 using Avalonia;
-using Avalonia.Media;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -45,6 +42,11 @@ public bool IsCurrent
             get => Backend is Models.Branch { IsCurrent: true };
         }
 
+        public bool ShowUpstreamGoneTip
+        {
+            get => Backend is Models.Branch { IsUpsteamGone: true };
+        }
+
         public string Tooltip
         {
             get => Backend is Models.Branch b ? b.FriendlyName : null;
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
@@ -61,7 +61,17 @@
                        Classes="primary"
                        Text="{Binding Name}"
                        FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
-                       TextTrimming="CharacterEllipsis"/>            
+                       TextTrimming="CharacterEllipsis"/>
+
+            <!-- Upstream invalid tip -->
+            <Border Grid.Column="2"
+                    Width="12" Height="12"
+                    Margin="8,0"
+                    Background="Transparent"
+                    ToolTip.Tip="{DynamicResource Text.BranchUpstreamInvalid}"
+                    IsVisible="{Binding ShowUpstreamGoneTip}">
+              <Path Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
+            </Border>
 
             <!-- Tracking status -->
             <v:BranchTreeNodeTrackStatusPresenter Grid.Column="2"

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public class Branch`
`34`	`34`	`public string Upstream { get; set; }`
`35`	`35`	`public BranchTrackStatus TrackStatus { get; set; }`
`36`	`36`	`public string Remote { get; set; }`
	`37`	`+ public bool IsUpsteamGone { get; set; }`
`37`	`38`
`38`	`39`	`public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";`
`39`	`40`	`}`